Rebuild language files and update russian translation.

12 files changed, 3047 insertions, 2562 deletions

diff --git a/po/de.po b/po/de.po
index d1e2f9eb9..8a6fa0530 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -427,7 +427,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Geschäft"
 
@@ -696,8 +696,8 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -732,6 +732,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Karte"
 
@@ -1214,6 +1215,7 @@ msgid "Submit"
 msgstr "Absenden"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "NPC"
 
@@ -1715,63 +1717,93 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Soundengine"
 
-#: src/gui/setup_chat.cpp:55
-msgid "Remove colors from received chat messages"
-msgstr ""
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Farben"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
-msgstr ""
+#, fuzzy
+msgid "Commands"
+msgstr "Befehl: /users"
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:70
-msgid "Limit max chars in chat line"
+msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
+msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
+#, fuzzy
+msgid "Messages"
+msgstr "Nachricht"
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr ""
 
@@ -1779,10 +1811,6 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "So wird die Farbe aussehen"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Farben"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Typ: "
@@ -1834,8 +1862,8 @@ msgstr "Anwenden"
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr ""
 
@@ -1887,110 +1915,156 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
-msgid "Show damage inflicted to monsters"
-msgstr ""
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monster"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
+msgid "Show monster hp bar"
 msgstr ""
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr ""
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
+msgid "Cycle monster targets"
 msgstr ""
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
+msgid "Show warps particles"
 msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
+msgid "Highlight map portals"
 msgstr ""
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
+msgid "Highlight floor items"
 msgstr ""
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
+msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:92
-msgid "Show own hp bar"
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:100
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
-msgid "Show players popups"
+#: src/gui/setup_other.cpp:104
+#, fuzzy
+msgid "Player"
+msgstr "Spieler"
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr "Protokoliere NPC Gespräche"
+
+#: src/gui/setup_other.cpp:146
+#, fuzzy
+msgid "Other"
+msgstr "andere"
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 msgid "Enable debug log"
 msgstr ""
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr ""
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Beziehung"
@@ -2035,303 +2109,275 @@ msgstr "Alle privaten Nachrichten in Tabs öffnen"
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Spieler"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
-msgid "Theme"
-msgstr ""
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Sichtbare Namen"
 
-#: src/gui/setup_theme.cpp:113
-msgid "Gui theme"
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
-msgid "Main Font"
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
-msgid "Bold font"
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
-msgid "Particle font"
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:117
-msgid "Help font"
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:118
-msgid "Secure font"
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:241
-msgid "Theme Changed"
+#: src/gui/setup_theme.cpp:140
+msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
-msgid "Restart your client for the change to take effect."
-msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
+#: src/gui/setup_theme.cpp:142
+msgid "Gui theme"
+msgstr ""
 
-#: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
+#: src/gui/setup_theme.cpp:143
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
+#: src/gui/setup_theme.cpp:144
+msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
+#: src/gui/setup_theme.cpp:145
+msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:146
+msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:147
+msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Schriftgröße"
+
+#: src/gui/setup_theme.cpp:281
+msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
+msgid "Restart your client for the change to take effect."
+msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
+
+#: src/gui/setup_video.cpp:194
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Kein Text"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Text"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Blasen, keine Namen"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Blasen mit Namen"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "Aus"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "Niedrig"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "Hoch"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "Mittel"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Sichtbare Namen"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr "Protokoliere NPC Gespräche"
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Benachrichtigung beim Aufheben"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "im Chatfenster"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "als Partikeleffekt"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 msgid "Enable opacity cache"
 msgstr ""
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr "Chat über Spielern"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Schriftgröße"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
 "anzupassen."
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
@@ -3210,10 +3256,6 @@ msgstr "Namen von GM"
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Monster"
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index bb2ed0ec8..ef755a095 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
 "PO-Revision-Date: 2011-06-20 14:11+0000\n"
 "Last-Translator: nelson6e65 <nelson6eeduardo65@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
@@ -427,7 +427,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Tienda"
 
@@ -696,8 +696,8 @@ msgstr "arco iris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -732,6 +732,7 @@ msgid "Ignore"
 msgstr "Ignorar"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Mapa"
 
@@ -1214,6 +1215,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "NPC"
 
@@ -1713,65 +1715,95 @@ msgstr "Necesitas reiniciar el client si quieres descargar la musica"
 msgid "Sound Engine"
 msgstr "Mecanismo de Sonido"
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Colores"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr "Remover los colores de los mensajes recibidos en la charla"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
-msgstr "Registrar mensajes de magia en la pestaña del depurador"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr "Mostrar lista de colores del chat"
+
+#: src/gui/setup_chat.cpp:64
+#, fuzzy
+msgid "Commands"
+msgstr "Comando:"
 
-#: src/gui/setup_chat.cpp:61
+#: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 "Permitir utilizar los comandos de magia y GM en todo tipo de ventana de "
 "dialogo"
 
-#: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
-msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
-
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
-msgstr "Mostrar lista de colores del chat"
-
 #: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
 msgstr "Limitar máx. de caracteres en la línea de chat"
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
-msgstr "Habilitar Registro de charla"
-
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr "Limitar líneas máx. en chat"
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
-msgstr "Habilitar pestaña de intercambio"
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
-msgstr "Ocultar mensajes de la tienda"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "Habilitar Registro de charla"
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr "Mostrar historial de charla"
 
 #: src/gui/setup_chat.cpp:88
+#, fuzzy
+msgid "Messages"
+msgstr "Mensaje"
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr "Ocultar mensajes de la tienda"
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr "Registrar mensajes de magia en la pestaña del depurador"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr "Habilitar pestaña de intercambio"
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr "Habilitar pestaña de batalla"
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalla"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr "Si hace falta, cambia el tamaño de ventanas de dialogo"
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr "Usar hora local"
 
@@ -1779,10 +1811,6 @@ msgstr "Usar hora local"
 msgid "This is what the color looks like"
 msgstr "Así es como se verá el color"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Colores"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Tipo:"
@@ -1834,8 +1862,8 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr "Editar"
 
@@ -1887,110 +1915,156 @@ msgstr "Conflicto de teclas detectado."
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monstruos"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr "Mostrar daño infligido a monstruos"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
-msgstr "Habilitar los ataques colaterales de servidor"
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
-msgstr "Corrección automatica de la posición"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr "Resaltar el alcanze de ataque de los monstruos"
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
-msgstr "Resaltar las puertas del mapa"
+msgid "Show monster hp bar"
+msgstr "Mostrar barra de energía del monstruo"
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr "Atacar mientras está en movimiento"
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
-msgstr "Resaltar los objetos sobre el suelo"
+msgid "Cycle monster targets"
+msgstr "Rodear las dianas de los monstruos"
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
-msgstr "Habilitar estadísticas rápidas"
+msgid "Show warps particles"
+msgstr "Mostrar las partículas de efectos"
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
-msgstr "Resaltar el alcance de ataque del jugador"
+msgid "Highlight map portals"
+msgstr "Resaltar las puertas del mapa"
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
-msgstr "Mostrar las partículas de efectos"
+msgid "Highlight floor items"
+msgstr "Resaltar los objetos sobre el suelo"
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
-msgstr "Resaltar el alcanze de ataque de los monstruos"
+msgid "Highlight player attack range"
+msgstr "Resaltar el alcance de ataque del jugador"
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
-msgstr "Aceptar peticiones de compra / venta"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr "Mostrar minmapas extendidos"
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
-msgstr "Rodear las dianas del jugador"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr "Dibujar trayectoria"
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
-msgstr "Mostrar barra de energía del monstruo"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr "Dibujar teclas de acceso rápido en el mapa"
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
-msgstr "Rodear las dianas de los monstruos"
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr "Corrección automatica de la posición"
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr "Atacar mientras está en movimiento"
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr "Sincronización de movimiento de jugador"
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr "Programa de movimientos locos A"
+
+#: src/gui/setup_other.cpp:104
+#, fuzzy
+msgid "Player"
+msgstr "Jugadores"
+
+#: src/gui/setup_other.cpp:106
 msgid "Show own hp bar"
 msgstr "Mostrar la propia barra de energía"
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
-msgstr "Habilitar el control de robot"
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr "Habilitar estadísticas rápidas"
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr "Rodear las dianas del jugador"
 
-#: src/gui/setup_other.cpp:98
+#: src/gui/setup_other.cpp:115
 msgid "Show job exp messages"
 msgstr "Mostrar los mensajes de experiencia de trabajo"
 
-#: src/gui/setup_other.cpp:102
-msgid "Crazy move A program"
-msgstr "Programa de movimientos locos A"
-
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:118
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
-msgstr "Mostrar minmapas extendidos"
-
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr "Mensaje afk"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr "Mostrar trabajo"
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr "Aceptar peticiones de compra / venta"
+
+#: src/gui/setup_other.cpp:136
 msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr "Log dealogos con un NPC"
+
+#: src/gui/setup_other.cpp:146
+#, fuzzy
+msgid "Other"
+msgstr "otro"
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable server side attack"
+msgstr "Habilitar los ataques colaterales de servidor"
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable bot checker"
+msgstr "Habilitar el control de robot"
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr "Habilitar la proteción contra servidores defectuosos"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr "Modo de bajo tráfico"
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr "Ocultar los objetos escudos"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relación"
@@ -2035,302 +2109,274 @@ msgstr "Mostrar nuevos susurros en pestañas"
 msgid "Show gender"
 msgstr "Mostrar género (del personaje)"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Jugadores"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Cuando se ignora a alguien:"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 msgid "Show level"
 msgstr "Mostrar nivel"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 msgid "Show own name"
 msgstr "Mostrar nombre propio"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 msgid "Target dead players"
 msgstr "Apuntar a jugadores muertos"
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 msgid "Secure trades"
 msgstr "Intercambios seguros"
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr "Carácteres inseguros en los nombres"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Nombres Visibles"
+
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
+msgstr "Diminuto (10)"
+
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
+msgstr "Pequeño (11)"
+
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
+msgstr "Medio (12)"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
+msgstr "Extenso (13)"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr "Grande (14)"
+
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr "Enorme (15)"
+
+#: src/gui/setup_theme.cpp:140
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:142
 msgid "Gui theme"
 msgstr "Tema de interfáz gráfica"
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:143
 msgid "Main Font"
 msgstr "Fuente principal"
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:144
 msgid "Bold font"
 msgstr "Fuente negrita"
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:145
 msgid "Particle font"
 msgstr "Fuente de partícula"
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:146
 msgid "Help font"
 msgstr "Fuente de la ayuda"
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:147
 msgid "Secure font"
 msgstr "Fuente segura"
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Tamaño de fuente"
+
+#: src/gui/setup_theme.cpp:281
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie el juego para que los cambios tengan efecto."
 
 #: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
