summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/cs.po150
-rw-r--r--po/de.po150
-rw-r--r--po/es.po150
-rw-r--r--po/fi.po150
-rw-r--r--po/fr.po150
-rw-r--r--po/id.po150
-rw-r--r--po/ja.po150
-rw-r--r--po/manaplus.pot150
-rw-r--r--po/nl_BE.po150
-rw-r--r--po/pl.po150
-rw-r--r--po/pt.po150
-rw-r--r--po/pt_BR.po150
-rw-r--r--po/ru.po150
-rw-r--r--po/zh_CN.po150
14 files changed, 1050 insertions, 1050 deletions
diff --git a/po/cs.po b/po/cs.po
index 8559b7021..ecabe98d3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/language/"
@@ -29,7 +29,7 @@ msgstr "Ignorovat příchozí žádosti o obchodování"
msgid "Accepting incoming trade requests"
msgstr "Akceptovat příchozí žádosti o obchodování"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Viditelný na mapě"
@@ -63,7 +63,7 @@ msgstr "Nastavení"
msgid "Perfomance"
msgstr "Výkon"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Video"
@@ -394,7 +394,7 @@ msgstr "Komentář: %s"
msgid "Bot Checker"
msgstr "Ověřovač botů"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Jméno"
@@ -495,7 +495,7 @@ msgstr "Prodej"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -675,8 +675,8 @@ msgid "Enter password:"
msgstr "Zadej heslo:"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Smazat"
@@ -752,10 +752,10 @@ msgstr "duhová 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1437,7 +1437,7 @@ msgstr "Odignorovat"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "Kompletně ignorovat"
@@ -2397,55 +2397,55 @@ msgstr "Povolit léčení sebe sama kliknutím myši"
msgid "Group friends in who is online window"
msgstr ""
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Vztahy"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Neutrální"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Přítel"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Přehlížený"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Ignorovaný"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Vymazán"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr ""
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Povolit obchodování"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Povolit šeptání"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Starý"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "Vztahy"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Když ignoruji:"
@@ -2573,96 +2573,96 @@ msgstr "Velikost písma"
msgid "Theme Changed"
msgstr "Téma změněno"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Restartujte klient pro aplikováni změn."
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Softwarový"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "Rychlé OpenGL"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "Bezpečné OpenGL"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "Celá obrazovka"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Vlastní kurzor"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr ""
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr ""
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "Omezení FPS:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Altern. FPS omezení:"
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "Žádné"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
"Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:382
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
"Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž "
"selhalo!"
-#: src/gui/setup_video.cpp:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Přepínám na celou obrazovku"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "Pro uplatnění změn je potřeba restart."
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Měním na OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr "Změny v OpenGL vyžadují restart."
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Vlastní rozlišení (příklad: 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Zadej nové rozlišení:"
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Rozlišení obrazovky změněno"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "Některá okna mohou být přesunuta aby se vešly do menšího okna."
@@ -3091,91 +3091,91 @@ msgstr "Úroveň: %d (GM %d)"
msgid "Correction points: %d"
msgstr ""
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Žádný cíl"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr " "
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Obecná magie"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Magie života"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Magie války"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Magie přeměn"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Magie přírody"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "Magie hvězd"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "Editor příkazů"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "magie"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "ostatní"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Příkaz:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Mana:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Typ cíle:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Ikona:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Úroveň magie:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "Škola magie:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "Úroveň školy:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Uložit"
@@ -5743,19 +5743,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr ""
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 30e52ebb6..fa3b92725 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.net/projects/p/manaplus/language/"
@@ -33,7 +33,7 @@ msgstr "Ignoriere eingehende Handelsanfragen"
msgid "Accepting incoming trade requests"
msgstr "Akzeptiere eingehende Handelsanfragen"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Sichtbar au der Karte"
@@ -67,7 +67,7 @@ msgstr "Einstellungen"
msgid "Perfomance"
msgstr "Leistung"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Video"
@@ -395,7 +395,7 @@ msgstr "Kommentar: %s"
msgid "Bot Checker"
msgstr "Bot-Prüfer"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Name"
@@ -496,7 +496,7 @@ msgstr "Verkaufen"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -676,8 +676,8 @@ msgid "Enter password:"
msgstr "Gib dein Passwort ein:"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Löschen"
@@ -753,10 +753,10 @@ msgstr "Regenbogen 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1436,7 +1436,7 @@ msgstr "Nicht mehr Ignorieren"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "@@ignore|Ignoriere %s komplett@@"
@@ -2396,55 +2396,55 @@ msgstr "Erlaube Selbstheilung mittels Mausklick"
msgid "Group friends in who is online window"
msgstr ""
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Beziehung"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Neutral"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Freund"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Unbeachtet"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Ignoriert"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Gelöscht"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr "Feind"
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Handeln erlauben"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Flüstern erlauben"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Alt"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "Beziehungen"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Wenn ignorierend:"
@@ -2572,99 +2572,99 @@ msgstr "Schriftgröße"
msgid "Theme Changed"
msgstr "Theme geändert"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
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
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Software"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "Schnelles OpenGL"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "Sicheres OpenGL"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "Vollbild"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Benutzerdefinierter Zeiger"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr "Erlaube Größenanpassung"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr "Kein Fensterrahmen"
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "FPS Limit:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Alt FPS Limit:"
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "Kein(e)"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
"Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen "
"Auflösung schlug fehl."
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:382
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
"Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen "
"Auflösung schlug fehl."
-#: src/gui/setup_video.cpp:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Wechsle zum Vollbildmodus"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Wechsle zu OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr ""
"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
"übernommen."
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Benutzerdefinierte Auflösung (zum Beispiel: 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Neue Auflösung eingeben:"
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Bildschirmauflösung wurde geändert"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
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 "
@@ -3095,91 +3095,91 @@ msgstr "Level: %d (GM %d)"
msgid "Correction points: %d"
msgstr "Korrekturpunkte: %d"
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Kein Ziel"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "Ziel erlauben"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "Brauche Ziel"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Generelle Magie"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Lebensmagie"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Kriegsmagie"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Verwandlungsmagie"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Naturmagie"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "Astralmagie"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "Kommando Editor"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "magisch"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "andere"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "Symbol:"
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Befehl:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr "Kommentar:"
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Mana:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Art des Anvisierens:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Icon:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Magielevel:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "Magieschule:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "Schul-Level"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Speichern"
@@ -5777,19 +5777,19 @@ msgstr "Verbindung mit Server abgebrochen. "
msgid "%s is not in your party!"
msgstr "%s ist nicht in Deiner Party!"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr "Drucke '..'"
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr "Blinkender Name"
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr "Schwebende '...' Blase"
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "Schwebende Blase"
diff --git a/po/es.po b/po/es.po
index 232a4efb1..422650811 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
@@ -31,7 +31,7 @@ msgstr "Ignorando las peticiones de intercambio"
msgid "Accepting incoming trade requests"
msgstr "Aceptando las peticiones de intercambio"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Visible sobre el mapa"
@@ -65,7 +65,7 @@ msgstr "Configuración"
msgid "Perfomance"
msgstr "Rendimiento"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Vídeo"
@@ -392,7 +392,7 @@ msgstr "Comentario: %s"
msgid "Bot Checker"
msgstr "Bot Checker"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Nombre"
@@ -493,7 +493,7 @@ msgstr "Vender"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -673,8 +673,8 @@ msgid "Enter password:"
msgstr "Ingrese contraseña:"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Borrar"
@@ -750,10 +750,10 @@ msgstr "arco iris 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1434,7 +1434,7 @@ msgstr "Des-ignorar"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "Ignorar completamente"
@@ -2396,55 +2396,55 @@ msgstr "Permitir curarse a sí mismo con clic del ratón"
msgid "Group friends in who is online window"
msgstr "Grupo de amigos en la ventana de conectados"
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Relación"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Neutral"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Amigo"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Desatendido"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Ignorado"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Borrado"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr "En la lista negra"
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr "Enemigo"
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Permitir intercambios"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Permitir mensajes privados"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Viejo"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "Relaciones"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Cuando se ignora a alguien:"
@@ -2572,96 +2572,96 @@ msgstr "Tamaño de fuente"
msgid "Theme Changed"
msgstr "Tema cambiado"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Reinicia el juego para que los cambios tengan efecto."
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Software"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "OpenGL Rápido"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "OpenGL Seguro"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "Pantalla completa"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Cursor propio"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr "Permitir cambiar de tamaño"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr "Sin marco"
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "Límite FPS:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Límite FPS alternativo: "
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "Nada"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
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:384
+#: src/gui/setup_video.cpp:382
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:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Cambiando a pantalla completa"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "Reinicio necesario para que los cambios tengan su efecto."
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Cambiando a OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Resolución personalizada (ejemplo: 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Ingrese la nueva resolución: "
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Resolución de pantalla cambiada"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
@@ -3090,91 +3090,91 @@ msgstr "Nivel: %d (GM %d)"
msgid "Correction points: %d"
msgstr "Puntos de corrección: %d"
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Ningún objetivo"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "Permitir fijar objetivo"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "Necesita fijar objetivo."
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Magia General"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Magia de Vida"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Magia de Guerra"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Magia de Transmutación"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Magia de la Naturaleza"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "Magia Astral"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "Editor de comando"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "magia"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "otro"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "Símbolo:"
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Comando:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr "Comentario:"
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Maná:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Tipo de objetivo:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Ícono:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Nivel de Magia:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "Escuela de Magia:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "Nivel de Escuela:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Guardar"
@@ -5770,19 +5770,19 @@ msgstr "Conexión al servidor terminada. "
msgid "%s is not in your party!"
msgstr "¡%s no está en tu grupo!"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr "Imprimir '...'"
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr "Parpadear nombre"
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr "Burbuja '...' flotante"
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "Burbuja Flotante"
diff --git a/po/fi.po b/po/fi.po
index 837508db7..ac1222a06 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Et huomioi kaupankäyntipyyntöjä"
msgid "Accepting incoming trade requests"
msgstr "Hyväksyt kaupankäyntipyynnöt"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Näkyvillä kartalla"
@@ -61,7 +61,7 @@ msgstr "Asetukset"
msgid "Perfomance"
msgstr "Tehokkuus"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Kuva"
@@ -389,7 +389,7 @@ msgstr "Kommentti: %s"
msgid "Bot Checker"
msgstr "Bottitutka"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Nimi"
@@ -490,7 +490,7 @@ msgstr "Myy"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -670,8 +670,8 @@ msgid "Enter password:"
msgstr "Salasana:"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Poista"
@@ -747,10 +747,10 @@ msgstr "sateenkaari 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1430,7 +1430,7 @@ msgstr "Huomioi jälleen"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "Jätä täysin huomiotta"
@@ -2391,55 +2391,55 @@ msgstr "Salli itsen parantaminen hiiren napsautuksella"
msgid "Group friends in who is online window"
msgstr ""
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Relaatio"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Neutraali"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Ystävä"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Vaimennettu"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Huomiotta jätetty"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Pyyhitty"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr "Mustalla listalla"
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr "Vihollinen"
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Salli kaupakäynti"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Salli kuiskaukset"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Vanha"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "Suhteet"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Kun jätät huomiotta:"
@@ -2567,93 +2567,93 @@ msgstr "Kirjasimen koko"
msgid "Theme Changed"
msgstr "Ulkoasua muutettu"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
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
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Ei kiihdytystä"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "Nopea OpenGL"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "Turvallinen OpenGL"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "Kokoruututila"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Tyylitelty hiiren osoitin"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr ""
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr ""
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "Piirtonopeusrajoitin (FPS):"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Vaihtoehtoinen FPS-rajoitin:"
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "-"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
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:384
+#: src/gui/setup_video.cpp:382
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:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Vaihdan kokoruututilaan"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Vaihdetaan käyttämään OpenGL:ää"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Oma tarkkuus (esim. 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Anna uusi tarkkuus: "
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Ikkunan koko vaihdettu"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
@@ -3083,91 +3083,91 @@ msgstr "Taso: %d (GM %d)"
msgid "Correction points: %d"
msgstr "Korjauspisteitä: %d"
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Ei kohdetta"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "Salli kohde"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "Tarvitsee kohteen"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Yleismagia"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Elämämagia"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Sotamagia"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Muovausmagia"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Luontomagia"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "Astraalimagia"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "Komentomuokkain"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "magia"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "muu"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "Symboli:"
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Komento:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr "Kommentti:"
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Mana:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Kohdetyyppi:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Kuvake:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Magiataso:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "Magian koulukunta:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "Koulukunnan taso:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Tallenna"
@@ -5751,19 +5751,19 @@ msgstr "Yhteys palvelimeen katkaistu. "
msgid "%s is not in your party!"
msgstr "%s ei ole ryhmässäsi!"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr "Tulosta '...'"
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr "Vilkuta nimeä"
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr "Leijuva '...' -puhekupla"
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "Leijuva puhekupla"
diff --git a/po/fr.po b/po/fr.po
index eaabd6376..091a115ec 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/"
@@ -32,7 +32,7 @@ msgstr "Ignorer les requêtes d'échanges entrantes"
msgid "Accepting incoming trade requests"
msgstr "Accepter les requêtes d'échanges entrantes"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Visible sur la carte"
@@ -66,7 +66,7 @@ msgstr "Configuration"
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Vidéo"
@@ -396,7 +396,7 @@ msgstr "Commentaire : %s"
msgid "Bot Checker"
msgstr "Testeur de Robot"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Nom"
@@ -497,7 +497,7 @@ msgstr "Vendre"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -677,8 +677,8 @@ msgid "Enter password:"
msgstr "Entrer le mot de passe :"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Supprimer"
@@ -754,10 +754,10 @@ msgstr "arc en ciel 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1437,7 +1437,7 @@ msgstr "Ne plus ignorer"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "Ignorer complètement"
@@ -2400,55 +2400,55 @@ msgstr "Autoriser la récupération automatique sur clic droit de la souris"
msgid "Group friends in who is online window"
msgstr "Regrouper les amis dans la fenêtre de qui est en ligne"
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Relation"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Neutre"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Ami"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Négligé"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Ignoré"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Effacé"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr "Sous liste noire"
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr "Ennemi"
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Autoriser les échanges"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Autoriser les messages privés"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Ancien"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "Relations"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Quand ignoré :"
@@ -2576,99 +2576,99 @@ msgstr "Taille de police"
msgid "Theme Changed"
msgstr "Thème changé"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
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
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Logiciel"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "Open GL rapide."
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "OpenGL sécurisé"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "Plein écran"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Curseur personnalisé"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr "Activer le redimensionnement"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr "Pas d'image"
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "Limite FPS :"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Alterner les limites FPS"
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "Aucun"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
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:384
+#: src/gui/setup_video.cpp:382
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:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Passage en plein écran"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
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:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Activation d'OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
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:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Résolution personnalisée (Exemple : 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Entrer la nouvelle résolution : "
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Résolution de l'écran modifiée"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
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 "
@@ -3103,91 +3103,91 @@ msgstr "Niveau : %d (GM %d)"
msgid "Correction points: %d"
msgstr "Points de correction : %d"
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Pas de cible"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "Autoriser le ciblage"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "Nécessite une cible"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Magie générale"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Magie de Vie"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Magie de Guerre"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Magie de Transmutation"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Magie de la Nature"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "Magie Astrale"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "Éditeur de commande"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "Magie"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "Autre"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "Symbole : "
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Commande :"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr "Commentaire : "
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Mana : "
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Type de cible"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Icône : "
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Niveau de Magie :"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "École de magie : "
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "Niveau scolaire : "
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Sauvegarder"
@@ -5806,19 +5806,19 @@ msgstr "Connexion au serveur terminée."
msgid "%s is not in your party!"
msgstr "%s n'est pas membre de votre groupe !"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr "Affiche '...'"
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr "Fais clignoter le nom"
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr "Bulle flottante '...'"
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "Bulle flottante"
diff --git a/po/id.po b/po/id.po
index f7bd2ab1a..14029e033 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/"
@@ -29,7 +29,7 @@ msgstr "Abaikan permohonan transaksi"
msgid "Accepting incoming trade requests"
msgstr "Terima permohonan transaksi"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Terlihat di peta"
@@ -63,7 +63,7 @@ msgstr "Pengaturan"
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Video"
@@ -385,7 +385,7 @@ msgstr "Komentar: %s"
msgid "Bot Checker"
msgstr "Pengecek Bot"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Nama"
@@ -486,7 +486,7 @@ msgstr "Jual"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -666,8 +666,8 @@ msgid "Enter password:"
msgstr "Masukkan sandi"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Hapus"
@@ -743,10 +743,10 @@ msgstr "pelangi 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1424,7 +1424,7 @@ msgstr "Batalkan pengabaian"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr ""
@@ -2384,55 +2384,55 @@ msgstr ""
msgid "Group friends in who is online window"
msgstr ""
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Hubungan"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Netral"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Teman"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Diabaikan"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Ditolak"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Dihapus"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr ""
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Perbolehkan penukaran"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Perbolehkan berbisik"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Lama"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr ""
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Ketika menolak:"
@@ -2560,93 +2560,93 @@ msgstr "Ukuran huruf"
msgid "Theme Changed"
msgstr "Tema diganti"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Restart client anda untuk memberikan efek."
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Perangkat lunak"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "OpenGL cepat"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "OpenGL aman"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "Layar penuh"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Modifikasi kursor"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr ""
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr ""
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "Batas FPS:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "batas Alt FPS:"
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "Tidak ada"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:382
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Mengubah ke mode Layar penuh"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "Memulai dari awal di butuhkan untuk melihat efek"
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Mengubah ke OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Modifikasi resolusi (contoh: 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Masukkan resolusi baru:"
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Resolusi layar diubah"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -3075,91 +3075,91 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Tidak ada target"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "Perbolehkan Target"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "Membutuhkan Target"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Sihir dasar"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Sihir kehidupan"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Sihir perang"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Sihir transmutasi"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Sihir alam"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "Sihir Astral"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr ""
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "sihir"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "lainnya"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "Simbol:"
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Perintah:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Mana:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Tipe target:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Ikon:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Level sihir:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "Sekolah sihir:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "Level sekolah:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Simpan"
@@ -5717,19 +5717,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr ""
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index a96270dc0..e91df44e2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/"
@@ -31,7 +31,7 @@ msgstr "トレードリクエストを無効にしています"
msgid "Accepting incoming trade requests"
msgstr "トレードリクエストを有効にしました"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "マップに表示させる"
@@ -65,7 +65,7 @@ msgstr "設定"
msgid "Perfomance"
msgstr "パフォーマンス"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "ビデオ"
@@ -387,7 +387,7 @@ msgstr "コメント: %s"
msgid "Bot Checker"
msgstr "ボットチェッカー"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "名前"
@@ -488,7 +488,7 @@ msgstr "売る"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -668,8 +668,8 @@ msgid "Enter password:"
msgstr "パスワードを入力して下さい:"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "削除"
@@ -745,10 +745,10 @@ msgstr "カラフル 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1426,7 +1426,7 @@ msgstr "完全無視解除"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "完全無視"
@@ -2389,55 +2389,55 @@ msgstr "クリックでヒール"
msgid "Group friends in who is online window"
msgstr "オンラインリストをグループ化する"
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "関係"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "普通"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "友達"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "無視している"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "完全無視している"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "削除済"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr "ブラックリスト化されています"
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr "敵"
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "トレードを受付ける"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "全てのささやきを受け取る"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "古い"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "関係"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "完全無視の際には:"
@@ -2565,93 +2565,93 @@ msgstr "フォントサイズ"
msgid "Theme Changed"
msgstr "テーマを変更しました"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "設定変更の為アプリケーションを再起動してください"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "マップポータルを強調表示"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "速い OpenGL"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "セーフ OpenGL"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "フルスクリーン"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "カスタムカーソル"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr "リサイズを有効にする"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr "フレームなし"
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "FPSリミット:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Alt FPS リミット: "
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "なし"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "ウインドウモード、また前モードの復元にも失敗しました"
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:382
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr "フルスクリーンモード、また前モードの復元にも失敗しました"
-#: src/gui/setup_video.cpp:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "フルスクリーンに変更"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "設定変更の為、再起動をしてください"
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "OpenGLに変更"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr "OpenGLの設定を変更するため、再起動をしてください"
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "カスタム解像度 (例: 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "解像度を入力して下さい: "
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "スクリーンの解像度を変更しました"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります"
@@ -3080,91 +3080,91 @@ msgstr "レベル: %d (GM %d)"
msgid "Correction points: %d"
msgstr "修正点: %d"
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "ターゲットなし"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "ターゲットを有効にする"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "ターゲット必要"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "ジェネラル魔法"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "ライフ魔法"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "ウォー魔法"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "トランスミュート魔法"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "ネイチャー魔法"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "アストラル魔法"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "コマンドエディタ"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "魔法"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "他"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "シンボル:"
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "コマンド:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr "コメント:"
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "マナ:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "ターゲットタイプ:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "アイコン:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "魔法レベル:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "魔法学園:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "学校レベル:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "セーブ"
@@ -5740,19 +5740,19 @@ msgstr "サーバーへの接続が切断されました "
msgid "%s is not in your party!"
msgstr "%sはパーティのメンバーではありません"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr "'...'を表示する"
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr "名前を点灯させる"
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr "フローティング'...'吹出し"
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "吹出し"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 93e7413f4..c9030e5c9 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+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"
@@ -26,7 +26,7 @@ msgstr ""
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr ""
@@ -384,7 +384,7 @@ msgstr ""
msgid "Bot Checker"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr ""
@@ -485,7 +485,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -665,8 +665,8 @@ msgid "Enter password:"
msgstr ""
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr ""
@@ -742,10 +742,10 @@ msgstr ""
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr ""
@@ -1425,7 +1425,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr ""
@@ -2385,55 +2385,55 @@ msgstr ""
msgid "Group friends in who is online window"
msgstr ""
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr ""
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr ""
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr ""
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr ""
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr ""
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr ""
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr ""
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr ""
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr ""
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr ""
@@ -2561,93 +2561,93 @@ msgstr ""
msgid "Theme Changed"
msgstr ""
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr ""
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr ""
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr ""
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr ""
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr ""
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr ""
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr ""
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:382
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr ""
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr ""
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr ""
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -3076,91 +3076,91 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr ""
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr ""
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr ""
@@ -5717,19 +5717,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr ""
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 3fa662704..7bfb16bac 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/"
@@ -28,7 +28,7 @@ msgstr "Inkomende handelsaanvragen negeren"
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Zichtbaar op de map"
@@ -62,7 +62,7 @@ msgstr "Configureren"
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Video"
@@ -389,7 +389,7 @@ msgstr ""
msgid "Bot Checker"
msgstr "Bot Controleerder"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Naam"
@@ -490,7 +490,7 @@ msgstr "Verkopen"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -670,8 +670,8 @@ msgid "Enter password:"
msgstr "Geef wachtwoord:"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Verwijderen"
@@ -747,10 +747,10 @@ msgstr "regenboog 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1430,7 +1430,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "Volledig genegeerd"
@@ -2390,55 +2390,55 @@ msgstr ""
msgid "Group friends in who is online window"
msgstr ""
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Relatie"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Neutraal"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Vriend"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Geen rekening mee houden"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Genegeerd"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Gewist"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr ""
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Handelen toestaan"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Fluisteren toestaan"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Oud"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "Relaties"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Tijdens negeren:"
@@ -2566,97 +2566,97 @@ msgstr "Lettergrootte"
msgid "Theme Changed"
msgstr "Thema is gewijzigd"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
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
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Software"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "Snelle OpenGL"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "Veilige OpenGL"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "Volledig scherm"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Aangepaste cursor"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr ""
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr ""
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "FPS limiet:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Alt FPS limiet: "
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "Geen"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
"Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
"faalde ook!"
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:382
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
"Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
"modus faalde ook!"
-#: src/gui/setup_video.cpp:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Verwisselen naar Volledig Scherm"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "De veranderingen worden pas actief na opnieuw opstarten"
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Verwisselen naar OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
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:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Manuele resolutie (voorbeeld: 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Geef een nieuwe resolutie: "
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Scherm Resolutie is gewijzigd"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
@@ -3087,91 +3087,91 @@ msgstr "Niveau: %d (GM %d)"
msgid "Correction points: %d"
msgstr ""
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Geen Doel"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "Doel Toestaan"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "Heeft Doel Nodig"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Algemene Magie"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Levensmagie"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Oorlogsmagie"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Wijzigingsmagie"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Natuursmagie"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr ""
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "magie"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "ander"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "Symbool:"
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Commando:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Mana:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Doel Type:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Icoon:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Magie niveau:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "Magie School:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "School niveau:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Bewaren"
@@ -5762,19 +5762,19 @@ msgstr "Verbinding met server beëindigd. "
msgid "%s is not in your party!"
msgstr "%s is niet in jouw groep!"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr "Say '...'"
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr "Blink naam"
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr "Zwevende '...' bel"
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "Zwevende bel"
diff --git a/po/pl.po b/po/pl.po
index db568170e..f9f3197d0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/language/"
@@ -29,7 +29,7 @@ msgstr "Ignorowanie przychodzących próśb o handel"
msgid "Accepting incoming trade requests"
msgstr "Akceptowanie przychodzących próśb o handel"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Widoczne na mapie"
@@ -63,7 +63,7 @@ msgstr "Konfiguracja"
msgid "Perfomance"
msgstr "Wydajność programu"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Ekran"
@@ -393,7 +393,7 @@ msgstr "Komentarz: %s"
msgid "Bot Checker"
msgstr "Wykrywacz botów"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Imię"
@@ -494,7 +494,7 @@ msgstr "Sprzedaj"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -674,8 +674,8 @@ msgid "Enter password:"
msgstr "Wprowadź hasło:"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Usuń"
@@ -751,10 +751,10 @@ msgstr "tęczowy 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1436,7 +1436,7 @@ msgstr "Odignoruj"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "Całkowicie ignoruj"
@@ -2396,55 +2396,55 @@ msgstr "Pozwól na leczenie siebie kliknięciem"
msgid "Group friends in who is online window"
msgstr "Grupuj przyjaciół w oknie obecnych online"
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Relacja"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Neutralny"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Przyjaciel"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Lekceważony"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Ignorowany"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Skasowany"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr "Dodany/a do czarnej listy"
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr "Wróg"
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Zezwól na handel"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Zezwól na szepty"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Resetuj"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "Relacje"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Gdy ignorowany:"
@@ -2572,96 +2572,96 @@ msgstr "Rozmiar czcionki"
msgid "Theme Changed"
msgstr "Skórka zmieniona"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Software"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "Szybki OpenGL"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "Bezpieczny OpenGL"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "Pełny ekran"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Własny kursor"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr "Włącz zmianę rozmiaru"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr "Bez ramki"
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "Limit FPS:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Alternatywny limit FPS:"
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "Brak"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
"Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:382
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
"Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego "
"stanu!"
-#: src/gui/setup_video.cpp:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Zmiana na tryb pełnoekranowy"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Zmiana na OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Własna rozdzielczość (np. 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Wpisz nową rozdzielczość:"
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Rozdzielczość zmieniona"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Niektóre okna mogą być przesunięte aby dopasować się do niższej "
@@ -3092,91 +3092,91 @@ msgstr "Poziom: %d (GM %d)"
msgid "Correction points: %d"
msgstr "Punkty korekcyjne: %d"
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Bez celu"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "Dozwól cel"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "Wymaga celu"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Ogólna Magia"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Magia Życia"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Magia Wojny"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Magia Transmutacji"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Magia Natury"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "Magia Astralna"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "Edytor poleceń"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "magia"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "inne"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "Symbol:"
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Polecenie:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr "Komentarz:"
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Mana:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Rodzaj celu:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Ikona:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Poziom magii:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "Szkoła magii:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "Poziom szkoły:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Zachowaj"
@@ -5766,19 +5766,19 @@ msgstr "Połączenie z serwerem przerwane."
msgid "%s is not in your party!"
msgstr "%s nie jest w twojej grupie!"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr "Pisz '...'"
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr "Mruganie nicka"
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr "Bąbelek \"...\" nad głową"
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "Bąbelek nad głową"
diff --git a/po/pt.po b/po/pt.po
index 231721749..f44c233f2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/"
@@ -29,7 +29,7 @@ msgstr "Ignorando propostas de negócios"
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Visivel no mapa"
@@ -63,7 +63,7 @@ msgstr "Configurar"
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Vídeo"
@@ -390,7 +390,7 @@ msgstr "Comentário: %s"
msgid "Bot Checker"
msgstr "Analizador de bot"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Nome"
@@ -491,7 +491,7 @@ msgstr "Vender"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -671,8 +671,8 @@ msgid "Enter password:"
msgstr "Entre com a senha"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Excluir"
@@ -748,10 +748,10 @@ msgstr "arco-íris 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1431,7 +1431,7 @@ msgstr "Não ignorar"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "Ignorar completamente"
@@ -2391,55 +2391,55 @@ msgstr "Permitir curar-se com o clique do mouse "
msgid "Group friends in who is online window"
msgstr "Grupo de amigos na lista online"
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Relação"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Neutro"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Amigo(a)"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Desconsiderado"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Ignorado"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Apagado"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr "Na Lista Negra "
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr "Inimigo"
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Permitir negociações"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Permitir mensagens particulares"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Antigo"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "Relações"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Quando ignorar:"
@@ -2567,96 +2567,96 @@ msgstr "Tamanho da fonte"
msgid "Theme Changed"
msgstr "Tema alterado"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
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
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Software"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "Rápido OpenGL"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "Seguro OpenGL"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "Tela cheia"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Cursor customizado"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr "Habilitar redirecionamento de janela"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr "Sem moldura de janela"
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "Limite de FPS:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Limite de FPS alternativo:"
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "Nenhum"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
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:384
+#: src/gui/setup_video.cpp:382
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:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Mudando para tela cheia"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Mudando para OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr "Mudanças no OpenGL requerem o reinício do jogo."
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Resolução customizada (exemplo 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Escolha a nova resolução "
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Resolução de tela alterada"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -3086,91 +3086,91 @@ msgstr "Nível: %d (GM %d)"
msgid "Correction points: %d"
msgstr "Pontos de correção: %d"
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Sem alvo"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "Permitir alvo"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "Precisa de alvo"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Magia geral"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Magia Vida"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Magia Guerra"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Magia Transmutação"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Magia Natureza"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "Magia Astral"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "Editor de comandos"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "Feitiço"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "Outro"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "Símbolo: "
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Comando:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr "Comentario:"
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Mana:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Tipo de alvo:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Icone:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Nível mágico:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "Escola de Feitiço:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "Nível da escola:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Salvar"
@@ -5759,19 +5759,19 @@ msgstr "Conexão com o servidor interrompida. "
msgid "%s is not in your party!"
msgstr "%s não está em seu grupo!"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr "Imprimir '...'"
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr "Piscar nome"
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr "Bolha '...' flutuante"
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "Bolha Flutuante"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e7ae159df..6b4c8c196 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
@@ -31,7 +31,7 @@ msgstr "Ignorando propostas de negócios"
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Mapa visivel "
@@ -65,7 +65,7 @@ msgstr "Configurar"
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Vídeo"
@@ -392,7 +392,7 @@ msgstr "Comentário: %s"
msgid "Bot Checker"
msgstr "Analizador de bot"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Nome"
@@ -493,7 +493,7 @@ msgstr "Vender"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -673,8 +673,8 @@ msgid "Enter password:"
msgstr "Entre com a senha:"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Excluir"
@@ -750,10 +750,10 @@ msgstr "arco-íris 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1433,7 +1433,7 @@ msgstr "Não ignorar"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "Ignorar completamente"
@@ -2394,55 +2394,55 @@ msgstr "Permitir se curar com o clique do mouse"
msgid "Group friends in who is online window"
msgstr "Grupo de amigos que está na janela on-line"
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Relação"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Neutro"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Amigo(a)"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Desconsiderado"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Ignorado"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Apagado"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr "Na Lista Negra "
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr "Inimigo"
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Permitir negociações"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Permitir mensagens particulares"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Antigo"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "Relações"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Quando ignorar:"
@@ -2570,96 +2570,96 @@ msgstr "Tamanho da fonte"
msgid "Theme Changed"
msgstr "Tema alterado"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
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
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Software"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "Rápido OpenGL"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "Seguro OpenGL"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "Tela cheia"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Cursor customizado"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr "Habilitar redimensionamento de janela"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr "Sem moldura de janela"
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "Limite de FPS:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Limite de FPS alternativo: "
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "Nenhum"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
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:384
+#: src/gui/setup_video.cpp:382
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:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Mudando para tela cheia"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Mudando para OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr "Mudanças no OpenGL requerem o reinício do jogo."
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Resolução customizada (exemplo 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Escolha a nova resolução "
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Resolução de tela alterada"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -3089,91 +3089,91 @@ msgstr "Nível: %d (GM %d)"
msgid "Correction points: %d"
msgstr "Pontos de correção: %d"
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Sem alvo"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "Permitir alvo"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "Precisa de alvo"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Magia geral"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Magia Vida"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Magia Guerra"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Magia Transmutação"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Magia Natureza"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "Magia Astral"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "Editor de comandos"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "Feitiço"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "Outro"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "Símbolo: "
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Comando:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr "Comentario:"
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Mana:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Tipo de alvo:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Icone:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Nível mágico:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "Escola de Feitiço:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "Nível da escola:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Salvar"
@@ -5761,19 +5761,19 @@ msgstr "Conexão com o servidor interrompida. "
msgid "%s is not in your party!"
msgstr "%s não está em seu grupo!"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr "Imprimir '...'"
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr "Piscar nome"
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr "Bolha '...' flutuante"
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "Bolha Flutuante"
diff --git a/po/ru.po b/po/ru.po
index baaee7164..f67631a49 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:32+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/"
@@ -31,7 +31,7 @@ msgstr "Игнорировать предложения о торговле"
msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "Видимые на карте"
@@ -65,7 +65,7 @@ msgstr "Настройка"
msgid "Perfomance"
msgstr "Производительность"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "Видео"
@@ -398,7 +398,7 @@ msgstr "Комментарий: %s"
msgid "Bot Checker"
msgstr "Окно детектора ботов"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "Имя"
@@ -499,7 +499,7 @@ msgstr "Продать"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -679,8 +679,8 @@ msgid "Enter password:"
msgstr "Введите пароль:"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "Удалить"
@@ -756,10 +756,10 @@ msgstr "радуга 3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1441,7 +1441,7 @@ msgstr "Не игнорировать"
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "@@ignore|Полностью игнорировать@@"
@@ -2406,55 +2406,55 @@ msgstr "Включить самолечение по клику мыши"
msgid "Group friends in who is online window"
msgstr "Группировать друзей в окне онлайн списка"
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "Отношение"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "Нейтральное"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "Друг"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "Пренебрегаемый"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "Игнорировано"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "Стерт"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr "В черном списке"
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr "Враг"
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "Разрешить торговлю"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "Разрешить шептание"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "Старые"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "Связи"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "Когда игнорируется:"
@@ -2582,97 +2582,97 @@ msgstr "Размер шрифта"
msgid "Theme Changed"
msgstr "Тема изменена"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Перезегрузите игру дабы изменения вступили в силу."
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "Программно"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "Быстрый OpenGL"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "Безопасный OpenGL"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "На полный экран"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "Игровой курсор"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr "Разрешить менять размер окна"
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr "Без рамки"
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "Ограничить кадр/с:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr "Альтер. ограничить кадр/с: "
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "Нет"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
"удалось!"
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:382
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
"Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
"также не удалось!"
-#: src/gui/setup_video.cpp:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "Переключение в полноэкранный режим"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "Переключение на OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "Свое разрешение (например: 1024х768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "Новое разрешение: "
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "Разрешение экрана изменено"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
@@ -3103,91 +3103,91 @@ msgstr "Уровень: %d (GM %d)"
msgid "Correction points: %d"
msgstr "Очков навыков: %d"
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "Без цели"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr "Разрешить цель"
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr "Необходима цель"
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr "Общая Магия"
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "Магия Жизни"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "Боевая Магия"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "Магия Трансформации"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "Магия Природы"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "Астральная магия"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "Редактор команд"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "Магия"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "Другое"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "Символ:"
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "Команда:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr "Комментарий:"
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "Мана:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "Тип цели:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "Картинка:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "Уровень Магии:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "Школа Магии:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "Уровень школы:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "Сохранить"
@@ -5775,19 +5775,19 @@ msgstr "Подключение к серверу прервано."
msgid "%s is not in your party!"
msgstr "%s не в группе!"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr "Печатать '...'"
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr "Мигать именем"
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr "Плавающий '...' пузырек"
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "Плавающий пузырек"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 62d9e892b..7d63cdcd7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
"PO-Revision-Date: 2012-03-28 22:29+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
@@ -29,7 +29,7 @@ msgstr "忽略新进的交易请求"
msgid "Accepting incoming trade requests"
msgstr "接受传入的交易请求"
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
msgid "Visible on map"
msgstr "在地图上可见"
@@ -63,7 +63,7 @@ msgstr "魔法攻击"
msgid "Perfomance"
msgstr "性能"
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
msgid "Video"
msgstr "视频"
@@ -382,7 +382,7 @@ msgstr "评论: %s"
msgid "Bot Checker"
msgstr "挂机检查"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
msgid "Name"
msgstr "姓名"
@@ -483,7 +483,7 @@ msgstr "出售"
#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
#: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
#: src/gui/updaterwindow.cpp:169
msgid "Cancel"
@@ -663,8 +663,8 @@ msgid "Enter password:"
msgstr "输入密码:"
#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
msgid "Delete"
msgstr "删除"
@@ -740,10 +740,10 @@ msgstr "彩虹3"
#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
msgid "???"
msgstr "???"
@@ -1421,7 +1421,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
msgid "Completely ignore"
msgstr "完全忽略"
@@ -2381,55 +2381,55 @@ msgstr ""
msgid "Group friends in who is online window"
msgstr ""
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
msgid "Relation"
msgstr "关系"
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
msgid "Neutral"
msgstr "中立"
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
msgid "Friend"
msgstr "好友"
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
msgid "Disregarded"
msgstr "被忽视的"
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
msgid "Ignored"
msgstr "忽略"
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
msgid "Erased"
msgstr "已删除"
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
msgid "Blacklisted"
msgstr ""
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
msgid "Enemy"
msgstr ""
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
msgid "Allow trading"
msgstr "允许交易"
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
msgid "Allow whispers"
msgstr "允许密语"
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
msgid "Old"
msgstr "旧"
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
msgid "Relations"
msgstr "关系"
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
msgid "When ignoring:"
msgstr "当忽略时:"
@@ -2557,93 +2557,93 @@ msgstr "字体大小"
msgid "Theme Changed"
msgstr "主题更改"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "重启您的游戏客户端以使变更生效。"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:192
msgid "Software"
msgstr "软件"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
msgid "Fast OpenGL"
msgstr "快速的OpenGL"
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
msgid "Safe OpenGL"
msgstr "安全的OpenGL"
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
msgid "Full screen"
msgstr "全屏"
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
msgid "Custom cursor"
msgstr "自定义鼠标"
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
msgid "Enable resize"
msgstr ""
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
msgid "No frame"
msgstr ""
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
msgid "FPS limit:"
msgstr "FPS限制:"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
msgid "Alt FPS limit: "
msgstr ""
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:549
msgid "None"
msgstr "w"
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "切换到窗口模式,并恢复旧的模式,也没有失败!"
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:382
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:395
+#: src/gui/setup_video.cpp:393
msgid "Switching to Full Screen"
msgstr "切换到全屏"
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
msgid "Restart needed for changes to take effect."
msgstr "重启生效"
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
msgid "Changing to OpenGL"
msgstr "切换到OpenGL"
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
msgid "Applying change to OpenGL requires restart."
msgstr "运用改变为OpenGL需要重新开始"
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
msgid "Custom resolution (example: 1024x768)"
msgstr "自定义分辨率 (例如: 1024x768)"
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
msgid "Enter new resolution: "
msgstr "输入新的分辨率:"
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
msgid "Screen Resolution Changed"
msgstr "屏幕分辨率已更改"
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -3072,91 +3072,91 @@ msgstr "级别:%d (GM %d)"
msgid "Correction points: %d"
msgstr ""
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
msgid "No Target"
msgstr "没有目标"
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
msgid "Allow Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
msgid "Need Target"
msgstr ""
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
msgid "General Magic"
msgstr ""
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
msgid "Life Magic"
msgstr "生活魔术"
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
msgid "War Magic"
msgstr "战魔"
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
msgid "Transmute Magic"
msgstr "蜕变魔术"
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
msgid "Nature Magic"
msgstr "大自然的神奇"
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
msgid "Astral Magic"
msgstr "星芒魔术"
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
msgstr "命令编辑器"
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
msgid "magic"
msgstr "魔术"
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
msgid "other"
msgstr "其他"
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
msgstr "符号:"
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
msgstr "命令:"
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
msgstr ""
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
msgstr "法力:"
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
msgstr "目标类型:"
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
msgstr "图示:"
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
msgstr "魔法等级:"
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
msgstr "魔法学院:"
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
msgstr "学校层次:"
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
msgid "Save"
msgstr "保存"
@@ -5720,19 +5720,19 @@ msgstr "连接到服务器终止。"
msgid "%s is not in your party!"
msgstr "%s不在你的帮会中!"
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
msgid "Floating bubble"
msgstr "流动的泡沫"