-msgstr "Diminuto (10)"
-
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
-msgstr "Pequeño (11)"
-
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
-msgstr "Medio (12)"
-
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
-msgstr "Extenso (13)"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr "Grande (14)"
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr "Enorme (15)"
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr "OpenGL Rápido"
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr "OpenGL Seguro"
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Sin texto"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Texto"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Burbujas sin nombres"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Burbujas con nombres"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "apagado"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "bajo"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "medio"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 msgid "Hw acceleration"
 msgstr "Aceleración de hardware"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Nombres Visibles"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Efectos de partículas"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr "Log dealogos con un NPC"
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Mostrar aviso al coger algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "en chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr "Ocultar los objetos escudos"
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr "Modo de bajo tráfico"
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr "Sincronización de movimiento de jugador"
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr "Dibujar teclas de acceso rápido en el mapa"
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr "Dibujar trayectoria"
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr "Mostrar trabajo"
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 msgid "Enable opacity cache"
 msgstr "Habilitar caché de opacidad"
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 msgid "Show background"
 msgstr "Mostrar fondo"
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 msgid "Alt FPS limit: "
 msgstr "Limites alternativas FPS: "
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr "Sobrecarga de texto"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr "Opacidad"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 msgid "Particle detail"
 msgstr "Detalle de partículas"
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Tamaño de fuente"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 msgid "None"
 msgstr "Nada"
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:                "
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 msgid "Particle Effect Settings Changed."
 msgstr "Configuración del efecto de las partículas cambiado."
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "Los cambios tendran efecto cuando se cambie de mapa."
 
@@ -3209,10 +3255,6 @@ msgstr "Nombres De Los GMs"
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Monstruos"
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr "Barra de energía del monstruo"
diff --git a/po/fi.po b/po/fi.po
index 517a0e7f6..744afb31e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -425,7 +425,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -694,8 +694,8 @@ msgstr "sateenkaari 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -730,6 +730,7 @@ msgid "Ignore"
 msgstr "Ohita"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Kartta"
 
@@ -1212,6 +1213,7 @@ msgid "Submit"
 msgstr "Lähetä"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
@@ -1713,63 +1715,93 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Äänimoottori"
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Värit"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr "Poista värit saapuneista keskusteluviesteistä"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
-msgstr "Kirjaa magiaviestit debug-välilehdelle"
-
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Salli magia ja GM-komennot kaikilla keskusteluvälilehdillä"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr "Näytä keskustelun värilista"
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
-msgstr "Näytä palvelinviestit debug-välilehdellä"
+#, fuzzy
+msgid "Commands"
+msgstr "Komento:"
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
-msgstr "Näytä keskustelun värilista"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr "Salli magia ja GM-komennot kaikilla keskusteluvälilehdillä"
 
 #: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
 msgstr "Keskusteluviestin pituusraja"
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
-msgstr "Kirjaa keskustelut"
-
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr "Keskusteluvälilehden riviraja"
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
-msgstr "Ota kaupankäyntivälilehti käyttöön"
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
-msgstr "Piilota kauppaviestit"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "Kirjaa keskustelut"
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr "Näytä keskusteluhistoria"
 
 #: src/gui/setup_chat.cpp:88
+#, fuzzy
+msgid "Messages"
+msgstr "Viesti"
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr "Piilota kauppaviestit"
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr "Kirjaa magiaviestit debug-välilehdelle"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr "Näytä palvelinviestit debug-välilehdellä"
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr "Ota kaupankäyntivälilehti käyttöön"
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr "Ota taisteluvälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr "Näytä taistelutapahtumat"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr "Muuta välilehden kokoa tarpeen mukaan"
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr ""
 
@@ -1777,10 +1809,6 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Väri näyttää tältä"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Värit"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Tyyppi:"
@@ -1832,8 +1860,8 @@ msgstr "Hyväksy"
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr "Muokkaa"
 
@@ -1885,110 +1913,156 @@ msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 msgid "Misc"
 msgstr "Sekal."
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Hirviöt"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr "Näytä hirviön saama vahinko"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
-msgstr "Ota käyttöön palvelinpuolen hyökkäys"
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr "Valikoi kohteiksi vain saavutettavia hirviöitä"
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
-msgstr "Korjaa sijainti automaattisesti"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr "Korosta hirviön hyökkäyskantama"
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
-msgstr "Korosta karttasiirtymät"
+msgid "Show monster hp bar"
+msgstr "Näytä hirviön vp-palkki"
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr "Hyökkää liikkuessa"
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
-msgstr "Korosta maassa olevat tavarat"
+msgid "Cycle monster targets"
+msgstr "Vaihda hirviökohteita syklissä"
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
-msgstr "Ota pikatilastot käyttöön"
+msgid "Show warps particles"
+msgstr "Näytä siirtymissä hiukkastehoste"
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
-msgstr "Korosta pelaajan hyökkäyskantama"
+msgid "Highlight map portals"
+msgstr "Korosta karttasiirtymät"
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
-msgstr "Näytä siirtymissä hiukkastehoste"
+msgid "Highlight floor items"
+msgstr "Korosta maassa olevat tavarat"
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
-msgstr "Korosta hirviön hyökkäyskantama"
+msgid "Highlight player attack range"
+msgstr "Korosta pelaajan hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
-msgstr "Salli osta/myy-pyynnöt"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr "Näytä parannellut minikartat"
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
-msgstr "Vaihda pelaajakohteita syklissä"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr "Piirrä polku"
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
-msgstr "Näytä hirviön vp-palkki"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr "Piirrä siirtymäpikanäppäimet kartalle"
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
-msgstr "Vaihda hirviökohteita syklissä"
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr "Korjaa sijainti automaattisesti"
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr "Hyökkää liikkuessa"
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr "Synkronoi pelaajan liikkeet"
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr "Villiliike (a) -ohjelma"
+
+#: src/gui/setup_other.cpp:104
+#, fuzzy
+msgid "Player"
+msgstr "Pelaajat"
+
+#: src/gui/setup_other.cpp:106
 msgid "Show own hp bar"
 msgstr "Näytä oma vp-palkki"
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
-msgstr "Ota bottitutka käyttöön"
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr "Ota pikatilastot käyttöön"
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr "Vaihda pelaajakohteita syklissä"
 
-#: src/gui/setup_other.cpp:98
+#: src/gui/setup_other.cpp:115
 msgid "Show job exp messages"
 msgstr "Näytä työkokemusviestit"
 
-#: src/gui/setup_other.cpp:102
-msgid "Crazy move A program"
-msgstr "Villiliike (a) -ohjelma"
-
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:118
 msgid "Show players popups"
 msgstr "Näytä pelaajaponnahdusikkunat"
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
-msgstr "Näytä parannellut minikartat"
-
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr "Näytä työ"
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr "Salli osta/myy-pyynnöt"
+
+#: src/gui/setup_other.cpp:136
 msgid "Enable shop mode"
 msgstr "Ota kauppatila käyttöön"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
+
+#: src/gui/setup_other.cpp:146
+#, fuzzy
+msgid "Other"
+msgstr "muu"
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable server side attack"
+msgstr "Ota käyttöön palvelinpuolen hyökkäys"
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable bot checker"
+msgstr "Ota bottitutka käyttöön"
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr "Matalan liikenteen tila"
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr "Piilota kilpihahmo"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relaatio"
@@ -2033,300 +2107,272 @@ msgstr "Laita kaikki kuiskaukset välilehtiin"
 msgid "Show gender"
 msgstr "Näytä sukupuoli"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Pelaajat"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Kun jätät huomiotta:"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 msgid "Show level"
 msgstr "Näytä taso"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 msgid "Show own name"
 msgstr "Näytä oma nimi"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 msgid "Target dead players"
 msgstr "Ota kuolleetkin pelaajat kohteiksi"
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 msgid "Secure trades"
 msgstr "Turvaa kaupat"
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Näytä nimet"
+
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
+msgstr "Pikkiriikkinen (10)"
+
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
+msgstr "Pieni (11)"
+
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
+msgstr "Keskikokoinen (12)"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
+msgstr "Kookas (13)"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr "Suuri (14)"
+
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr "Jättimäinen (15)"
+
+#: src/gui/setup_theme.cpp:140
 msgid "Theme"
 msgstr "Teema"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:142
 msgid "Gui theme"
 msgstr "Käyttöliittymän teema"
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:143
 msgid "Main Font"
 msgstr "Pääkirjasin"
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:144
 msgid "Bold font"
 msgstr "Lihavoitu kirjasin"
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:145
 msgid "Particle font"
 msgstr "Hiukkaskirjasin"
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:146
 msgid "Help font"
 msgstr "Ohjekirjasin"
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:147
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Kirjasimen koko"
+
+#: src/gui/setup_theme.cpp:281
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
 #: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
-msgstr "Pikkiriikkinen (10)"
-
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
-msgstr "Pieni (11)"
-
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
-msgstr "Keskikokoinen (12)"
-
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
-msgstr "Kookas (13)"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr "Suuri (14)"
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr "Jättimäinen (15)"
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr "Ei kiihdytystä"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr "Nopea OpenGL"
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr "Turvallinen OpenGL"
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Ei tekstiä"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Teksti"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Puhekuplat, ei nimiä"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Puhekuplat nimillä"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "pois päältä"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "matala"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "korkea"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "keskitaso"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "maksimi"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 msgid "Hw acceleration"
 msgstr "Rautakiihdytys"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Näytä nimet"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Hiukkastehosteet"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Näytä ottoviesti"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "keskusteluikkunassa"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "leijuvana"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr "Piilota kilpihahmo"
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr "Matalan liikenteen tila"
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr "Synkronoi pelaajan liikkeet"
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr "Piirrä siirtymäpikanäppäimet kartalle"
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr "Piirrä polku"
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr "Näytä työ"
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 msgid "Enable opacity cache"
 msgstr "Ota käyttöön läpinäkyvyysvälimuisti"
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 msgid "Show background"
 msgstr "Näytä tausta"
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (FPS):"
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin:"
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Kuva"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr "Tekstinä yläpuolella"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 msgid "Particle detail"
 msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Kirjasimen koko"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 msgid "None"
 msgstr "-"
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Oma tarkkuus (esim. 1024x768)"
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr "Anna uusi tarkkuus:                  "
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 msgid "Particle Effect Settings Changed."
 msgstr "Hiukkastehosteiden asetuksia on muutettu."
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
 
@@ -3203,10 +3249,6 @@ msgstr "GM-nimet"
 msgid "NPCs"
 msgstr "NPCt"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Hirviöt"
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr "Hirviön VP-palkki"
diff --git a/po/fr.po b/po/fr.po
index 589dfcb51..05c07fd26 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
@@ -430,7 +430,7 @@ msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Boutique"
 
@@ -699,8 +699,8 @@ msgstr "arc en ciel 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -735,6 +735,7 @@ msgid "Ignore"
 msgstr "Ignorer"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Carte"
 
@@ -1217,6 +1218,7 @@ msgid "Submit"
 msgstr "Soumettre"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "PNJ"
 
@@ -1717,63 +1719,93 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Moteur de son"
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Couleurs"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr "Retirer les couleurs des messages de chat"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
-msgstr "Messages de magie dans l'onglet \"informations\""
-
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Messages de magie et commandes GM dans tous les onglets du chat"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr "Montrer la liste des couleurs de chat"
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
-msgstr "Afficher les messages du serveur dans l'onglet \"informations\""
+#, fuzzy
+msgid "Commands"
+msgstr "Commande :"
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
-msgstr "Montrer la liste des couleurs de chat"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr "Messages de magie et commandes GM dans tous les onglets du chat"
 
 #: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
 msgstr "Limiter le nbre max de car d'une ligne de discussion"
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
-msgstr "Activer l'enregistrement des conversations"
-
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr "Limiter le nbre max de lignes dans le chat"
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
-msgstr "Activer la boite de dialogue d'échanges"
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
-msgstr "Masquer les messages liés à la boutique"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "Activer l'enregistrement des conversations"
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr "Afficher l'historique de discussion"
 
 #: src/gui/setup_chat.cpp:88
+#, fuzzy
+msgid "Messages"
+msgstr "Message"
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr "Masquer les messages liés à la boutique"
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr "Messages de magie dans l'onglet \"informations\""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr "Afficher les messages du serveur dans l'onglet \"informations\""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr "Activer la boite de dialogue d'échanges"
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr "Activer l'onglet de combat"
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr "Afficher les événements de combat"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr "Si besoin est, changer la taille des fenêtre de dialogue"
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr ""
 
@@ -1781,10 +1813,6 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Voilà à quoi ressemble cette couleur"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Couleurs"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Type : "
@@ -1836,8 +1864,8 @@ msgstr "Appliquer"
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr "Éditer"
 
@@ -1889,110 +1917,156 @@ msgstr "Conflit(s) de touche détecté(s)"
 msgid "Misc"
 msgstr "Divers"
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monstres"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr "Montrer les dégâts infligés aux monstres"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
-msgstr "Activer l'attaque de la part du serveur"
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr "Ne viser en auto que les monstres à portée de tir "
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
-msgstr "Auto-correction de position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr "Afficher la portée d'attaque des monstres"
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
-msgstr "Afficher les portails de changement de carte"
+msgid "Show monster hp bar"
+msgstr "Afficher la barre de vie des monstres"
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr "Attaquer en bougeant"
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
-msgstr "Mettre en évidence les items sur le sol"
+msgid "Cycle monster targets"
+msgstr "Entourer les monstres visés"
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
-msgstr "Activer les statistiques instantanées"
+msgid "Show warps particles"
+msgstr "Montrer les effets de déplacement"
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
-msgstr "Afficher la portée d'attaque du joueur"
+msgid "Highlight map portals"
+msgstr "Afficher les portails de changement de carte"
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
-msgstr "Montrer les effets de déplacement"
+msgid "Highlight floor items"
+msgstr "Mettre en évidence les items sur le sol"
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
-msgstr "Afficher la portée d'attaque des monstres"
+msgid "Highlight player attack range"
+msgstr "Afficher la portée d'attaque du joueur"
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
-msgstr "Accepter les requêtes d'achat et de vente"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr "Montrer les mini cartes étendues"
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
-msgstr "Entourer les joueurs visés"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr "Afficher le chemin"
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
-msgstr "Afficher la barre de vie des monstres"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr "Afficher les touches-raccourcis sur la carte"
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
-msgstr "Entourer les monstres visés"
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr "Auto-correction de position"
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr "Attaquer en bougeant"
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr "Synchroniser les mouvements du joueur"
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr "Programme A de mouvement de fou"
+
+#: src/gui/setup_other.cpp:104
+#, fuzzy
+msgid "Player"
+msgstr "Joueurs"
+
+#: src/gui/setup_other.cpp:106
 msgid "Show own hp bar"
 msgstr "Afficher votre propre barre de vie"
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
-msgstr "Activer le testeur de robots"
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr "Activer les statistiques instantanées"
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr "Entourer les joueurs visés"
 
-#: src/gui/setup_other.cpp:98
+#: src/gui/setup_other.cpp:115
 msgid "Show job exp messages"
 msgstr "Afficher les expériences de compétences"
 
-#: src/gui/setup_other.cpp:102
-msgid "Crazy move A program"
-msgstr "Programme A de mouvement de fou"
-
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:118
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
-msgstr "Montrer les mini cartes étendues"
-
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr "Message d'absence"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr "Afficher les compétences"
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr "Activer le mode attaque"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr "Accepter les requêtes d'achat et de vente"
+
+#: src/gui/setup_other.cpp:136
 msgid "Enable shop mode"
 msgstr "Activer le mode boutique"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr "Enregistrer les conversations des PNJ"
+
+#: src/gui/setup_other.cpp:146
+#, fuzzy
+msgid "Other"
+msgstr "Autre"
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable server side attack"
+msgstr "Activer l'attaque de la part du serveur"
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable bot checker"
+msgstr "Activer le testeur de robots"
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr "Activer la protection contre les serveurs instables"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 msgid "Enable debug log"
 msgstr "Activer l'enregistrement des informations"
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr "Mode traffic faible"
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr "Cacher le bouclier"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relation"
@@ -2037,307 +2111,279 @@ msgstr "Placer tous les messages privés dans des onglets"
 msgid "Show gender"
 msgstr "Afficher le genre"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Joueurs"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Quand ignoré :"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 msgid "Show level"
 msgstr "Afficher le niveau"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 msgid "Show own name"
 msgstr "Afficher son propre nom"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 msgid "Target dead players"
 msgstr "Cibler les joueurs morts"
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 msgid "Secure trades"
 msgstr "Protection des échanges"
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr "Caractère à risque dans le nom"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Afficher les noms"
+
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
+msgstr "Minuscule (10)"
+
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
+msgstr "Petite (11)"
+
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
+msgstr "Moyenne (12)"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
+msgstr "Grande (13)"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr "Grand (14)"
+
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr "Immense (15)"
+
+#: src/gui/setup_theme.cpp:140
 msgid "Theme"
 msgstr "Thème"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:142
 msgid "Gui theme"
 msgstr "Thème de l'interface"
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:143
 msgid "Main Font"
 msgstr "Police principale"
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:144
 msgid "Bold font"
 msgstr "Police grasse"
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:145
 msgid "Particle font"
 msgstr "Taille des effets de particules"
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:146
 msgid "Help font"
 msgstr "Police de l'aide"
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:147
 msgid "Secure font"
 msgstr "Police sécurisée"
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Taille de police"
+
+#: src/gui/setup_theme.cpp:281
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 
 #: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
-msgstr "Minuscule (10)"
-
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
-msgstr "Petite (11)"
-
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
-msgstr "Moyenne (12)"
-
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
-msgstr "Grande (13)"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr "Grand (14)"
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr "Immense (15)"
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr "Logiciel"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr "Open GL rapide."
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr "OpenGL sécurisé"
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Pas de texte"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Texte"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Bulles sans noms"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Bulles avec noms"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "aucun"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "léger"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "élevé"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "moyen"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 msgid "Hw acceleration"
 msgstr "Accélération matériel"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Afficher les noms"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Effets de particules"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr "Enregistrer les conversations des PNJ"
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Afficher les messages de ramassage"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "dans la conversation"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "avec des particules"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr "Cacher le bouclier"
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr "Mode traffic faible"
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr "Synchroniser les mouvements du joueur"
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr "Afficher les touches-raccourcis sur la carte"
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr "Afficher le chemin"
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr "Afficher les compétences"
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 msgid "Enable opacity cache"
 msgstr "Activer le cache transparence"
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 msgid "Show background"
 msgstr "Montrer le fond"
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 msgid "Alt FPS limit: "
 msgstr "Alterner les limites FPS"
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr "Texte aérien"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 msgid "Particle detail"
 msgstr "Détail des particules"
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Taille de police"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 msgid "None"
 msgstr "Rien"
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution personnalisée (Exemple : 1024x768)"
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr "Entrer la nouvelle résolution : "
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
 "réduite."
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 msgid "Particle Effect Settings Changed."
 msgstr "Paramètres d'effet de particules modifiés."
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
@@ -3220,10 +3266,6 @@ msgstr "Nom des MJ"
 msgid "NPCs"
 msgstr "PNJs"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Monstres"
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr "Barre de vie des monstres"
diff --git a/po/hr.po b/po/hr.po
index 801be75a7..650d76848 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -457,7 +457,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Trgovina"
 
@@ -745,8 +745,8 @@ msgstr "Duga"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -782,6 +782,7 @@ msgid "Ignore"
 msgstr "Ignorirano"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Karta"
 
@@ -1299,6 +1300,7 @@ msgid "Submit"
 msgstr "Dostavi"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "NPC"
 
@@ -1852,67 +1854,97 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Boje"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:61
+#: src/gui/setup_chat.cpp:64
+#, fuzzy
+msgid "Commands"
+msgstr "Naredba: /who"
+
+#: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
-msgid "Limit max chars in chat line"
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
+#: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:76
-msgid "Limit max lines in chat"
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:88
 #, fuzzy
-msgid "Enable trade tab"
-msgstr "Ne može se kupiti"
+msgid "Messages"
+msgstr "Poruka"
 
-#: src/gui/setup_chat.cpp:82
+#: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
-msgid "Show chat history"
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+#, fuzzy
+msgid "Enable trade tab"
+msgstr "Ne može se kupiti"
+
+#: src/gui/setup_chat.cpp:105
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 #, fuzzy
 msgid "Show battle events"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr ""
 
@@ -1920,10 +1952,6 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Ovako izgleda boja"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Boje"
-
 #: src/gui/setup_colors.cpp:75
 #, fuzzy
 msgid "Type:"
@@ -1980,8 +2008,8 @@ msgstr "Primjeni"
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr ""
 
@@ -2034,122 +2062,166 @@ msgstr "Otkriven je Konflikt(i) Tipki."
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Čudovišta"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:49
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Ne može se kupiti"
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-#, fuzzy
-msgid "Highlight map portals"
-msgstr "Istakni"
-
-#: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
+msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:61
 #, fuzzy
-msgid "Highlight floor items"
-msgstr "Istakni"
+msgid "Cycle monster targets"
+msgstr "Prikaži ime"
 
 #: src/gui/setup_other.cpp:67
 #, fuzzy
-msgid "Enable quick stats"
-msgstr "Omogući igraću palicu"
+msgid "Show warps particles"
+msgstr "kao čestica"
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
-msgstr ""
+#, fuzzy
+msgid "Highlight map portals"
+msgstr "Istakni"
 
 #: src/gui/setup_other.cpp:73
 #, fuzzy
-msgid "Show warps particles"
-msgstr "kao čestica"
+msgid "Highlight floor items"
+msgstr "Istakni"
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-#, fuzzy
-msgid "Cycle monster targets"
-msgstr "Prikaži ime"
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr "Igrač"
+
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:109
 #, fuzzy
-msgid "Enable bot checker"
+msgid "Enable quick stats"
 msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
-msgid "Crazy move A program"
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:118
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
-msgstr ""
-
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:121
 #, fuzzy
 msgid "Afk message"
 msgstr "Poruka"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
 #, fuzzy
 msgid "Enable attack filter"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Omogući/Onemogući Trgovanje"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:146
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:148
+#, fuzzy
+msgid "Enable server side attack"
+msgstr "Ne može se kupiti"
+
+#: src/gui/setup_other.cpp:151
+#, fuzzy
+msgid "Enable bot checker"
+msgstr "Omogući igraću palicu"
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Ne može se kupiti"
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr ""
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Odnos"
@@ -2195,324 +2267,296 @@ msgstr "Stavi sve šapate u kartice"
 msgid "Show gender"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Igrači"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 #, fuzzy
 msgid "Show level"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 #, fuzzy
 msgid "Show own name"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 #, fuzzy
 msgid "Target dead players"
 msgstr "Ciljaj Igrača"
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 #, fuzzy
 msgid "Secure trades"
 msgstr "Složi se za trgovanje"
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Vidljiva imena"
+
+#: src/gui/setup_theme.cpp:105
+#, fuzzy
+msgid "Tiny (10)"
+msgstr "Sićušno"
+
+#: src/gui/setup_theme.cpp:106
+#, fuzzy
+msgid "Small (11)"
+msgstr "Maleno"
+
+#: src/gui/setup_theme.cpp:107
+#, fuzzy
+msgid "Medium (12)"
+msgstr "Srednje"
+
+#: src/gui/setup_theme.cpp:108
+#, fuzzy
+msgid "Large (13)"
+msgstr "Veliko"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:140
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:142
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:143
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:144
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:145
 #, fuzzy
 msgid "Particle font"
 msgstr "Efekti Čestica"
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:146
 #, fuzzy
 msgid "Help font"
 msgstr "Pomoć"
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:147
 #, fuzzy
 msgid "Secure font"
 msgstr "Složi se za trgovanje"
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Veličina fonta"
+
+#: src/gui/setup_theme.cpp:281
 #, fuzzy
 msgid "Theme Changed"
 msgstr "Izmijeni"
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
 #: src/gui/setup_video.cpp:194
-#, fuzzy
-msgid "Tiny (10)"
-msgstr "Sićušno"
-
-#: src/gui/setup_video.cpp:195
-#, fuzzy
-msgid "Small (11)"
-msgstr "Maleno"
-
-#: src/gui/setup_video.cpp:196
-#, fuzzy
-msgid "Medium (12)"
-msgstr "Srednje"
-
-#: src/gui/setup_video.cpp:197
-#, fuzzy
-msgid "Large (13)"
-msgstr "Veliko"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 #, fuzzy
 msgid "Fast OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 #, fuzzy
 msgid "Safe OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Nema teksta"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Mjehurići, bez imena"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Mjehurići s imenima"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "isključeno"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "nisko"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "visoko"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "srednje"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "Pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 #, fuzzy
 msgid "Hw acceleration"
 msgstr "Odnos"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Vlastiti kursor"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Vidljiva imena"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Efekt čestica"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Prikaži obavijesti o prikupljanju."
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "u chat-u"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "kao čestica"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 #, fuzzy
 msgid "Enable opacity cache"
 msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "Show background"
 msgstr "Pozadina"
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Ograničenje sličica u sekundi"
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "Ograničenje sličica u sekundi"
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Slika"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr "Tekst iznad glave"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr "Prozirnost sučelja"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr "Efekti okruženja"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 #, fuzzy
 msgid "Particle detail"
 msgstr "Detalji Čestica"
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Veličina fonta"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 #, fuzzy
 msgid "None"
 msgstr "Ne"
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Prebacivanje u pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Promjena OpenGL-a"
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Rezolucija Ekrana promijenjena"
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Postavke efekta čestica su promijenjene."
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "Promjene će stupiti na snagu na promjeni karte."
 
@@ -3427,10 +3471,6 @@ msgstr "GM Imena"
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Čudovišta"
-
 #: src/gui/userpalette.cpp:126
 #, fuzzy
 msgid "Monster HP bar"
@@ -6223,9 +6263,6 @@ msgstr "Nepoznati predmet"
 #~ msgid "GM"
 #~ msgstr "GM"
 
-#~ msgid "Player"
-#~ msgstr "Igrač"
-
 #~ msgid "Is"
 #~ msgstr "Je"
 
diff --git a/po/hu.po b/po/hu.po
index 21acf7705..1c16fc7d1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -452,7 +452,7 @@ msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Üzlet"
 
@@ -741,8 +741,8 @@ msgstr "Szivárvány"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -778,6 +778,7 @@ msgid "Ignore"
 msgstr "Tiltott"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Térkép"
 
@@ -1293,6 +1294,7 @@ msgid "Submit"
 msgstr "Küldés"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "Gépjátékos"
 
@@ -1846,67 +1848,97 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Színek"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:61
+#: src/gui/setup_chat.cpp:64
+#, fuzzy
+msgid "Commands"
+msgstr "Parancs: /who"
+
+#: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
+#: src/gui/setup_chat.cpp:70
+msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
-msgid "Limit max chars in chat line"
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
+#: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:76
-msgid "Limit max lines in chat"
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:88
 #, fuzzy
-msgid "Enable trade tab"
-msgstr "Nem tudod megvenni."
+msgid "Messages"
+msgstr "Üzenet"
 
-#: src/gui/setup_chat.cpp:82
+#: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
-msgid "Show chat history"
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+#, fuzzy
+msgid "Enable trade tab"
+msgstr "Nem tudod megvenni."
+
+#: src/gui/setup_chat.cpp:105
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 #, fuzzy
 msgid "Show battle events"
 msgstr "A név mutatása"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Következő Chat Fül"
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr ""
 
@@ -1914,10 +1946,6 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Így fog kinézni a felirat."
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Színek"
-
 #: src/gui/setup_colors.cpp:75
 #, fuzzy
 msgid "Type:"
@@ -1974,8 +2002,8 @@ msgstr "Alkalmaz"
 msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr ""
 
@@ -2028,122 +2056,166 @@ msgstr "Billentyű ütközés van."
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Szörny neve"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:49
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Nem tudod megvenni."
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-#, fuzzy
-msgid "Highlight map portals"
-msgstr "Kijelölt"
-
-#: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
+msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:61
 #, fuzzy
-msgid "Highlight floor items"
-msgstr "Kijelölt"
+msgid "Cycle monster targets"
+msgstr "A név mutatása"
 
 #: src/gui/setup_other.cpp:67
 #, fuzzy
-msgid "Enable quick stats"
-msgstr "Joystick engedélyezése"
+msgid "Show warps particles"
+msgstr "Karakter felett"
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
-msgstr ""
+#, fuzzy
+msgid "Highlight map portals"
+msgstr "Kijelölt"
 
 #: src/gui/setup_other.cpp:73
 #, fuzzy
-msgid "Show warps particles"
-msgstr "Karakter felett"
+msgid "Highlight floor items"
+msgstr "Kijelölt"
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-#, fuzzy
-msgid "Cycle monster targets"
-msgstr "A név mutatása"
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr "Játékos"
+
+#: src/gui/setup_other.cpp:106
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "A név mutatása"
 
-#: src/gui/setup_other.cpp:95
+#: src/gui/setup_other.cpp:109
 #, fuzzy
-msgid "Enable bot checker"
+msgid "Enable quick stats"
 msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
-msgid "Crazy move A program"
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:118
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
-msgstr ""
-
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:121
 #, fuzzy
 msgid "Afk message"
 msgstr "Üzenet"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
 #, fuzzy
 msgid "Enable attack filter"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:146
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:148
+#, fuzzy
+msgid "Enable server side attack"
+msgstr "Nem tudod megvenni."
+
+#: src/gui/setup_other.cpp:151
+#, fuzzy
+msgid "Enable bot checker"
+msgstr "Joystick engedélyezése"
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Nem tudod megvenni."
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr ""
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Kapcsolat"
@@ -2189,326 +2261,298 @@ msgstr "Privátok fülekbe tétele"
 msgid "Show gender"
 msgstr "A név mutatása"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Játékosok"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Ha ignorolva van:"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 #, fuzzy
 msgid "Show level"
 msgstr "A név mutatása"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 #, fuzzy
 msgid "Show own name"
 msgstr "A név mutatása"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 #, fuzzy
 msgid "Target dead players"
 msgstr "Játékost Kijelöl"
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 #, fuzzy
 msgid "Secure trades"
 msgstr "Üzlet elfogadása"
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Látható nevek"
+
+#: src/gui/setup_theme.cpp:105
+#, fuzzy
+msgid "Tiny (10)"
+msgstr "Apró"
+
+#: src/gui/setup_theme.cpp:106
+#, fuzzy
+msgid "Small (11)"
+msgstr "Kicsi"
+
+#: src/gui/setup_theme.cpp:107
+#, fuzzy
+msgid "Medium (12)"
+msgstr "Közepes"
+
+#: src/gui/setup_theme.cpp:108
+#, fuzzy
+msgid "Large (13)"
+msgstr "Nagy"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:140
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:142
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:143
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:144
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:145
 #, fuzzy
 msgid "Particle font"
 msgstr "Effektek"
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:146
 #, fuzzy
 msgid "Help font"
 msgstr "Súgó"
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:147
 #, fuzzy
 msgid "Secure font"
 msgstr "Üzlet elfogadása"
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Betűméret"
+
+#: src/gui/setup_theme.cpp:281
 #, fuzzy
 msgid "Theme Changed"
 msgstr "Változtatás"
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
 msgid "Restart your client for the change to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
 #: src/gui/setup_video.cpp:194
-#, fuzzy
-msgid "Tiny (10)"
-msgstr "Apró"
-
-#: src/gui/setup_video.cpp:195
-#, fuzzy
-msgid "Small (11)"
-msgstr "Kicsi"
-
-#: src/gui/setup_video.cpp:196
-#, fuzzy
-msgid "Medium (12)"
-msgstr "Közepes"
-
-#: src/gui/setup_video.cpp:197
-#, fuzzy
-msgid "Large (13)"
-msgstr "Nagy"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr ""
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 #, fuzzy
 msgid "Fast OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 #, fuzzy
 msgid "Safe OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Nincs szöveg"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Buborékok, nincs név."
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Buborékok nevekkel"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "ki"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "alacsony"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "magas"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "közepes"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "max."
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "Teljes képernyő"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 #, fuzzy
 msgid "Hw acceleration"
 msgstr "Kapcsolat"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Egyéni kurzor"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Látható nevek"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Játékbéli effektek"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Értesítés tárgy felvételkor"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "Chat-en belül"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "Karakter felett"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 #, fuzzy
 msgid "Enable opacity cache"
 msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 #, fuzzy
 msgid "Show background"
 msgstr "Háttér"
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Videó"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr "Fej feletti szöveg"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr "Menük áttetszősége"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr "Környezeti effektek"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 #, fuzzy
 msgid "Particle detail"
 msgstr "Effektek részletessége"
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Betűméret"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 #, fuzzy
 msgid "None"
 msgstr "Nem"
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Átállás teljes képernyőre"
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "OpenGL átállítása"
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "A képernyő felbontása megváltozott"
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Effektek beállítása megváltozott."
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "A változások érvénybe lépéséhez töltsön be egy új térképet."
 
@@ -3424,10 +3468,6 @@ msgstr "GM név"
 msgid "NPCs"
 msgstr "Gépjátékos neve"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Szörny neve"
-
 #: src/gui/userpalette.cpp:126
 #, fuzzy
 msgid "Monster HP bar"
@@ -6285,9 +6325,6 @@ msgstr "Ismeretlen tárgy"
 #~ msgid "GM"
 #~ msgstr "GM"
 
-#~ msgid "Player"
-#~ msgstr "Játékos"
-
 #~ msgid "Is"
 #~ msgstr "Is"
 
diff --git a/po/id.po b/po/id.po
index aa8237823..5571ede52 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-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
 "PO-Revision-Date: 2011-07-01 15:54+0000\n"
 "Last-Translator: adjieps <adjieps@yahoo.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -421,7 +421,7 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Toko"
 
@@ -690,8 +690,8 @@ msgstr "pelangi 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -726,6 +726,7 @@ msgid "Ignore"
 msgstr "Abaikan"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Peta"
 
@@ -1206,6 +1207,7 @@ msgid "Submit"
 msgstr "Masukan"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "NPC"
 
@@ -1705,63 +1707,93 @@ msgstr "Anda harus merestart klien anda untuk mengunduh musik baru."
 msgid "Sound Engine"
 msgstr "Pengaturan suara"
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Warna"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr "Hapus warna dari pesan obrolan yang masuk"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
-msgstr "Riwayat pesan sihir di jendela debug"
-
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Perbolehkan sihir dan Perintah GM di semua jendela obrolan"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr "Tunjukkan daftar warna obrolan"
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
-msgstr "Tujukkan pesan server di jendela debug"
+#, fuzzy
+msgid "Commands"
+msgstr "Perintah:"
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
-msgstr "Tunjukkan daftar warna obrolan"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr "Perbolehkan sihir dan Perintah GM di semua jendela obrolan"
 
 #: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
 msgstr "Batas maksimal karakter di garis obrolan"
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
-msgstr "Perbolehkan riwayat obrolan"
-
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr "Batas maksimal baris di obrolan"
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
-msgstr "Perbolehkan jendela transkaksi/trade"
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
-msgstr "Sembunyikan pesan Jual"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "Perbolehkan riwayat obrolan"
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr "Tunjukkan riwayat obrolan"
 
 #: src/gui/setup_chat.cpp:88
+#, fuzzy
+msgid "Messages"
+msgstr "Pesan saat meninggalkan keyboard"
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr "Sembunyikan pesan Jual"
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr "Riwayat pesan sihir di jendela debug"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr "Tujukkan pesan server di jendela debug"
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr "Perbolehkan jendela transkaksi/trade"
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr "Perbolehkan jendela pertarungan"
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr "Tunjukkan event pertarungan"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr "Atur besar jendela obrolan apabila dibutuhkan"
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr "Pengunaan waktu lokal"
 
@@ -1769,10 +1801,6 @@ msgstr "Pengunaan waktu lokal"
 msgid "This is what the color looks like"
 msgstr "Warnanya terlihat seperti ini"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Warna"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Tipe"
@@ -1824,8 +1852,8 @@ msgstr "Terapkan"
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr "Ganti"
 
@@ -1877,110 +1905,156 @@ msgstr "Pertentangan kunci(kunci) terdeteksi."
 msgid "Misc"
 msgstr "macam-macam"
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr "Tampilkan damage yang ditimbulkan monster"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
-msgstr ""
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr "Jadikan monster yang terjangkau sebagai target otomatis"
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
-msgstr "Perbaiki posisi otomatis"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr "Sorot Jangkauan menyerang monster"
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
-msgstr "Sorot portal peta"
+msgid "Show monster hp bar"
+msgstr "Tampilkan hp bar monster"
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr "Menyerang ketika berjalan"
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
-msgstr "Sorot item yang jatuh"
+msgid "Cycle monster targets"
+msgstr "Siklus target monster"
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
+msgid "Show warps particles"
 msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
-msgstr "Sorot Jangkauan menyerang pemain"
+msgid "Highlight map portals"
+msgstr "Sorot portal peta"
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
-msgstr ""
+msgid "Highlight floor items"
+msgstr "Sorot item yang jatuh"
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
-msgstr "Sorot Jangkauan menyerang monster"
+msgid "Highlight player attack range"
+msgstr "Sorot Jangkauan menyerang pemain"
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
-msgstr "Terima permintaan jual/beli"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
-msgstr "Siklus target pemain"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
-msgstr "Tampilkan hp bar monster"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
-msgstr "Siklus target monster"
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr "Perbaiki posisi otomatis"
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr "Menyerang ketika berjalan"
+
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr "Program Crazy move A"
+
+#: src/gui/setup_other.cpp:104
+#, fuzzy
+msgid "Player"
+msgstr "Pemain"
+
+#: src/gui/setup_other.cpp:106
 msgid "Show own hp bar"
 msgstr "Tampilkan hp bar sendiri"
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
-msgstr "Perbolehkan pengecekan bot"
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr "Siklus target pemain"
 
-#: src/gui/setup_other.cpp:98
+#: src/gui/setup_other.cpp:115
 msgid "Show job exp messages"
 msgstr "Tampilkan pesan exp job"
 
-#: src/gui/setup_other.cpp:102
-msgid "Crazy move A program"
-msgstr "Program Crazy move A"
-
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:118
 msgid "Show players popups"
 msgstr "Tampilkan popup pemain"
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
-msgstr ""
-
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr "Pesan saat meninggalkan keyboard"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr "Perlihatkan Job"
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr "Terima permintaan jual/beli"
+
+#: src/gui/setup_other.cpp:136
 msgid "Enable shop mode"
 msgstr "Perbolehkan mode Jual"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr "Riwayat dialog NPC"
+
+#: src/gui/setup_other.cpp:146
+#, fuzzy
+msgid "Other"
+msgstr "lainnya"
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable bot checker"
+msgstr "Perbolehkan pengecekan bot"
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 msgid "Enable debug log"
 msgstr ""
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr ""
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Hubungan"
@@ -2025,299 +2099,271 @@ msgstr "Masukkan semua bisikan kedalam tab"
 msgid "Show gender"
 msgstr "Perlihatkan jenis kelamin"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Pemain"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Ketika menolak:"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 msgid "Show level"
 msgstr "Perlihatkan Level"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 msgid "Show own name"
 msgstr "Perlihatkan nama sendiri"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 msgid "Target dead players"
 msgstr "Target pemain yang mati"
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 msgid "Secure trades"
 msgstr "Pertukaran yang aman"
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr "Penggunaan karakter yang tidak diperbolehkan pada nama"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Nama yang tampak"
+
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
+msgstr "Sangat kecil (10)"
+
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
+msgstr "Kecil (11)"
+
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
+msgstr "Sedang (12)"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
+msgstr "Besar (13)"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr "Sangat besar (14)"
+
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr "Sangat besar sekali (15)"
+
+#: src/gui/setup_theme.cpp:140
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:142
 msgid "Gui theme"
 msgstr "Tema Gui"
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:143
 msgid "Main Font"
 msgstr "Jenis huruf utama"
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:144
 msgid "Bold font"
 msgstr "Jenis huruf tebal"
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:145
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:146
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:147
 msgid "Secure font"
 msgstr "Jenis huruf/Karakter yang diperbolehkan"
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Ukuran huruf"
+
+#: src/gui/setup_theme.cpp:281
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
 #: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
-msgstr "Sangat kecil (10)"
-
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
-msgstr "Kecil (11)"
-
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
-msgstr "Sedang (12)"
-
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
-msgstr "Besar (13)"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr "Sangat besar (14)"
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr "Sangat besar sekali (15)"
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr "Perangkat lunak"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr "OpenGL cepat"
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr "OpenGL aman"
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "tidak ada teks"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Teks"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "mati"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "rendah"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "tinggi"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "sedang"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "maksimal"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 msgid "Hw acceleration"
 msgstr "Akselerasi perangkat keras"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Modifikasi kursor"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Nama yang tampak"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Efek partikel"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr "Riwayat dialog NPC"
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Perlihatkan notifikasi pengambilan item"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "dalam obrolan"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "sebagai partikel"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr "Perlihatkan Job"
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 msgid "Enable opacity cache"
 msgstr ""
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 msgid "FPS limit:"
 msgstr "Batas FPS:"
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS:"
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 msgid "Particle detail"
 msgstr "Detil partikel"
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Ukuran huruf"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 msgid "None"
 msgstr "Tidak ada"
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 msgid "Switching to Full Screen"
 msgstr "Mengubah ke mode Layar penuh"
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 msgid "Changing to OpenGL"
 msgstr "Mengubah ke OpenGL"
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr "Masukkan resolusi baru:"
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 msgid "Screen Resolution Changed"
 msgstr "Resolusi layar diubah"
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 msgid "Particle Effect Settings Changed."
 msgstr "Pengaturan efek partikel diubah"
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "Perubahan akan memberikan efek saat pergantian peta."
 
@@ -3194,10 +3240,6 @@ msgstr ""
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr ""
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 0ffc7acd8..de72232ec 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-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+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"
@@ -421,7 +421,7 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr ""
 
@@ -690,8 +690,8 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
@@ -726,6 +726,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr ""
 
@@ -1208,6 +1209,7 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr ""
 
@@ -1706,63 +1708,91 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55
-msgid "Remove colors from received chat messages"
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
+msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:70
-msgid "Limit max chars in chat line"
+msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:72
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
+msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr ""
 
@@ -1770,10 +1800,6 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr ""
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
@@ -1825,8 +1851,8 @@ msgstr ""
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr ""
 
@@ -1878,110 +1904,154 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
-msgid "Show damage inflicted to monsters"
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
+#: src/gui/setup_other.cpp:48
+msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
+msgid "Show monster hp bar"
 msgstr ""
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr ""
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
+msgid "Cycle monster targets"
 msgstr ""
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
+msgid "Show warps particles"
 msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
+msgid "Highlight map portals"
 msgstr ""
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
+msgid "Highlight floor items"
 msgstr ""
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
+msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:92
-msgid "Show own hp bar"
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:100
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
-msgid "Show players popups"
+#: src/gui/setup_other.cpp:104
+msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:146
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 msgid "Enable debug log"
 msgstr ""
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr ""
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr ""
@@ -2026,299 +2096,271 @@ msgstr ""
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
-msgid "Theme"
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:113
-msgid "Gui theme"
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
-msgid "Main Font"
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
-msgid "Bold font"
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
-msgid "Particle font"
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:117
-msgid "Help font"
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:118
-msgid "Secure font"
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:241
-msgid "Theme Changed"
+#: src/gui/setup_theme.cpp:140
+msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_theme.cpp:142
+msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
+#: src/gui/setup_theme.cpp:143
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
+#: src/gui/setup_theme.cpp:144
+msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
+#: src/gui/setup_theme.cpp:145
+msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:146
+msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:147
+msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:281
+msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
 msgid "Software"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 msgid "Enable opacity cache"
 msgstr ""
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr ""
 
@@ -3195,10 +3237,6 @@ msgstr ""
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr ""
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 6f956a456..f439c6915 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
@@ -425,7 +425,7 @@ msgid "Max"
 msgstr "Maximum"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Winkel"
 
@@ -694,8 +694,8 @@ msgstr "regenboog 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -730,6 +730,7 @@ msgid "Ignore"
 msgstr "Negeer"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Map"
 
@@ -1212,6 +1213,7 @@ msgid "Submit"
 msgstr "Indienen"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "NPC"
 
@@ -1713,63 +1715,93 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Geluidsengine"
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Kleuren"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr "Verwijder kleuren van ontvangen chat berichten"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr "Toon chat kleurenlijst"
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
-msgstr "Toon server berichten in de debug tab"
+#, fuzzy
+msgid "Commands"
+msgstr "Commando: /users"
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
-msgstr "Toon chat kleurenlijst"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
 msgstr "Limiteer max karakters in chat lijn"
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
-msgstr "Zet chat log aan"
-
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr "Limiteer max lijnen in chat"
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
-msgstr "Zet handle tab aan"
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
-msgstr "Verberg verkoop boodschappen"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "Zet chat log aan"
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr "Toon chat geschiedenis"
 
 #: src/gui/setup_chat.cpp:88
+#, fuzzy
+msgid "Messages"
+msgstr "Bericht"
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr "Verberg verkoop boodschappen"
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr "Toon server berichten in de debug tab"
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr "Zet handle tab aan"
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr ""
 
@@ -1777,10 +1809,6 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Kleuren"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Type:"
@@ -1832,8 +1860,8 @@ msgstr "Toepassen"
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr "Wijzig"
 
@@ -1885,110 +1913,155 @@ msgstr "Conflict(en) tussen toetsen gevonden."
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monsters"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr "Toon aangebrachte schade aan monsters"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
-msgstr ""
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
+msgid "Show monster hp bar"
 msgstr ""
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
-msgstr "Markeer vloer voorwerpen"
-
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
+msgid "Show warps particles"
 msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
+msgid "Highlight map portals"
 msgstr ""
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
-msgstr ""
+msgid "Highlight floor items"
+msgstr "Markeer vloer voorwerpen"
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
+msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:92
-msgid "Show own hp bar"
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:100
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
-msgid "Show players popups"
+#: src/gui/setup_other.cpp:104
+#, fuzzy
+msgid "Player"
+msgstr "Spelers"
+
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:146
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr ""
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relatie"
@@ -2033,301 +2106,273 @@ msgstr ""
 msgid "Show gender"
 msgstr "Toon geslacht"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Spelers"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 msgid "Show level"
 msgstr "Toon niveau"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 msgid "Show own name"
 msgstr "Toon eigen naam"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
-msgid "Theme"
-msgstr ""
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Zichtbare namen"
 
-#: src/gui/setup_theme.cpp:113
-msgid "Gui theme"
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:114
-msgid "Main Font"
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:115
-msgid "Bold font"
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:116
-msgid "Particle font"
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:117
-msgid "Help font"
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:118
-msgid "Secure font"
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:241
-msgid "Theme Changed"
+#: src/gui/setup_theme.cpp:140
+msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
-msgid "Restart your client for the change to take effect."
-msgstr "Herstart de client om de wijzigingen in werking te doen treden."
+#: src/gui/setup_theme.cpp:142
+msgid "Gui theme"
+msgstr ""
 
-#: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
+#: src/gui/setup_theme.cpp:143
+msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
+#: src/gui/setup_theme.cpp:144
+msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
+#: src/gui/setup_theme.cpp:145
+msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:146
+msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:147
+msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Lettergrootte"
+
+#: src/gui/setup_theme.cpp:281
+msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
+msgid "Restart your client for the change to take effect."
+msgstr "Herstart de client om de wijzigingen in werking te doen treden."
+
+#: src/gui/setup_video.cpp:194
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr "Snelle OpenGL"
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr "Veilige OpenGL"
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Geen tekst"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Bellen, geen namen"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Bellen met namen"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "uit"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "laag"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "hoog"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "gemiddeld"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 msgid "Hw acceleration"
 msgstr "Hw acceleratie"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Zichtbare namen"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Notificatie bij oprapen weergeven"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "in chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "als deeltje"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr ""
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr ""
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr ""
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr ""
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr ""
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 msgid "Enable opacity cache"
 msgstr ""
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Lettergrootte"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 msgid "None"
 msgstr "Geen"
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:                "
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
 "resolutie"
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
@@ -3206,10 +3251,6 @@ msgstr "GM Namen"
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Monsters"
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index ad1cd5bb5..16311f75d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
 "PO-Revision-Date: 2011-06-22 04:18+0000\n"
 "Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
@@ -426,7 +426,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Loja"
 
@@ -695,8 +695,8 @@ msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -731,6 +731,7 @@ msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Mapa"
 
@@ -1213,6 +1214,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "NPC"
 
@@ -1713,63 +1715,93 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Mecanismo de som"
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Cores"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr "Remover mensagens coloridas do chat"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
-msgstr "Salvar comandos de feitiços na aba do Depurador"
-
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Permitir feitiços e comandos de GM em todas abas"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr "Mostrar lista de cores do chat"
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
-msgstr "Mostrar as mensagens do servidor na aba do Depurador"
+#, fuzzy
+msgid "Commands"
+msgstr "Comando:"
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
-msgstr "Mostrar lista de cores do chat"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr "Permitir feitiços e comandos de GM em todas abas"
 
 #: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
 msgstr "Limite de caracteres na linha de chat"
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
-msgstr "Salvar conversas"
-
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr "Limite de linhas máximas no chat"
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
-msgstr "Habilitar aba de negociação"
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
-msgstr "Esconder mensagens de loja"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "Salvar conversas"
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr "Mostrar mensagens antigas"
 
 #: src/gui/setup_chat.cpp:88
+#, fuzzy
+msgid "Messages"
+msgstr "Mensagem"
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr "Esconder mensagens de loja"
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr "Salvar comandos de feitiços na aba do Depurador"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr "Mostrar as mensagens do servidor na aba do Depurador"
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr "Habilitar aba de negociação"
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar as abas de chat caso precisar"
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr "Usar hora local"
 
@@ -1777,10 +1809,6 @@ msgstr "Usar hora local"
 msgid "This is what the color looks like"
 msgstr "A cor vai ficar assim"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Cores"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Tipo:"
@@ -1832,8 +1860,8 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr "Editar"
 
@@ -1885,110 +1913,156 @@ msgstr "Conflitos de teclas detectado."
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monstros"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
-msgstr "Habilitar ataque do lado do servidor"
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
-msgstr "Auto-ajustar posição"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr "Destacar alcance de inimigos"
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
-msgstr "Destacar portais do mapa"
+msgid "Show monster hp bar"
+msgstr "Mostrar barra de hp dos monstros"
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr "Atacar enquanto se move"
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
-msgstr "Destacar itens no chão"
+msgid "Cycle monster targets"
+msgstr "Alvo de monstros em ciclo"
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
-msgstr "Habilitar stats rápidos"
+msgid "Show warps particles"
+msgstr "Mostrar partículas de warps"
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
-msgstr "Destacar alcance de meu ataque"
+msgid "Highlight map portals"
+msgstr "Destacar portais do mapa"
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
-msgstr "Mostrar partículas de warps"
+msgid "Highlight floor items"
+msgstr "Destacar itens no chão"
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
-msgstr "Destacar alcance de inimigos"
+msgid "Highlight player attack range"
+msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
-msgstr "Aceitar convites de compra/venda"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
-msgstr "Alvo de jogadores em ciclo"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr "Desenhar caminho"
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
-msgstr "Mostrar barra de hp dos monstros"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr "Desenhar atalhos no mapa"
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
-msgstr "Alvo de monstros em ciclo"
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr "Auto-ajustar posição"
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr "Sincronizar movimento"
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr "Movimentos loucos"
+
+#: src/gui/setup_other.cpp:104
+#, fuzzy
+msgid "Player"
+msgstr "Jogadores"
+
+#: src/gui/setup_other.cpp:106
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
-msgstr "Habilitar Analisador de bot"
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr "Habilitar stats rápidos"
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:98
+#: src/gui/setup_other.cpp:115
 msgid "Show job exp messages"
 msgstr "Mostrar menssagens de job exp"
 
-#: src/gui/setup_other.cpp:102
-msgid "Crazy move A program"
-msgstr "Movimentos loucos"
-
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:118
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
-msgstr "Mostrar minimapas grandes"
-
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr "Mensagem Ausente"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr "Mostrar job"
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr "A habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr "Aceitar convites de compra/venda"
+
+#: src/gui/setup_other.cpp:136
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr "Salvar diálogos com NPC"
+
+#: src/gui/setup_other.cpp:146
+#, fuzzy
+msgid "Other"
+msgstr "Outro"
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable server side attack"
+msgstr "Habilitar ataque do lado do servidor"
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable bot checker"
+msgstr "Habilitar Analisador de bot"
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr "Habilitar proteção contra servidores com bugs"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr "Modo de baixo tráfego"
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr "Ocultar sprite de escudo"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relação"
@@ -2033,303 +2107,275 @@ msgstr "Deixar as mensagens privadas em abas"
 msgid "Show gender"
 msgstr "Mostrar gênero"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 msgid "Show level"
 msgstr "Mostrar nível"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 msgid "Target dead players"
 msgstr "Jogadores mortos como alvo"
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr "Letras de nome inseguras"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Nomes visíveis"
+
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
+msgstr "Minúsculo (10)"
+
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
+msgstr "Pequeno (11)"
+
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
+msgstr "Médio (12)"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
+msgstr "Largo (13)"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr "Grande (14)"
+
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr "Enorme (15)"
+
+#: src/gui/setup_theme.cpp:140
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:142
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:143
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:144
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:145
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:146
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:147
 msgid "Secure font"
 msgstr "Fonte Segura"
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Tamanho da fonte"
+
+#: src/gui/setup_theme.cpp:281
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
 #: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
-msgstr "Minúsculo (10)"
-
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
-msgstr "Pequeno (11)"
-
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
-msgstr "Médio (12)"
-
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
-msgstr "Largo (13)"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr "Grande (14)"
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr "Enorme (15)"
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr "Rápido OpenGL"
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr "Seguro OpenGL"
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Sem texto"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Texto"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Bolhas, sem nomes"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Bolhas com nomes"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "off"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "médio"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 msgid "Hw acceleration"
 msgstr "Aceleração por HW"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Nomes visíveis"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr "Salvar diálogos com NPC"
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "em chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr "Ocultar sprite de escudo"
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr "Modo de baixo tráfego"
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr "Sincronizar movimento"
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr "Desenhar atalhos no mapa"
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr "Desenhar caminho"
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr "Mostrar job"
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 msgid "Enable opacity cache"
 msgstr "Habilitar cache de opacidade"
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr "Opacidade"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Tamanho da fonte"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -3207,10 +3253,6 @@ msgstr "Nomes dos GMs"
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Monstros"
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr "Barra de HP"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 89222f8ba..400eb07e2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
 "PO-Revision-Date: 2011-06-22 04:16+0000\n"
 "Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
@@ -428,7 +428,7 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Loja"
 
@@ -697,8 +697,8 @@ msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -733,6 +733,7 @@ msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Mapa"
 
@@ -1215,6 +1216,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "NPC"
 
@@ -1715,63 +1717,93 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Mecanismo de som"
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Cores"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr "Remover mensagens coloridas do chat"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
-msgstr "Salvar comandos de feitiços na aba do Depurador"
-
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Permitir feitiços e comandos de GM em todas abas"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr "Mostrar lista de cores do chat"
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
-msgstr "Mostrar as mensagens do servidor na aba do Depurador"
+#, fuzzy
+msgid "Commands"
+msgstr "Comando:"
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
-msgstr "Mostrar lista de cores do chat"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr "Permitir feitiços e comandos de GM em todas abas"
 
 #: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
 msgstr "Limite de caracteres na linha de chat"
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
-msgstr "Salvar conversas"
-
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr "Limite de linhas máximas no chat"
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
-msgstr "Habilitar aba de negociação"
+msgid "Logs"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
-msgstr "Esconder mensagens de loja"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "Salvar conversas"
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr "Mostrar mensagens antigas"
 
 #: src/gui/setup_chat.cpp:88
+#, fuzzy
+msgid "Messages"
+msgstr "Mensagem"
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr "Esconder mensagens de loja"
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr "Salvar comandos de feitiços na aba do Depurador"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr "Mostrar as mensagens do servidor na aba do Depurador"
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr "Habilitar aba de negociação"
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar aba de chat caso precisar"
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr "Usar tempo local"
 
@@ -1779,10 +1811,6 @@ msgstr "Usar tempo local"
 msgid "This is what the color looks like"
 msgstr "A cor vai ficar assim"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Cores"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Tipo:"
@@ -1834,8 +1862,8 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr "Editar"
 
@@ -1887,110 +1915,156 @@ msgstr "Conflitos de teclas detectado."
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Monstros"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
-msgstr "Habilitar ataque do lado do servidor"
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
-msgstr "Auto-ajustar posição"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr "Destacar alcance de inimigos"
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
-msgstr "Destacar portais do mapa"
+msgid "Show monster hp bar"
+msgstr "Mostrar barra de hp dos monstros"
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr "Atacar enquanto se move"
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
-msgstr "Destacar itens no chão"
+msgid "Cycle monster targets"
+msgstr "Alvo de monstros em ciclo"
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
-msgstr "Habilitar stats rápidos"
+msgid "Show warps particles"
+msgstr "Mostrar partículas de warps"
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
-msgstr "Destacar alcance de meu ataque"
+msgid "Highlight map portals"
+msgstr "Destacar portais do mapa"
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
-msgstr "Mostrar partículas de warps"
+msgid "Highlight floor items"
+msgstr "Destacar itens no chão"
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
-msgstr "Destacar alcance de inimigos"
+msgid "Highlight player attack range"
+msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
-msgstr "Aceitar convites de compra/venda"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
-msgstr "Alvo de jogadores em ciclo"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr "Desenhar caminho"
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
-msgstr "Mostrar barra de hp dos monstros"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr "Desenhar atalhos no mapa"
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
-msgstr "Alvo de monstros em ciclo"
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr "Auto-ajustar posição"
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr "Sincronizar movimento"
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr "Movimentos loucos"
+
+#: src/gui/setup_other.cpp:104
+#, fuzzy
+msgid "Player"
+msgstr "Jogadores"
+
+#: src/gui/setup_other.cpp:106
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
-msgstr "Habilitar Analisador de bot"
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr "Habilitar stats rápidos"
+
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:98
+#: src/gui/setup_other.cpp:115
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
-#: src/gui/setup_other.cpp:102
-msgid "Crazy move A program"
-msgstr "Movimentos loucos"
-
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:118
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
-msgstr "Mostrar minimapas grandes"
-
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr "Mensagem Ausente"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr "Mostrar job"
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr "Aceitar convites de compra/venda"
+
+#: src/gui/setup_other.cpp:136
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr "Salvar diálogos com NPC"
+
+#: src/gui/setup_other.cpp:146
+#, fuzzy
+msgid "Other"
+msgstr "Outro"
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable server side attack"
+msgstr "Habilitar ataque do lado do servidor"
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable bot checker"
+msgstr "Habilitar Analisador de bot"
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr "Habilitar proteção contra servidores com bugs"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr "Modo de baixo tráfego"
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr "Ocultar sprite de escudo"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relação"
@@ -2035,303 +2109,275 @@ msgstr "Deixar as mensagens privadas em abas"
 msgid "Show gender"
 msgstr "Mostrar gênero"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 msgid "Show level"
 msgstr "Mostrar nível"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 msgid "Target dead players"
 msgstr "Jogadores mortos como alvo"
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr "Letras inseguras no nome"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Nomes visíveis"
+
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
+msgstr "Minúsculo (10)"
+
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
+msgstr "Pequeno (11)"
+
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
+msgstr "Médio (12)"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
+msgstr "Largo (13)"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr "Grande (14)"
+
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr "Enorme (15)"
+
+#: src/gui/setup_theme.cpp:140
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:142
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:143
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:144
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:145
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:146
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:147
 msgid "Secure font"
 msgstr "Fonte segura"
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Tamanho da fonte"
+
+#: src/gui/setup_theme.cpp:281
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
 #: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
-msgstr "Minúsculo (10)"
-
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
-msgstr "Pequeno (11)"
-
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
-msgstr "Médio (12)"
-
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
-msgstr "Largo (13)"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr "Grande (14)"
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr "Enorme (15)"
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr "Software"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr "Rápido OpenGL"
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr "Seguro OpenGL"
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Sem texto"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Texto"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Bolhas, sem nomes"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Bolhas com nomes"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "off"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "médio"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 msgid "Hw acceleration"
 msgstr "Aceleração por HW"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Nomes visíveis"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr "Salvar diálogos com NPC"
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "em chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr "Ocultar sprite de escudo"
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr "Modo de baixo tráfego"
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr "Sincronizar movimento"
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr "Desenhar atalhos no mapa"
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr "Desenhar caminho"
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr "Mostrar job"
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 msgid "Enable opacity cache"
 msgstr "Habilitar cache de opacidade"
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr "Opacidade"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Tamanho da fonte"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -3209,10 +3255,6 @@ msgstr "Nomes dos GMs"
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Monstros"
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr "Barra de HP"
diff --git a/po/ru.po b/po/ru.po
index ad2ca27e6..3039fc71b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 #   <Necromong@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
@@ -9,17 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-07-02 00:39+0300\n"
-"PO-Revision-Date: 2011-06-26 00:56+0000\n"
-"Last-Translator: Necromonger <Necromong@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
-"ru/)\n"
-"Language: ru\n"
+"POT-Creation-Date: 2011-07-04 21:26+0300\n"
+"PO-Revision-Date: 2011-07-04 19:47+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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"
+"Language: ru\n"
+"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:1030
 msgid "Visible on map"
@@ -130,11 +128,11 @@ msgstr "Нельзя отправлять пустые сообщения!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
-"уже создана, или этот игрок вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
+" уже создана, или этот игрок вы сами."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -293,9 +291,7 @@ msgstr "Удаленных изображений:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
-"\"0\"."
+msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
 
 #: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
@@ -433,7 +429,7 @@ msgid "Max"
 msgstr "Макс"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:145 src/gui/setup_other.cpp:131
 msgid "Shop"
 msgstr "Магазин"
 
@@ -702,8 +698,8 @@ msgstr "радуга 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -738,6 +734,7 @@ msgid "Ignore"
 msgstr "Игнорировать"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "Карта"
 
@@ -1222,6 +1219,7 @@ msgid "Submit"
 msgstr "Применить"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:140
 msgid "NPC"
 msgstr "NPC"
 
@@ -1615,9 +1613,8 @@ msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
 #: src/gui/serverdialog.cpp:239
-#, fuzzy
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Выберите сервер"
+msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
@@ -1722,63 +1719,91 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Звуковой движок"
 
-#: src/gui/setup_chat.cpp:55
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "Цвета"
+
+#: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
 msgstr "Удалить цвета из полученных сообщений в чате"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
-msgstr "Оставлять сообщения магии на вкладке отладки"
-
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Разрешить магические и администраторские команды на всех вкладках"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
+msgstr "Показать список цветов чата"
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
-msgstr "Показывать сообщения сервера на вкладке отладки"
+msgid "Commands"
+msgstr "Команды"
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
-msgstr "Показать список цветов чата"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr "Разрешить магические и администраторские команды на всех вкладках"
 
 #: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr "Ограничения"
+
+#: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
 msgstr "Ограничить число символов в строке чата"
 
-#: src/gui/setup_chat.cpp:73
-msgid "Enable chat Log"
-msgstr "Включить лог чата"
-
-#: src/gui/setup_chat.cpp:76
+#: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
 msgstr "Ограничить число строк в чате"
 
 #: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
-msgstr "Включить вкладки торговли"
+msgid "Logs"
+msgstr "Логи"
 
-#: src/gui/setup_chat.cpp:82
-msgid "Hide shop messages"
-msgstr "Скрыть сообщения магазина"
+#: src/gui/setup_chat.cpp:81
+msgid "Enable chat Log"
+msgstr "Включить лог чата"
 
-#: src/gui/setup_chat.cpp:85
+#: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
 msgstr "Показать историю чата"
 
 #: src/gui/setup_chat.cpp:88
+msgid "Messages"
+msgstr "Сообщения"
+
+#: src/gui/setup_chat.cpp:90
+msgid "Hide shop messages"
+msgstr "Скрыть сообщения магазина"
+
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
+msgstr "Страницы"
+
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr "Оставлять сообщения магии на вкладке отладки"
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr "Показывать сообщения сервера на вкладке отладки"
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr "Включить вкладки торговли"
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr "Включить вкладку боя"
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr "Показать сообщения боя"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr "Подгонять размер чата"
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr "Время"
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr "Использовать местное время"
 
@@ -1786,10 +1811,6 @@ msgstr "Использовать местное время"
 msgid "This is what the color looks like"
 msgstr "Вот, как выглядит сей цвет"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "Цвета"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Введите: "
@@ -1841,8 +1862,8 @@ msgstr "Применить"
 msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:333
 msgid "Edit"
 msgstr "Изменить"
 
@@ -1894,110 +1915,154 @@ msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
 msgid "Misc"
 msgstr "Разное"
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "Монстры"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr "Показ. повр. нанесенные монстрам"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
-msgstr "Включить серверную атаку"
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr "Автоприцел по доступным монстрам"
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
-msgstr "Авто. исправ. позиции"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
+msgstr "Подсветка радиуса атаки монстров"
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
-msgstr "Подсветка точек перехода на карте"
+msgid "Show monster hp bar"
+msgstr "Показывать жизнь мобов"
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr "Атаковать в движении"
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
-msgstr "Подсветка предметов на полу"
+msgid "Cycle monster targets"
+msgstr "Прокручивать прицел по монстрам"
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
-msgstr "Включить быструю смену статов"
+msgid "Show warps particles"
+msgstr "Показывать анимацию порталов"
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
-msgstr "Подсветка радиуса атаки игрока"
+msgid "Highlight map portals"
+msgstr "Подсветка точек перехода на карте"
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
-msgstr "Показывать анимацию порталов"
+msgid "Highlight floor items"
+msgstr "Подсветка предметов на полу"
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
-msgstr "Подсветка радиуса атаки монстров"
+msgid "Highlight player attack range"
+msgstr "Подсветка радиуса атаки игрока"
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
-msgstr "Принимать запросы купить/продать"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
+msgstr "Показывать расширенные миникарты"
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
-msgstr "Прокручивать прицел по игрокам"
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr "Рисовать путь"
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
-msgstr "Показывать жизнь мобов"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr "Рисовать клавищи на карте"
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
-msgstr "Прокручивать прицел по монстрам"
+msgid "Moving"
+msgstr "Движения"
+
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr "Авто. исправ. позиции"
+
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
+msgstr "Атаковать в движении"
 
-#: src/gui/setup_other.cpp:92
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
+msgstr "Синх. движение"
+
+#: src/gui/setup_other.cpp:100
+msgid "Crazy move A program"
+msgstr "Программа для сумасшедших движений A"
+
+#: src/gui/setup_other.cpp:104
+msgid "Player"
+msgstr "Игрок"
+
+#: src/gui/setup_other.cpp:106
 msgid "Show own hp bar"
 msgstr "Показывать свою жизнь"
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
-msgstr "Включить детектор ботов"
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
+msgstr "Включить быструю смену статов"
 
-#: src/gui/setup_other.cpp:98
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr "Прокручивать прицел по игрокам"
+
+#: src/gui/setup_other.cpp:115
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
-#: src/gui/setup_other.cpp:102
-msgid "Crazy move A program"
-msgstr "Программа для сумасшедших движений A"
-
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:118
 msgid "Show players popups"
 msgstr "Показ. всплыв. сообщения игроков"
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
-msgstr "Показывать расширенные миникарты"
-
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr "Сообщение для отошел"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr "Показывать уровень работы"
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr "Включить фильтр атак"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:133
+msgid "Accept sell/buy requests"
+msgstr "Принимать запросы купить/продать"
+
+#: src/gui/setup_other.cpp:136
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:142
+msgid "Log NPC dialogue"
+msgstr "Сохранять текст NPC"
+
+#: src/gui/setup_other.cpp:146
+msgid "Other"
+msgstr "Другое"
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable server side attack"
+msgstr "Включить серверную атаку"
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable bot checker"
+msgstr "Включить детектор ботов"
+
+#: src/gui/setup_other.cpp:154
 msgid "Enable buggy servers protection"
 msgstr "Включить защиту от сбойных серверов"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:157
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
+#: src/gui/setup_other.cpp:160
+msgid "Low traffic mode"
+msgstr "Режим экономии"
+
+#: src/gui/setup_other.cpp:163
+msgid "Hide shield sprite"
+msgstr "Спрятать картинку счита"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Отношение"
@@ -2042,305 +2107,277 @@ msgstr "Личные сообщения во вкладках"
 msgid "Show gender"
 msgstr "Показать пол"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:266
 msgid "Players"
 msgstr "Игроки"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:291
 msgid "When ignoring:"
 msgstr "Когда игнорируется:"
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:314
 msgid "Show level"
 msgstr "Показать уровень"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:318
 msgid "Show own name"
 msgstr "Показать свое имя"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:322
 msgid "Target dead players"
 msgstr "Наводить фокус на мертвых игроков"
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:326
 msgid "Secure trades"
 msgstr "Защитить торговлю"
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:330 src/gui/setup_players.cpp:513
 msgid "Unsecure chars in names"
 msgstr "Небезопасные символы"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_players.cpp:335
+msgid "Visible names"
+msgstr "Видимые имена"
+
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
+msgstr "Маленький (10)"
+
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
+msgstr "Маленький (11)"
+
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
+msgstr "Средний (12)"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
+msgstr "Большой (13)"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr "Боьшой (14)"
+
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr "Огромный (15)"
+
+#: src/gui/setup_theme.cpp:140
 msgid "Theme"
 msgstr "Тема"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:142
 msgid "Gui theme"
 msgstr "Тема интерфейса"
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:143
 msgid "Main Font"
 msgstr "Основной шрифт"
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:144
 msgid "Bold font"
 msgstr "Жирный шрифт"
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:145
 msgid "Particle font"
 msgstr "Шрифт частиц"
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:146
 msgid "Help font"
 msgstr "Шрифт помощи"
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:147
 msgid "Secure font"
 msgstr "Безопасный шрифт"
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "Размер шрифта"
+
+#: src/gui/setup_theme.cpp:281
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
-#: src/gui/setup_video.cpp:775
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:647
+#: src/gui/setup_video.cpp:652
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
 
 #: src/gui/setup_video.cpp:194
-msgid "Tiny (10)"
-msgstr "Маленький (10)"
-
-#: src/gui/setup_video.cpp:195
-msgid "Small (11)"
-msgstr "Маленький (11)"
-
-#: src/gui/setup_video.cpp:196
-msgid "Medium (12)"
-msgstr "Средний (12)"
-
-#: src/gui/setup_video.cpp:197
-msgid "Large (13)"
-msgstr "Большой (13)"
-
-#: src/gui/setup_video.cpp:198
-msgid "Big (14)"
-msgstr "Боьшой (14)"
-
-#: src/gui/setup_video.cpp:199
-msgid "Huge (15)"
-msgstr "Огромный (15)"
-
-#: src/gui/setup_video.cpp:222
 msgid "Software"
 msgstr "Программно"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr "Быстрый OpenGL"
 
-#: src/gui/setup_video.cpp:224
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr "Бозопасный OpenGL"
 
-#: src/gui/setup_video.cpp:251
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "Нет текста"
 
-#: src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "Текст"
 
-#: src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "Пузырьки, без названий"
 
-#: src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "Пузырьки с названиями"
 
-#: src/gui/setup_video.cpp:270
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "выкл"
 
-#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "низ."
 
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "выс."
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "средне"
 
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "макс."
 
-#: src/gui/setup_video.cpp:327
+#: src/gui/setup_video.cpp:291
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:328
+#: src/gui/setup_video.cpp:292
 msgid "Hw acceleration"
 msgstr "Аппаратное ускорение"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:293
 msgid "Custom cursor"
 msgstr "Игровой курсор"
 
-#: src/gui/setup_video.cpp:331
-msgid "Visible names"
-msgstr "Видимые имена"
-
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:295
 msgid "Particle effects"
 msgstr "Эффекты частиц"
 
-#: src/gui/setup_video.cpp:335
-msgid "Log NPC dialogue"
-msgstr "Сохранять текст NPC"
-
-#: src/gui/setup_video.cpp:336
+#: src/gui/setup_video.cpp:297
 msgid "Show pickup notification"
 msgstr "Показать уведомление о подборе предмета"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:338
+#: src/gui/setup_video.cpp:299
 msgid "in chat"
 msgstr "в чате"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:301
 msgid "as particle"
 msgstr "как частицу"
 
-#: src/gui/setup_video.cpp:342
-msgid "Hide shield sprite"
-msgstr "Спрятать картинку счита"
-
-#: src/gui/setup_video.cpp:344
-msgid "Low traffic mode"
-msgstr "Режим экономии"
-
-#: src/gui/setup_video.cpp:346
-msgid "Sync player move"
-msgstr "Синх. движение"
-
-#: src/gui/setup_video.cpp:348
-msgid "Draw hotkeys on map"
-msgstr "Рисовать клавищи на карте"
-
-#: src/gui/setup_video.cpp:350
-msgid "Draw path"
-msgstr "Рисовать путь"
-
-#: src/gui/setup_video.cpp:351
-msgid "Show job"
-msgstr "Показывать уровень работы"
-
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:303
 msgid "Enable opacity cache"
 msgstr "Включить кеш прозрачности"
 
-#: src/gui/setup_video.cpp:353
+#: src/gui/setup_video.cpp:304
 msgid "Show background"
 msgstr "Показать фон"
 
-#: src/gui/setup_video.cpp:358
+#: src/gui/setup_video.cpp:309
 msgid "FPS limit:"
 msgstr "Ограничить кадр/с:"
 
-#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
-#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+#: src/gui/setup_video.cpp:313 src/gui/setup_video.cpp:349
+#: src/gui/setup_video.cpp:586 src/gui/setup_video.cpp:737
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Видео"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:328
 msgid "Overhead text"
 msgstr "Текст над головами"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:329
 msgid "Gui opacity"
 msgstr "Непрозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:379
+#: src/gui/setup_video.cpp:330
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:380
+#: src/gui/setup_video.cpp:331
 msgid "Particle detail"
 msgstr "Детализация частиц"
 
-#: src/gui/setup_video.cpp:381
-msgid "Font size"
-msgstr "Размер шрифта"
-
-#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
-#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
-#: src/gui/setup_video.cpp:866
+#: src/gui/setup_video.cpp:347 src/gui/setup_video.cpp:350
+#: src/gui/setup_video.cpp:585 src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:735
 msgid "None"
 msgstr "Нет"
 
-#: src/gui/setup_video.cpp:583
+#: src/gui/setup_video.cpp:497
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
-"удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
+" удалось!"
 
-#: src/gui/setup_video.cpp:589
+#: src/gui/setup_video.cpp:503
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
 "также не удалось!"
 
-#: src/gui/setup_video.cpp:600
+#: src/gui/setup_video.cpp:514
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:601
+#: src/gui/setup_video.cpp:515
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:613
+#: src/gui/setup_video.cpp:527
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:614
+#: src/gui/setup_video.cpp:528
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:630
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:631
 msgid "Enter new resolution:                "
 msgstr "Новое разрешение:                   "
 
-#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:651
 msgid "Screen Resolution Changed"
 msgstr "Разрешение экрана изменено"
 
-#: src/gui/setup_video.cpp:772
+#: src/gui/setup_video.cpp:649
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
 "разрешении"
 
-#: src/gui/setup_video.cpp:809
+#: src/gui/setup_video.cpp:682
 msgid "Particle Effect Settings Changed."
 msgstr "Настройки эффектов частиц изменены."
 
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:683
 msgid "Changes will take effect on map change."
 msgstr "Изменения вступят в силу после загрузки новой карты."
 
@@ -3139,7 +3176,8 @@ msgid "Change"
 msgstr "Сменить"
 
 #: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3219,10 +3257,6 @@ msgstr "Имена ГМ"
 msgid "NPCs"
 msgstr "Боты"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "Монстры"
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr "Полоса жизни монстров"
@@ -3482,15 +3516,16 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
-"отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
+" отношений с ним."
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:65
@@ -4569,7 +4604,8 @@ msgstr "Неизвестная ошибка сервера чата."
 
 #: src/net/tmwa/charserverhandler.cpp:174
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+msgstr ""
+"Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
 #: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
 msgid "Wrong name."
@@ -4930,8 +4966,7 @@ msgstr "Команда изменяет политику разделения п
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr ""
-"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
+msgstr "<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
 
 #: src/net/tmwa/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4954,8 +4989,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий "
-"опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
+"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий"
+" опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
 
 #: src/net/tmwa/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -5194,7 +5229,8 @@ msgstr "Сообщение"
 
 #: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Вы несете груз больший, чем половина вашей грузоподъемности. Не удалось "
 "восстановить здоровье."
@@ -5389,3 +5425,5 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:168
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
+
+