summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/de.po1185
-rw-r--r--po/es.po638
-rw-r--r--po/fi.po641
-rw-r--r--po/fr.po1239
-rw-r--r--po/mana.pot727
-rw-r--r--po/pt_BR.po640
-rw-r--r--po/ru.po640
7 files changed, 3147 insertions, 2563 deletions
diff --git a/po/de.po b/po/de.po
index ca700b42..43d93e0c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 16:41+0200\n"
+"POT-Creation-Date: 2011-06-24 01:55+0200\n"
"PO-Revision-Date: 2011-06-23 16:44+0100\n"
"Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
"Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../src/gui/npcdialog.cpp:208
+#: ../src/gui/npcdialog.cpp:209
msgid ""
"\n"
"> Next\n"
@@ -61,7 +61,8 @@ msgstr " -C --config-file : zu benutzende Konfigurationsdatei"
#: ../src/main.cpp:61
#, fuzzy
msgid " --localdata-dir : Directory to use as local data directory"
-msgstr " -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
+msgstr ""
+" -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
#: ../src/main.cpp:65
#, fuzzy
@@ -71,7 +72,8 @@ msgstr " -O --no-opengl : OpenGL-Erweiterungen deaktivieren"
#: ../src/main.cpp:63
#, fuzzy
msgid " --screenshot-dir : Directory to store screenshots"
-msgstr " -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
+msgstr ""
+" -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
#: ../src/main.cpp:56
#, fuzzy
@@ -101,7 +103,9 @@ msgstr " -c --charakter : Mit angegebenem Spieler anmelden"
#: ../src/main.cpp:60
msgid " -d --data : Directory to load game data from"
-msgstr " -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
+msgstr ""
+" -d --data : Datenverzeichnis, aus dem das Spiel geladen werden "
+"soll"
#: ../src/main.cpp:49
msgid " -h --help : Display this help"
@@ -123,6 +127,11 @@ msgstr " -u --skip-update : Überspringe das Herunterladen von Updates"
msgid " -v --version : Display the version"
msgstr " -v --version : Die Version des Spieles anzeigen"
+#: ../src/net/manaserv/partyhandler.cpp:126
+#, fuzzy, c-format
+msgid " on invitation from %s"
+msgstr "Unbekannte Reaktion auf die Einladung von %s."
+
#: ../src/gui/updatewindow.cpp:419
msgid "##1 It is strongly recommended that"
msgstr "##1 Es wird dringend empfohlen,"
@@ -151,19 +160,17 @@ msgstr "% Critical"
msgid "% Evade"
msgstr "% Evade"
-#: ../src/gui/debugwindow.cpp:61
-#: ../src/gui/debugwindow.cpp:64
+#: ../src/gui/debugwindow.cpp:59
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: ../src/gui/debugwindow.cpp:56
+#: ../src/gui/debugwindow.cpp:54
#, c-format
msgid "%d FPS (OpenGL)"
msgstr "%d FPS (OpenGL)"
-#: ../src/client.cpp:1154
-#: ../src/client.cpp:1182
+#: ../src/client.cpp:1151 ../src/client.cpp:1179
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
@@ -208,6 +215,11 @@ msgstr "%s hat den Modus %s auf den Spieler %s gesetzt."
msgid "%s is already a member of a party."
msgstr "%s ist bereits Mitglied einer Party."
+#: ../src/net/manaserv/partyhandler.cpp:157
+#, fuzzy, c-format
+msgid "%s is already in a party."
+msgstr "%s ist bereits Mitglied einer Party."
+
#: ../src/net/tmwa/partyhandler.cpp:368
#, c-format
msgid "%s is not in your party!"
@@ -218,9 +230,9 @@ msgstr "%s ist nicht in Deiner Party!"
msgid "%s is now a member of your party."
msgstr "%s ist nun Mitglied Deiner Party."
-#: ../src/net/manaserv/partyhandler.cpp:105
-#, c-format
-msgid "%s joined the party."
+#: ../src/net/manaserv/partyhandler.cpp:128
+#, fuzzy, c-format
+msgid "%s joined the party%s."
msgstr "%s ist der Party beigetreten."
#: ../src/net/manaserv/chathandler.cpp:311
@@ -233,7 +245,7 @@ msgstr "%s hat den Channel verlassen."
msgid "%s refused your invitation."
msgstr "%s hat Deine Einladung zurückgewiesen."
-#: ../src/net/manaserv/partyhandler.cpp:123
+#: ../src/net/manaserv/partyhandler.cpp:148
#, c-format
msgid "%s rejected your invite."
msgstr "%s hat Deine Einladung zurückgewiesen."
@@ -249,8 +261,7 @@ msgstr "%s möchte mit Dir handeln, stimmst Du zu?"
msgid "%s whispers: %s"
msgstr "%s flüstert: "
-#: ../src/gui/charselectdialog.cpp:418
-#: ../src/gui/charselectdialog.cpp:419
+#: ../src/gui/charselectdialog.cpp:418 ../src/gui/charselectdialog.cpp:419
msgid "(empty)"
msgstr "(leer)"
@@ -258,19 +269,15 @@ msgstr "(leer)"
msgid "*** only available to a GM ***"
msgstr "*** Nur für GMs verfügbar ***"
-#: ../src/gui/buy.cpp:74
-#: ../src/gui/itemamount.cpp:112
-#: ../src/gui/npcdialog.cpp:124
-#: ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:464
+#: ../src/gui/buy.cpp:75 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:466
msgid "+"
msgstr "+"
-#: ../src/gui/buy.cpp:77
-#: ../src/gui/itemamount.cpp:111
-#: ../src/gui/npcdialog.cpp:125
-#: ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:476
+#: ../src/gui/buy.cpp:78 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:126 ../src/gui/sell.cpp:76
+#: ../src/gui/statuswindow.cpp:478
msgid "-"
msgstr "-"
@@ -284,7 +291,9 @@ msgstr "/announce > Globale Ansage (Nur von GMs nutzbar)"
#: ../src/commandhandler.cpp:181
msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr "/away > Teilt den anderen flüsternden Spielern deine Abwesenheit von der Tastatur mit."
+msgstr ""
+"/away > Teilt den anderen flüsternden Spielern deine Abwesenheit von der "
+"Tastatur mit."
#: ../src/commandhandler.cpp:172
msgid "/clear > Clears this window"
@@ -301,14 +310,15 @@ msgstr "/create > Erstelle eine neue Party"
#: ../src/net/tmwa/gui/partytab.cpp:64
msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der Party"
+msgstr ""
+"/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der "
+"Party"
#: ../src/commandhandler.cpp:166
msgid "/help > Display this help"
msgstr "/help > diese Hilfe anzeigen"
-#: ../src/net/tmwa/gui/guildtab.cpp:61
-#: ../src/net/tmwa/gui/partytab.cpp:59
+#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
msgid "/help > Display this help."
msgstr "/help > Diese Hilfe anzeigen"
@@ -331,7 +341,9 @@ msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
#: ../src/net/tmwa/gui/partytab.cpp:63
msgid "/item > Show/change party item sharing options"
-msgstr "/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der Party"
+msgstr ""
+"/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der "
+"Party"
#: ../src/commandhandler.cpp:188
msgid "/join > Join or create a channel"
@@ -381,7 +393,9 @@ msgstr "/party > Lade einen Benutzer zu deiner Party ein"
#: ../src/commandhandler.cpp:197
msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > Liste anwesender Spieler (wird im Chat-log aufgezeichnet, falls das Log aktiviert ist)"
+msgstr ""
+"/present > Liste anwesender Spieler (wird im Chat-log aufgezeichnet, falls "
+"das Log aktiviert ist)"
#: ../src/commandhandler.cpp:179
msgid "/q > Alias of query"
@@ -389,7 +403,8 @@ msgstr "/q > Ersatz für query"
#: ../src/commandhandler.cpp:177
msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Öffnet einen Tab für private Nachrichten mit einem anderen Benutzer"
+msgstr ""
+"/query > Öffnet einen Tab für private Nachrichten mit einem anderen Benutzer"
#: ../src/gui/widgets/channeltab.cpp:51
msgid "/quit > Leave a channel"
@@ -435,32 +450,41 @@ msgstr "/whisper > Ersatz für msg"
msgid "/who > Display number of online users"
msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
-#: ../src/gui/charcreatedialog.cpp:73
-#: ../src/gui/charcreatedialog.cpp:76
+#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
#: ../src/gui/outfitwindow.cpp:66
msgid "<"
msgstr "<"
#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr "Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu erlauben, \"0\",\"no\",\"false\" verbieten es."
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu "
+"erlauben, \"0\",\"no\",\"false\" verbieten es."
#: ../src/net/tmwa/gui/partytab.cpp:87
-msgid "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or \"0\", \"no\", \"false\" to disable item sharing."
-msgstr "<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von "
+"Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
#: ../src/commandhandler.cpp:308
-msgid "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0\", \"no\", \"false\" to turn the toggle off."
-msgstr "<Status> \"1\",\"yes\",\"true\" aktiviert das Schließen durch Enter, \"0\",\"no\",\"false\" deaktiviert es."
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+"<Status> \"1\",\"yes\",\"true\" aktiviert das Schließen durch Enter, \"0\","
+"\"no\",\"false\" deaktiviert es."
-#: ../src/gui/charcreatedialog.cpp:70
-#: ../src/gui/charcreatedialog.cpp:75
+#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
#: ../src/gui/outfitwindow.cpp:67
msgid ">"
msgstr ">"
-#: ../src/gui/setup_players.cpp:206
-#: ../src/gui/setup_video.cpp:147
+#: ../src/gui/setup_interface.cpp:78 ../src/gui/setup_players.cpp:206
msgid "???"
msgstr "???"
@@ -482,7 +506,7 @@ msgstr "Nehme Gildeneinladung an"
msgid "Accepted party invite from %s."
msgstr "Partyeinladung von %s angenommen."
-#: ../src/game.cpp:738
+#: ../src/game.cpp:722
msgid "Accepting incoming trade requests"
msgstr "Akzeptiere eingehende Handelsanfragen"
@@ -521,14 +545,12 @@ msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
msgid "Account was not found. Please re-login."
msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
-#: ../src/gui/changeemaildialog.cpp:49
-#: ../src/gui/changepassworddialog.cpp:52
+#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
#, c-format
msgid "Account: %s"
msgstr "Account: %s"
-#: ../src/gui/inventorywindow.cpp:106
-#: ../src/gui/popupmenu.cpp:369
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/popupmenu.cpp:372
msgid "Activate"
msgstr ""
@@ -536,12 +558,11 @@ msgstr ""
msgid "Add"
msgstr "Hinzufügen"
-#: ../src/gui/popupmenu.cpp:171
+#: ../src/gui/popupmenu.cpp:174
msgid "Add name to chat"
msgstr "Füge Namen zu Chat hinzu"
-#: ../src/gui/popupmenu.cpp:190
-#: ../src/gui/popupmenu.cpp:387
+#: ../src/gui/popupmenu.cpp:193 ../src/gui/popupmenu.cpp:390
msgid "Add to chat"
msgstr "Zu Chat hinzufügen"
@@ -593,36 +614,39 @@ msgstr "Bereits angemeldet"
msgid "Already recording."
msgstr "Es läuft bereits eine Aufzeichnung."
-#: ../src/gui/setup_video.cpp:254
-msgid "Ambient FX"
+#: ../src/gui/setup_video.cpp:191
+#, fuzzy
+msgid "Ambient FX:"
msgstr "Hintergrundeffekte"
-#: ../src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
-msgstr "Hintergrundeffekte: %s"
-
#: ../src/net/tmwa/partyhandler.cpp:299
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
-#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/manaserv/beinghandler.cpp:322
#: ../src/net/tmwa/playerhandler.cpp:112
msgid "Annihilated."
msgstr "Vernichtet."
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Apply"
msgstr "Anwenden"
-#: ../src/gui/setup_video.cpp:461
+#: ../src/gui/setup_video.cpp:358
msgid "Applying change to OpenGL requires restart."
-msgstr "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung übernommen."
+msgstr ""
+"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
+"übernommen."
-#: ../src/gui/setup_video.cpp:453
-msgid "Applying change to OpenGL requires restart. In case OpenGL messes up your game graphics, restart the game with the command line option \"--no-opengl\"."
-msgstr "Der Wechsel zu OpenGL erfordert einen Neustart. Falls mit OpenGL Grafiken fehlerhaft dargestellt werden sollten bitte das Spiel mit der Kommandozeilenoption \"--no-opengl\" neustarten."
+#: ../src/gui/setup_video.cpp:350
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+"Der Wechsel zu OpenGL erfordert einen Neustart. Falls mit OpenGL Grafiken "
+"fehlerhaft dargestellt werden sollten bitte das Spiel mit der "
+"Kommandozeilenoption \"--no-opengl\" neustarten."
#: ../src/gui/charselectdialog.cpp:73
msgid "Are you sure you want to delete this character?"
@@ -638,27 +662,27 @@ msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
msgid "Are you sure you want to leave party %s?"
msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
-#: ../src/gui/setup_keyboard.cpp:86
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr "Zuordnen"
#: ../src/net/manaserv/charhandler.cpp:165
#, c-format
msgid "At least one statis out of the permitted range: (%u - %u)."
-msgstr "Mindestens einer der Statuspunkte ist außerhalb des erlaubten Bereiches: (%u - %u)."
+msgstr ""
+"Mindestens einer der Statuspunkte ist außerhalb des erlaubten Bereiches: (%u "
+"- %u)."
-#: ../src/keyboardconfig.cpp:43
-#: ../src/net/tmwa/generalhandler.cpp:237
+#: ../src/keyboardconfig.cpp:43 ../src/net/tmwa/generalhandler.cpp:237
msgid "Attack"
msgstr "Angriff"
-#: ../src/resources/itemdb.cpp:310
+#: ../src/resources/itemdb.cpp:321
#, c-format
msgid "Attack %+d"
msgstr "Angriff %+d"
-#: ../src/gui/popupmenu.cpp:87
-#: ../src/gui/popupmenu.cpp:158
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:161
#, fuzzy, c-format
msgid "Attack %s"
msgstr "Angriff %+d"
@@ -675,7 +699,7 @@ msgstr "Audio"
msgid "Authentication failed."
msgstr "Authentifizierung fehlgeschlagen"
-#: ../src/localplayer.cpp:1030
+#: ../src/localplayer.cpp:1057
msgid "Away"
msgstr "Abwesend"
@@ -688,6 +712,20 @@ msgstr "Sei Freund von %s"
msgid "Being"
msgstr "Aktionen"
+#: ../src/gui/debugwindow.cpp:136
+#, fuzzy
+msgid "Being collision radius"
+msgstr "Scroll-Radius"
+
+#: ../src/gui/debugwindow.cpp:138
+#, fuzzy
+msgid "Being path"
+msgstr "Aktionen"
+
+#: ../src/gui/debugwindow.cpp:137
+msgid "Being positions"
+msgstr ""
+
#: ../src/net/tmwa/playerhandler.cpp:124
msgid "Bereft of life, you rest in peace."
msgstr "Des Lebens beraubt ruhst Du in Frieden."
@@ -700,49 +738,42 @@ msgstr "Blinkender Name"
msgid "Blue:"
msgstr "Blau: "
-#: ../src/gui/setup_video.cpp:160
+#: ../src/gui/setup_interface.cpp:91
msgid "Bubbles with names"
msgstr "Blasen mit Namen"
-#: ../src/gui/setup_video.cpp:159
+#: ../src/gui/setup_interface.cpp:90
msgid "Bubbles, no names"
msgstr "Blasen, keine Namen"
-#: ../src/gui/buy.cpp:49
-#: ../src/gui/buy.cpp:78
-#: ../src/gui/buysell.cpp:47
+#: ../src/gui/buy.cpp:50 ../src/gui/buy.cpp:79 ../src/gui/buysell.cpp:47
msgid "Buy"
msgstr "Kaufen"
-#: ../src/gui/setup_joystick.cpp:38
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
msgid "Calibrate"
msgstr "Kalibrieren"
-#: ../src/gui/buysell.cpp:47
-#: ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58
-#: ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44
-#: ../src/gui/itemamount.cpp:114
-#: ../src/gui/npcpostdialog.cpp:57
-#: ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194
-#: ../src/gui/popupmenu.cpp:389
-#: ../src/gui/quitdialog.cpp:47
-#: ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51
-#: ../src/gui/socialwindow.cpp:275
-#: ../src/gui/textdialog.cpp:40
-#: ../src/gui/unregisterdialog.cpp:56
+#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
+#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
+#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:178
+#: ../src/gui/popupmenu.cpp:197 ../src/gui/popupmenu.cpp:392
+#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
+#: ../src/gui/setup.cpp:52 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
#: ../src/gui/updatewindow.cpp:144
msgid "Cancel"
msgstr "Abbrechen"
#: ../src/commandhandler.cpp:421
#, c-format
-msgid "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is you."
-msgstr "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits einer, oder der Spieler bist du."
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
+"einer, oder der Spieler bist du."
#: ../src/gui/socialwindow.cpp:620
msgid "Cannot create party. You are already in a party"
@@ -776,8 +807,7 @@ msgstr "Ändern"
msgid "Change Email"
msgstr "E-Mailadresse ändern"
-#: ../src/gui/changeemaildialog.cpp:45
-#: ../src/gui/changeemaildialog.cpp:54
+#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
msgid "Change Email Address"
msgstr "E-MailAdresse ändern"
@@ -787,8 +817,7 @@ msgid "Change Login"
msgstr "Ändern"
#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56
-#: ../src/gui/charselectdialog.cpp:132
+#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:132
msgid "Change Password"
msgstr "Passwort ändern"
@@ -796,32 +825,30 @@ msgstr "Passwort ändern"
msgid "Change Server"
msgstr "Wechsle den Server"
-#: ../src/gui/setup_video.cpp:607
+#: ../src/gui/setup_video.cpp:466
msgid "Changes will take effect on map change."
msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
-#: ../src/client.cpp:848
+#: ../src/client.cpp:845
#, fuzzy
msgid "Changing game servers"
msgstr "Wechsle den Server"
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:349
#, fuzzy
msgid "Changing to OpenGL"
msgstr "Ändere OpenGL"
#: ../src/gui/widgets/channeltab.cpp:84
msgid "Channel operators can kick and op other users from the channel."
-msgstr "Moderatoren können andere Spieler aus dem Kanal werfen oder ihnen ebenfalls Moderatorrechte verleihen."
-
-#: ../src/net/tmwa/chathandler.cpp:265
-#: ../src/net/tmwa/chathandler.cpp:271
-#: ../src/net/tmwa/chathandler.cpp:276
-#: ../src/net/tmwa/chathandler.cpp:281
-#: ../src/net/tmwa/chathandler.cpp:286
-#: ../src/net/tmwa/chathandler.cpp:291
-#: ../src/net/tmwa/chathandler.cpp:296
-#: ../src/net/tmwa/chathandler.cpp:301
+msgstr ""
+"Moderatoren können andere Spieler aus dem Kanal werfen oder ihnen ebenfalls "
+"Moderatorrechte verleihen."
+
+#: ../src/net/tmwa/chathandler.cpp:265 ../src/net/tmwa/chathandler.cpp:271
+#: ../src/net/tmwa/chathandler.cpp:276 ../src/net/tmwa/chathandler.cpp:281
+#: ../src/net/tmwa/chathandler.cpp:286 ../src/net/tmwa/chathandler.cpp:291
+#: ../src/net/tmwa/chathandler.cpp:296 ../src/net/tmwa/chathandler.cpp:301
msgid "Channels are not supported!"
msgstr "Kanäle werden nicht unterstützt!"
@@ -829,8 +856,7 @@ msgstr "Kanäle werden nicht unterstützt!"
msgid "Character deleted."
msgstr "Spieler gelöscht."
-#: ../src/gui/statuswindow.cpp:211
-#: ../src/gui/statuswindow.cpp:248
+#: ../src/gui/statuswindow.cpp:213 ../src/gui/statuswindow.cpp:250
#, fuzzy, c-format
msgid "Character points: %d"
msgstr "Spielfigurattribute OK"
@@ -855,7 +881,7 @@ msgstr "Spielfigurattribute sind zu klein"
msgid "Chat"
msgstr "Chat"
-#: ../src/keyboardconfig.cpp:75
+#: ../src/keyboardconfig.cpp:74
msgid "Chat Window"
msgstr "Chatfenster"
@@ -885,13 +911,16 @@ msgstr "Wähle den Namen deiner Gilde"
msgid "Choose your party's name."
msgstr "Wähle den Namen deiner Gilde"
-#: ../src/gui/npcdialog.cpp:118
+#: ../src/gui/npcdialog.cpp:119
msgid "Clear log"
msgstr "Protokoll leeren"
#: ../src/net/manaserv/loginhandler.cpp:239
-msgid "Client registration is not allowed. Please contact server administration."
-msgstr "Client Registrierung wurde deaktiviert. Bitte den Serveradministrator kontaktieren."
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+"Client Registrierung wurde deaktiviert. Bitte den Serveradministrator "
+"kontaktieren."
#: ../src/net/tmwa/loginhandler.cpp:172
#, fuzzy
@@ -903,11 +932,14 @@ msgstr "Die Version des Spiels ist zu alt"
msgid "Client version is too old."
msgstr "Die Version des Spiels ist zu alt"
-#: ../src/gui/help.cpp:51
-#: ../src/gui/npcdialog.cpp:50
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:51
msgid "Close"
msgstr "Schließen"
+#: ../src/gui/debugwindow.cpp:135
+msgid "Collision tiles"
+msgstr ""
+
#: ../src/gui/setup_colors.cpp:51
msgid "Colors"
msgstr "Farben"
@@ -964,8 +996,7 @@ msgstr "Befehl: /item"
msgid "Command: /ignore <player>"
msgstr "Befehl: /item <Wert>"
-#: ../src/net/tmwa/gui/guildtab.cpp:73
-#: ../src/net/tmwa/gui/partytab.cpp:73
+#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
msgid "Command: /invite <nick>"
msgstr "Befehl: /invite <Name>"
@@ -985,8 +1016,7 @@ msgstr "Befehl: /join <Kanal>"
msgid "Command: /kick <nick>"
msgstr "Befehl: /kick <Name>"
-#: ../src/net/tmwa/gui/guildtab.cpp:80
-#: ../src/net/tmwa/gui/partytab.cpp:80
+#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
msgid "Command: /leave"
msgstr "Befehl: /leave"
@@ -1046,8 +1076,7 @@ msgstr "Befehl: /toggle <Status>"
msgid "Command: /topic <message>"
msgstr "Befehl: /topic <Thema>"
-#: ../src/commandhandler.cpp:316
-#: ../src/gui/widgets/whispertab.cpp:95
+#: ../src/commandhandler.cpp:316 ../src/gui/widgets/whispertab.cpp:95
#, fuzzy
msgid "Command: /unignore <player>"
msgstr "Befehl: /item <Wert>"
@@ -1099,19 +1128,21 @@ msgstr "Bestätigt. Warten..."
#: ../src/keyboardconfig.cpp:183
#, fuzzy, c-format
-msgid "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in strange behaviour."
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
#: ../src/gui/serverdialog.cpp:229
msgid "Connect"
msgstr "Verbinde..."
-#: ../src/client.cpp:661
+#: ../src/client.cpp:658
#, fuzzy
msgid "Connecting to server"
msgstr "Verbinde mit [Benutzerdatenserver]..."
-#: ../src/client.cpp:838
+#: ../src/client.cpp:835
#, fuzzy
msgid "Connecting to the game server"
msgstr "Verbinde mit [Charakterserver]..."
@@ -1124,16 +1155,16 @@ msgstr "Verbinde..."
msgid "Connection to server terminated. "
msgstr "Verbindung mit Server abgebrochen. "
-#: ../src/keyboardconfig.cpp:83
+#: ../src/keyboardconfig.cpp:82
msgid "Copy Outfit"
msgstr "Ausrüstung kopieren"
-#: ../src/gui/statuswindow.cpp:256
+#: ../src/gui/statuswindow.cpp:258
#, fuzzy, c-format
msgid "Correction points: %d"
msgstr "Fähigkeitspunkte: %d"
-#: ../src/game.cpp:966
+#: ../src/game.cpp:950
#, fuzzy
msgid "Could Not Load Map"
msgstr "Karte konnte nicht geladen werden"
@@ -1143,7 +1174,8 @@ msgid "Could not create party."
msgstr "Konnte Party nicht erstellen."
#: ../src/net/tmwa/guildhandler.cpp:296
-msgid "Could not inivte user to guild."
+#, fuzzy
+msgid "Could not invite user to guild."
msgstr "Konnte User nicht in Gilde einladen."
#: ../src/net/tmwa/specialhandler.cpp:157
@@ -1154,8 +1186,7 @@ msgstr "Kann der Gruppe nicht beitreten!"
msgid "Could not steal anything..."
msgstr "Konnte nichts stehlen..."
-#: ../src/gui/charcreatedialog.cpp:78
-#: ../src/gui/charselectdialog.cpp:416
+#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:416
#: ../src/gui/socialwindow.cpp:330
msgid "Create"
msgstr "Erstellen"
@@ -1168,8 +1199,7 @@ msgstr "Charakter erstellen"
msgid "Create Guild"
msgstr "Gilde erstellen"
-#: ../src/gui/socialwindow.cpp:273
-#: ../src/gui/socialwindow.cpp:619
+#: ../src/gui/socialwindow.cpp:273 ../src/gui/socialwindow.cpp:619
#, fuzzy
msgid "Create Party"
msgstr "Charakter erstellen"
@@ -1196,8 +1226,7 @@ msgstr "Partie konte nicht erstellt werden, bitte einen kürzeren Namen wählen.
msgid "Critical Hit"
msgstr "Kritischer Treffer"
-#: ../src/gui/debugwindow.cpp:68
-#: ../src/gui/debugwindow.cpp:99
+#: ../src/gui/debugwindow.cpp:96
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Cursor: (%d, %d)"
@@ -1207,23 +1236,23 @@ msgstr "Cursor: (%d, %d)"
msgid "Custom Server"
msgstr "Benutzerdefinierter Zeiger"
-#: ../src/gui/setup_video.cpp:213
+#: ../src/gui/setup_video.cpp:167
msgid "Custom cursor"
msgstr "Benutzerdefinierter Zeiger"
-#: ../src/gui/setup_video.cpp:460
+#: ../src/gui/setup_video.cpp:357
msgid "Deactivating OpenGL"
msgstr "Deaktiviere OpenGL"
-#: ../src/gui/debugwindow.cpp:43
+#: ../src/gui/debugwindow.cpp:219
msgid "Debug"
msgstr "Debug"
-#: ../src/keyboardconfig.cpp:78
+#: ../src/keyboardconfig.cpp:77
msgid "Debug Window"
msgstr "Debugfenster"
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:96
msgid "Default"
msgstr "Standard"
@@ -1231,7 +1260,7 @@ msgstr "Standard"
msgid "Defense"
msgstr "Verteidigung:"
-#: ../src/resources/itemdb.cpp:311
+#: ../src/resources/itemdb.cpp:322
#, c-format
msgid "Defense %+d"
msgstr "Verteidigung %+d"
@@ -1240,8 +1269,7 @@ msgstr "Verteidigung %+d"
msgid "Delay:"
msgstr "Verzögerung: "
-#: ../src/gui/charselectdialog.cpp:360
-#: ../src/gui/serverdialog.cpp:231
+#: ../src/gui/charselectdialog.cpp:360 ../src/gui/serverdialog.cpp:231
#: ../src/gui/setup_players.cpp:229
msgid "Delete"
msgstr "Löschen"
@@ -1265,7 +1293,7 @@ msgstr "Ausdauer %+d"
msgid "Dexterity:"
msgstr "Geschicklichkeit:"
-#: ../src/gui/setup_video.cpp:241
+#: ../src/gui/setup_video.cpp:181
msgid "Disable transparency (Low CPU mode)"
msgstr "Transparenz deaktivieren (für langsame PCs)"
@@ -1278,7 +1306,7 @@ msgstr "Unbeachtet"
msgid "Disregarded"
msgstr "Unbeachtet"
-#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/manaserv/beinghandler.cpp:320
#: ../src/net/tmwa/playerhandler.cpp:108
msgid "Do you want your possessions identified?"
msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
@@ -1292,14 +1320,12 @@ msgstr "Lade Musik herunter"
msgid "Downloading server list...%2.2f%%"
msgstr "Lade Serverliste herunter...%2.2f%%"
-#: ../src/gui/inventorywindow.cpp:365
-#: ../src/gui/popupmenu.cpp:374
+#: ../src/gui/inventorywindow.cpp:373 ../src/gui/popupmenu.cpp:377
msgid "Drop"
msgstr "Wegwerfen"
-#: ../src/gui/inventorywindow.cpp:107
-#: ../src/gui/inventorywindow.cpp:363
-#: ../src/gui/popupmenu.cpp:372
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/inventorywindow.cpp:371
+#: ../src/gui/popupmenu.cpp:375
msgid "Drop..."
msgstr "Wegwerfen"
@@ -1307,7 +1333,7 @@ msgstr "Wegwerfen"
msgid "Duplicated login."
msgstr "Mehrfache Anmeldung"
-#: ../src/client.cpp:935
+#: ../src/client.cpp:932
msgid "Email Change"
msgstr "E-Mail ändern"
@@ -1315,7 +1341,7 @@ msgstr "E-Mail ändern"
msgid "Email address already exists."
msgstr "E-Mailadresse bereits vorhanden"
-#: ../src/client.cpp:936
+#: ../src/client.cpp:933
#, fuzzy
msgid "Email changed successfully!"
msgstr "Mitglied wurde erfolgreich Befördert."
@@ -1324,23 +1350,17 @@ msgstr "Mitglied wurde erfolgreich Befördert."
msgid "Email:"
msgstr "eMail:"
-#: ../src/keyboardconfig.cpp:84
-#: ../src/keyboardconfig.cpp:85
-#: ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87
-#: ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89
-#: ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91
-#: ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93
-#: ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
#, c-format
msgid "Emote Shortcut %d"
msgstr "Gefühlstaste %d"
-#: ../src/keyboardconfig.cpp:80
+#: ../src/keyboardconfig.cpp:79
msgid "Emote Shortcut Window"
msgstr "Kurztasten für Gefühle"
@@ -1373,14 +1393,12 @@ msgstr "Ende der Channel-Liste."
msgid "Enter the old password first."
msgstr "Gib das alte Passwort zuerst an."
-#: ../src/client.cpp:721
+#: ../src/client.cpp:718
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
-#: ../src/gui/inventorywindow.cpp:92
-#: ../src/gui/inventorywindow.cpp:105
-#: ../src/gui/inventorywindow.cpp:354
-#: ../src/gui/popupmenu.cpp:366
+#: ../src/gui/inventorywindow.cpp:93 ../src/gui/inventorywindow.cpp:106
+#: ../src/gui/inventorywindow.cpp:362 ../src/gui/popupmenu.cpp:369
msgid "Equip"
msgstr "Ausrüsten"
@@ -1388,23 +1406,18 @@ msgstr "Ausrüsten"
msgid "Equip arrows first."
msgstr "Rüste dich zuerst mit Pfeilen aus."
-#: ../src/gui/equipmentwindow.cpp:69
-#: ../src/gui/windowmenu.cpp:55
+#: ../src/gui/equipmentwindow.cpp:54 ../src/gui/windowmenu.cpp:55
msgid "Equipment"
msgstr "Ausrüstung"
-#: ../src/keyboardconfig.cpp:72
+#: ../src/keyboardconfig.cpp:71
msgid "Equipment Window"
msgstr "Ausrüstungsfenster"
-#: ../src/client.cpp:1036
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149
-#: ../src/gui/charcreatedialog.cpp:183
-#: ../src/gui/register.cpp:218
-#: ../src/gui/serverdialog.cpp:323
-#: ../src/gui/unregisterdialog.cpp:133
-#: ../src/net/manaserv/charhandler.cpp:177
+#: ../src/client.cpp:1033 ../src/gui/changeemaildialog.cpp:156
+#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
+#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
+#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
#: ../src/net/manaserv/charhandler.cpp:227
#: ../src/net/tmwa/charserverhandler.cpp:134
#: ../src/net/tmwa/charserverhandler.cpp:151
@@ -1415,8 +1428,7 @@ msgstr "Fehler"
msgid "Error creating guild."
msgstr "Fehler beim Erstellen der Gilde."
-#: ../src/client.cpp:1336
-#: ../src/client.cpp:1342
+#: ../src/client.cpp:1333 ../src/client.cpp:1339
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
@@ -1429,7 +1441,7 @@ msgstr "Fehler beim Betreten des Kanals."
msgid "Error retreiving server list!"
msgstr "Fehler beim empfangen der Serverliste: %s\n"
-#: ../src/game.cpp:967
+#: ../src/game.cpp:951
#, c-format
msgid "Error while loading %s"
msgstr "Fehler beim Laden von %s"
@@ -1438,22 +1450,19 @@ msgstr "Fehler beim Laden von %s"
msgid "Exp Notification"
msgstr "Anzeige der Erfahrungspunkte"
-#: ../src/gui/statuswindow.cpp:122
+#: ../src/gui/statuswindow.cpp:124
msgid "Exp:"
msgstr "Exp:"
-#: ../src/net/tmwa/gui/partytab.cpp:170
-#: ../src/net/tmwa/partyhandler.cpp:178
+#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:178
msgid "Experience sharing disabled."
msgstr "Teilen der Erfahrungspunkte deaktiviert."
-#: ../src/net/tmwa/gui/partytab.cpp:167
-#: ../src/net/tmwa/partyhandler.cpp:172
+#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:172
msgid "Experience sharing enabled."
msgstr "Teilen der Erfahrungspunkte aktiviert."
-#: ../src/net/tmwa/gui/partytab.cpp:173
-#: ../src/net/tmwa/partyhandler.cpp:184
+#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:184
msgid "Experience sharing not possible."
msgstr "Teilen der Erfahrungspunkte nicht möglich."
@@ -1462,7 +1471,7 @@ msgstr "Teilen der Erfahrungspunkte nicht möglich."
msgid "Experience sharing unknown."
msgstr "Teilen der Erfahrungspunkte aktiviert."
-#: ../src/gui/setup_video.cpp:230
+#: ../src/gui/setup_video.cpp:171
#, fuzzy
msgid "FPS limit:"
msgstr "FPS-Limit:"
@@ -1473,19 +1482,26 @@ msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
#: ../src/net/tmwa/tradehandler.cpp:207
msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien Platz mehr."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien "
+"Platz mehr."
#: ../src/net/tmwa/tradehandler.cpp:202
msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
#: ../src/gui/trade.cpp:262
msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser Gegenstände hinzufügen."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
+"Gegenstände hinzufügen."
#: ../src/net/tmwa/charserverhandler.cpp:134
msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name bereits vergeben."
+msgstr ""
+"Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name bereits "
+"vergeben."
#: ../src/net/tmwa/charserverhandler.cpp:151
msgid "Failed to delete character."
@@ -1503,39 +1519,37 @@ msgstr "Es misslang den Brief zu senden oder er war ungültig."
msgid "Failed to start recording."
msgstr "Start der Aufzeichnung fehlgeschlagen."
-#: ../src/gui/setup_video.cpp:426
+#: ../src/gui/setup_video.cpp:323
#, fuzzy
-msgid "Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
-#: ../src/gui/setup_video.cpp:420
+#: ../src/gui/setup_video.cpp:317
#, fuzzy
-msgid "Failed to switch to windowed mode and restoration of old mode also failed!"
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
-#: ../src/net/tmwa/inventoryhandler.cpp:287
+#: ../src/net/tmwa/inventoryhandler.cpp:286
msgid "Failed to use item."
msgstr "Gegenstand konnte nicht benutzt werden."
-#: ../src/client.cpp:956
+#: ../src/client.cpp:953
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komme jeder Zeit wieder..."
-#: ../src/gui/charcreatedialog.cpp:81
-#: ../src/gui/register.cpp:91
+#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
msgid "Female"
msgstr "Weiblich"
-#: ../src/keyboardconfig.cpp:56
-msgid "Find Path to Mouse"
-msgstr "Finde Weg zum Mauszeiger"
-
#: ../src/gui/recorder.cpp:87
msgid "Finishing recording."
msgstr "Aufzeichnung abgeschlossen."
-#: ../src/gui/setup_video.cpp:256
-msgid "Font size"
+#: ../src/gui/setup_interface.cpp:130
+#, fuzzy
+msgid "Font size:"
msgstr "Schriftgröße"
#: ../src/commandhandler.cpp:204
@@ -1546,7 +1560,7 @@ msgstr "Für mehr Informationen, gib /help <Befehl> ein."
msgid "Friend"
msgstr "Freund"
-#: ../src/gui/setup_video.cpp:211
+#: ../src/gui/setup_video.cpp:165
msgid "Full screen"
msgstr "Vollbild"
@@ -1554,16 +1568,16 @@ msgstr "Vollbild"
msgid "GM Names"
msgstr "Namen von GM"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Game"
msgstr "Spiel"
-#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/manaserv/beinghandler.cpp:314
#: ../src/net/tmwa/playerhandler.cpp:100
msgid "Game Over!"
msgstr "Game Over!"
-#: ../src/game.cpp:181
+#: ../src/game.cpp:179
msgid "General"
msgstr "Öffentlich"
@@ -1584,7 +1598,11 @@ msgstr "Verbindung zum Server unterbrochen!"
msgid "Green:"
msgstr "Grün: "
-#: ../src/gui/setup_video.cpp:253
+#: ../src/gui/debugwindow.cpp:134
+msgid "Grid"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:129
msgid "Gui opacity"
msgstr "GUI-Transparenz"
@@ -1619,12 +1637,12 @@ msgstr "Gildenerstellung wird nocht nicht unterstützt."
msgid "Guild name is missing."
msgstr "Name der Party fehlt."
-#: ../src/resources/itemdb.cpp:312
+#: ../src/resources/itemdb.cpp:323
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: ../src/gui/statuswindow.cpp:117
+#: ../src/gui/statuswindow.cpp:119
msgid "HP:"
msgstr "HP:"
@@ -1640,7 +1658,7 @@ msgstr "Frisur:"
msgid "Help"
msgstr "Hilfe"
-#: ../src/keyboardconfig.cpp:69
+#: ../src/keyboardconfig.cpp:68
msgid "Help Window"
msgstr "Hilfefenster"
@@ -1652,7 +1670,7 @@ msgstr "Fenster ausblenden"
msgid "Huh? What's that?"
msgstr "Huch? Was ist das?"
-#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/manaserv/beinghandler.cpp:319
#: ../src/net/tmwa/playerhandler.cpp:106
msgid "I guess this did not run too well."
msgstr "Ich glaube, das war nicht so gut."
@@ -1661,18 +1679,19 @@ msgstr "Ich glaube, das war nicht so gut."
msgid "If <channel> doesn't exist, it's created."
msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
-#: ../src/commandhandler.cpp:258
-#: ../src/commandhandler.cpp:285
-#: ../src/gui/widgets/channeltab.cpp:82
-#: ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75
-#: ../src/net/tmwa/gui/partytab.cpp:75
+#: ../src/commandhandler.cpp:258 ../src/commandhandler.cpp:285
+#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
+#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen (\")."
+msgstr ""
+"Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
+"(\")."
#: ../src/net/tmwa/playerhandler.cpp:125
msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Wenn Du nicht so lebendig wärst, könntest Du die Gänseblümchen von unten sehen."
+msgstr ""
+"Wenn Du nicht so lebendig wärst, könntest Du die Gänseblümchen von unten "
+"sehen."
#: ../src/gui/widgets/channeltab.cpp:75
msgid "If you're the last person in the channel, it will be deleted."
@@ -1683,11 +1702,11 @@ msgstr "Wenn Du die letzte Person im Kanal bist, wird dieser gelöscht."
msgid "Ignore %s"
msgstr "Ignoriere %s"
-#: ../src/keyboardconfig.cpp:103
+#: ../src/keyboardconfig.cpp:102
msgid "Ignore input 1"
msgstr "Ignoriere Eingabe 1"
-#: ../src/keyboardconfig.cpp:104
+#: ../src/keyboardconfig.cpp:103
msgid "Ignore input 2"
msgstr "Ignoriere Eingabe 2"
@@ -1695,7 +1714,7 @@ msgstr "Ignoriere Eingabe 2"
msgid "Ignored"
msgstr "Ignoriert"
-#: ../src/game.cpp:733
+#: ../src/game.cpp:717
msgid "Ignoring incoming trade requests"
msgstr "Ignoriere eingehende Handelsanfragen"
@@ -1703,7 +1722,7 @@ msgstr "Ignoriere eingehende Handelsanfragen"
msgid "Ignoring incoming trade requests."
msgstr "Ignoriere eingehende Handelsanfragen."
-#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/gui/debugwindow.cpp:235 ../src/net/manaserv/charhandler.cpp:210
#: ../src/net/tmwa/charserverhandler.cpp:146
msgid "Info"
msgstr "Info"
@@ -1739,6 +1758,10 @@ msgstr "Intelligenz %+d"
msgid "Intelligence:"
msgstr "Intelligenz:"
+#: ../src/gui/setup_interface.cpp:120
+msgid "Interface"
+msgstr ""
+
#: ../src/net/manaserv/charhandler.cpp:267
#, fuzzy
msgid "Invalid character slot selected."
@@ -1765,21 +1788,20 @@ msgstr "Ungültiger Name."
msgid "Invalid slot number."
msgstr "Ungültiger Name."
-#: ../src/client.cpp:1302
+#: ../src/client.cpp:1299
#, fuzzy, c-format
msgid "Invalid update host: %s"
msgstr "Ungültiger Updateserver: "
-#: ../src/gui/inventorywindow.cpp:59
-#: ../src/gui/windowmenu.cpp:56
+#: ../src/gui/inventorywindow.cpp:60 ../src/gui/windowmenu.cpp:56
msgid "Inventory"
msgstr "Inventar"
-#: ../src/keyboardconfig.cpp:71
+#: ../src/keyboardconfig.cpp:70
msgid "Inventory Window"
msgstr "Inventarfenster"
-#: ../src/localplayer.cpp:898
+#: ../src/localplayer.cpp:925
#, fuzzy
msgid "Inventory is full."
msgstr "Server ist voll"
@@ -1794,7 +1816,7 @@ msgstr "einladen"
msgid "Invite %s to join your guild"
msgstr "Lade %s in deine Gilde ein"
-#: ../src/gui/popupmenu.cpp:134
+#: ../src/gui/popupmenu.cpp:136
#, c-format
msgid "Invite %s to join your party"
msgstr "Lade %s in deine Party ein"
@@ -1808,8 +1830,7 @@ msgstr "Einladung gesendet."
msgid "Invited user %s to guild %s."
msgstr "Spieler %s einladen"
-#: ../src/gui/socialwindow.cpp:207
-#: ../src/net/tmwa/partyhandler.cpp:330
+#: ../src/gui/socialwindow.cpp:207 ../src/net/tmwa/partyhandler.cpp:330
#, fuzzy, c-format
msgid "Invited user %s to party."
msgstr "Spieler %s einladen"
@@ -1819,50 +1840,41 @@ msgstr "Spieler %s einladen"
msgid "Inviting failed, because you can't see a player called %s."
msgstr "Einladung fehlgeschlagen, da du den Spieler %s nicht sehen kannst."
-#: ../src/keyboardconfig.cpp:57
-#: ../src/keyboardconfig.cpp:58
-#: ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60
-#: ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62
-#: ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64
-#: ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66
-#: ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:56 ../src/keyboardconfig.cpp:57
+#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
+#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
+#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
+#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
+#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
#, c-format
msgid "Item Shortcut %d"
msgstr "Kurztaste %d"
-#: ../src/keyboardconfig.cpp:76
+#: ../src/keyboardconfig.cpp:75
msgid "Item Shortcut Window"
msgstr "Kurztastenfenster"
-#: ../src/localplayer.cpp:901
+#: ../src/localplayer.cpp:928
msgid "Item belongs to someone else."
msgstr "Gegenstand gehört jemand anderem."
-#: ../src/localplayer.cpp:897
+#: ../src/localplayer.cpp:924
msgid "Item is too far away"
msgstr "Gegenstand ist zu weit weg"
-#: ../src/localplayer.cpp:896
+#: ../src/localplayer.cpp:923
msgid "Item is too heavy."
msgstr "Gegenstand ist zu schwer."
-#: ../src/net/tmwa/gui/partytab.cpp:135
-#: ../src/net/tmwa/partyhandler.cpp:202
+#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:202
msgid "Item sharing disabled."
msgstr "Teilen von Gegenständen deaktiviert."
-#: ../src/net/tmwa/gui/partytab.cpp:132
-#: ../src/net/tmwa/partyhandler.cpp:196
+#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:196
msgid "Item sharing enabled."
msgstr "Teilen von Gegenständen aktiviert."
-#: ../src/net/tmwa/gui/partytab.cpp:138
-#: ../src/net/tmwa/partyhandler.cpp:208
+#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:208
msgid "Item sharing not possible."
msgstr "Teilen von Gegenständen nicht möglich."
@@ -1871,35 +1883,40 @@ msgstr "Teilen von Gegenständen nicht möglich."
msgid "Item sharing unknown."
msgstr "Teilen von Gegenständen aktiviert."
-#: ../src/client.cpp:785
+#: ../src/client.cpp:782
#, fuzzy
msgid "ItemDB: Error while loading "
msgstr "Fehler beim Laden von item.xml!"
-#: ../src/gui/statuswindow.cpp:159
+#: ../src/gui/statuswindow.cpp:161
msgid "Job:"
msgstr "Beruf:"
-#: ../src/gui/statuswindow.cpp:158
-#: ../src/gui/statuswindow.cpp:276
+#: ../src/gui/statuswindow.cpp:160 ../src/gui/statuswindow.cpp:278
#, c-format
msgid "Job: %d"
msgstr "Beruf: %d"
-#: ../src/net/manaserv/partyhandler.cpp:87
-msgid "Joined party."
-msgstr "Der Party beigetreten."
+#: ../src/net/manaserv/partyhandler.cpp:98
+msgid ""
+"Joining party failed, because the invitation has timed out on the server."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:102
+#, fuzzy
+msgid "Joining party failed, because the inviter has left the game."
+msgstr "Partie konte nicht erstellt werden, bitte einen kürzeren Namen wählen."
#: ../src/gui/setup_joystick.cpp:41
msgid "Joystick"
msgstr "Joystick"
-#: ../src/gui/setup_keyboard.cpp:125
+#: ../src/gui/setup_keyboard.cpp:127
#, fuzzy
msgid "Key Conflict(s) Detected."
msgstr "Tastenkonflikte entdeckt."
-#: ../src/gui/setup_keyboard.cpp:77
+#: ../src/gui/setup_keyboard.cpp:78
msgid "Keyboard"
msgstr "Tastatur"
@@ -1907,11 +1924,11 @@ msgstr "Tastatur"
msgid "Kick failed!"
msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
-#: ../src/gui/popupmenu.cpp:163
+#: ../src/gui/popupmenu.cpp:166
msgid "Kick monster"
msgstr "Monster töten"
-#: ../src/gui/popupmenu.cpp:141
+#: ../src/gui/popupmenu.cpp:144
msgid "Kick player"
msgstr "Spieler rauswerfen"
@@ -1919,7 +1936,7 @@ msgstr "Spieler rauswerfen"
msgid "Kick succeeded!"
msgstr "Spieler aus dem Kanal geworfen!"
-#: ../src/gui/setup_video.cpp:131
+#: ../src/gui/setup_interface.cpp:62
msgid "Large"
msgstr "Groß"
@@ -1937,9 +1954,8 @@ msgstr "Gilde erstellen"
msgid "Leave Party?"
msgstr "Partie verlassen?"
-#: ../src/gui/statuswindow.cpp:113
-#: ../src/gui/statuswindow.cpp:215
-#: ../src/gui/statuswindow.cpp:263
+#: ../src/gui/statuswindow.cpp:115 ../src/gui/statuswindow.cpp:217
+#: ../src/gui/statuswindow.cpp:265
#, c-format
msgid "Level: %d"
msgstr "Stufe: %d"
@@ -1963,17 +1979,16 @@ msgstr "Spieler trifft Monster"
msgid "Local Player Miss"
msgstr "Spielerliste sichern"
-#: ../src/gui/setup_video.cpp:220
+#: ../src/gui/setup_interface.cpp:108
msgid "Log NPC dialogue"
msgstr "Protokoliere NPC Gespräche"
-#: ../src/client.cpp:688
+#: ../src/client.cpp:685
#, fuzzy
msgid "Logging in"
msgstr "Anmelden"
-#: ../src/gui/login.cpp:51
-#: ../src/gui/login.cpp:63
+#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
msgid "Login"
msgstr "Anmelden"
@@ -1981,7 +1996,7 @@ msgstr "Anmelden"
msgid "Login attempt too soon after previous attempt."
msgstr "Anmeldeversuch zu früh nach vorherigem Versuch."
-#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/manaserv/beinghandler.cpp:323
#: ../src/net/tmwa/playerhandler.cpp:114
msgid "Looks like you got your head handed to you."
msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
@@ -1999,12 +2014,12 @@ msgstr "Glück %+d"
msgid "Luck:"
msgstr "Glück:"
-#: ../src/gui/skilldialog.cpp:470
+#: ../src/gui/skilldialog.cpp:472
#, fuzzy, c-format
msgid "Lvl: %d"
msgstr "Stufe: %d"
-#: ../src/gui/skilldialog.cpp:459
+#: ../src/gui/skilldialog.cpp:461
#, fuzzy, c-format
msgid "Lvl: %d (%+d)"
msgstr "Stufe: %d"
@@ -2017,12 +2032,12 @@ msgstr "M.Angriff:"
msgid "M.Defense"
msgstr "M.Verteidigung:"
-#: ../src/resources/itemdb.cpp:313
+#: ../src/resources/itemdb.cpp:324
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: ../src/gui/statuswindow.cpp:130
+#: ../src/gui/statuswindow.cpp:132
msgid "MP:"
msgstr "MP:"
@@ -2030,31 +2045,26 @@ msgstr "MP:"
msgid "MVP player."
msgstr "Spieler"
-#: ../src/gui/charcreatedialog.cpp:80
-#: ../src/gui/register.cpp:90
+#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
msgid "Male"
msgstr "Männlich"
-#: ../src/gui/minimap.cpp:45
-#: ../src/gui/minimap.cpp:86
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:87
msgid "Map"
msgstr "Karte"
-#: ../src/gui/debugwindow.cpp:66
-#: ../src/gui/debugwindow.cpp:108
+#: ../src/gui/debugwindow.cpp:103
#, c-format
msgid "Map: %s"
msgstr "Karte : %s"
-#: ../src/gui/buy.cpp:80
-#: ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:385
-#: ../src/gui/statuswindow.cpp:463
-#: ../src/gui/statuswindow.cpp:497
+#: ../src/gui/buy.cpp:81 ../src/gui/sell.cpp:79
+#: ../src/gui/statuswindow.cpp:387 ../src/gui/statuswindow.cpp:465
+#: ../src/gui/statuswindow.cpp:499
msgid "Max"
msgstr "Max"
-#: ../src/gui/setup_video.cpp:130
+#: ../src/gui/setup_interface.cpp:61
msgid "Medium"
msgstr "Mittel"
@@ -2072,8 +2082,7 @@ msgstr "Spieler einladen"
msgid "Member was promoted successfully."
msgstr "Mitglied wurde erfolgreich befördert."
-#: ../src/net/tmwa/playerhandler.cpp:253
-#: ../src/net/tmwa/playerhandler.cpp:293
+#: ../src/net/tmwa/playerhandler.cpp:253 ../src/net/tmwa/playerhandler.cpp:293
msgid "Message"
msgstr "Nachricht"
@@ -2085,12 +2094,11 @@ msgstr "Nachricht schließt Chatzeile."
msgid "Message now closes chat."
msgstr "Jetzt schließt jede Nachricht die Chatzeile."
-#: ../src/keyboardconfig.cpp:74
+#: ../src/keyboardconfig.cpp:73
msgid "Minimap Window"
msgstr "Kartenfenster"
-#: ../src/gui/debugwindow.cpp:67
-#: ../src/gui/debugwindow.cpp:106
+#: ../src/gui/debugwindow.cpp:101
#, c-format
msgid "Minimap: %s"
msgstr "Übersichtskarte: %s"
@@ -2099,9 +2107,8 @@ msgstr "Übersichtskarte: %s"
msgid "Misses"
msgstr "Verfehlt"
-#: ../src/gui/statuswindow.cpp:114
-#: ../src/gui/statuswindow.cpp:208
-#: ../src/gui/statuswindow.cpp:240
+#: ../src/gui/statuswindow.cpp:116 ../src/gui/statuswindow.cpp:210
+#: ../src/gui/statuswindow.cpp:242
#, c-format
msgid "Money: %s"
msgstr "Geld: %s"
@@ -2114,6 +2121,10 @@ msgstr "Monster trifft Spieler"
msgid "Monsters"
msgstr "Monster"
+#: ../src/gui/debugwindow.cpp:139
+msgid "Mouse path"
+msgstr ""
+
#: ../src/keyboardconfig.cpp:40
msgid "Move Down"
msgstr "Laufe Runter"
@@ -2134,14 +2145,12 @@ msgstr "Laufe Hoch"
msgid "Music volume"
msgstr "Lautstärke der Musik"
-#: ../src/gui/debugwindow.cpp:65
-#: ../src/gui/debugwindow.cpp:104
+#: ../src/gui/debugwindow.cpp:100
#, c-format
msgid "Music: %s"
msgstr "Musik: %s"
-#: ../src/gui/npcdialog.cpp:73
-#: ../src/gui/npcpostdialog.cpp:41
+#: ../src/gui/npcdialog.cpp:74 ../src/gui/npcpostdialog.cpp:41
msgid "NPC"
msgstr "NPC"
@@ -2153,8 +2162,7 @@ msgstr "NPCs"
msgid "Name"
msgstr "Name"
-#: ../src/gui/charcreatedialog.cpp:67
-#: ../src/gui/login.cpp:54
+#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
#: ../src/gui/register.cpp:67
msgid "Name:"
msgstr "Name:"
@@ -2164,7 +2172,7 @@ msgstr "Name:"
msgid "Name: %s"
msgstr "Name : %s"
-#: ../src/gui/ministatus.cpp:236
+#: ../src/gui/ministatus.cpp:234
msgid "Need"
msgstr "Muss"
@@ -2176,7 +2184,7 @@ msgstr "Gib einen Spieler an, der aus dem Kanal geworfen werden soll"
msgid "Need a user to op!"
msgstr "Gib einen Spieler an, der Moderator werden soll!"
-#: ../src/game.cpp:386
+#: ../src/game.cpp:374
msgid "Network Error"
msgstr "Netzwerkfehler"
@@ -2196,11 +2204,11 @@ msgstr "Neues Passwort fehlerhaft"
msgid "New password too short."
msgstr "Das neue Passwort ist zu kurz"
-#: ../src/gui/npcdialog.cpp:49
+#: ../src/gui/npcdialog.cpp:50
msgid "Next"
msgstr "Weiter"
-#: ../src/keyboardconfig.cpp:100
+#: ../src/keyboardconfig.cpp:99
msgid "Next Chat Tab"
msgstr "Nächster Tab"
@@ -2224,22 +2232,29 @@ msgstr "Kein Server verfügbar"
msgid "No servers available."
msgstr "Keine Server verfügbar"
-#: ../src/gui/setup_video.cpp:157
+#: ../src/gui/setup_interface.cpp:88
msgid "No text"
msgstr "Kein Text"
-#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/manaserv/beinghandler.cpp:315
#: ../src/net/tmwa/playerhandler.cpp:102
-msgid "No, kids. Your character did not really die. It... err... went to a better place."
-msgstr "Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem besserem Ort gegangen."
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
+"besserem Ort gegangen."
-#: ../src/gui/setup_video.cpp:271
-#: ../src/gui/setup_video.cpp:526
-#: ../src/gui/setup_video.cpp:656
+#: ../src/gui/setup_video.cpp:200 ../src/gui/setup_video.cpp:407
+#: ../src/gui/setup_video.cpp:487
#, fuzzy
msgid "None"
msgstr "Nein"
+#: ../src/gui/debugwindow.cpp:142
+msgid "Normal"
+msgstr ""
+
#: ../src/gui/recorder.cpp:91
msgid "Not currently recording."
msgstr "Es läuft keine Aufzeichnung."
@@ -2258,12 +2273,9 @@ msgstr "Du hast nichts zu verkaufen."
msgid "Notice"
msgstr "Kein Text"
-#: ../src/gui/itemamount.cpp:113
-#: ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46
-#: ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:72
-#: ../src/gui/trade.cpp:74
+#: ../src/gui/itemamount.cpp:113 ../src/gui/okdialog.cpp:42
+#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
+#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:74
msgid "OK"
msgstr "Ok"
@@ -2276,19 +2288,20 @@ msgstr "Alte E-Mailadresse ist fehlerhaft"
msgid "Old password incorrect."
msgstr "Altes Passwort fehlerhaft"
-#: ../src/net/tmwa/gamehandler.cpp:89
+#: ../src/net/tmwa/gamehandler.cpp:83
#, c-format
msgid "Online users: %d"
msgstr "Benutzer online: %d"
-#: ../src/gui/setup_video.cpp:212
+#: ../src/gui/setup_video.cpp:166
msgid "OpenGL"
msgstr "OpenGL"
#: ../src/commandhandler.h:31
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
+msgstr ""
+"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
#: ../src/main.cpp:47
msgid "Options:"
@@ -2303,32 +2316,31 @@ msgstr "Spieler trifft Monster"
msgid "Other Players' Names"
msgstr "Namen anderer Spieler"
-#: ../src/gui/outfitwindow.cpp:68
-#: ../src/gui/outfitwindow.cpp:141
+#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
#: ../src/gui/outfitwindow.cpp:154
#, c-format
msgid "Outfit: %d"
msgstr "Ausrüstung: %d"
-#: ../src/gui/inventorywindow.cpp:109
-#: ../src/gui/outfitwindow.cpp:51
+#: ../src/gui/inventorywindow.cpp:110 ../src/gui/outfitwindow.cpp:51
msgid "Outfits"
msgstr "Ausrüstung"
-#: ../src/keyboardconfig.cpp:81
+#: ../src/keyboardconfig.cpp:80
#, fuzzy
msgid "Outfits Window"
msgstr "Statusfenster"
-#: ../src/gui/setup_video.cpp:252
-msgid "Overhead text"
+#: ../src/gui/setup_interface.cpp:128
+#, fuzzy
+msgid "Overhead text:"
msgstr "Chat über Spielern"
#: ../src/resources/userpalette.cpp:93
msgid "Own Name"
msgstr "Eigener Name"
-#: ../src/gui/setup_video.cpp:606
+#: ../src/gui/setup_video.cpp:465
#, fuzzy
msgid "Particle Effect Settings Changed."
msgstr "Partikeleffekteinstellungen geändert."
@@ -2337,23 +2349,17 @@ msgstr "Partikeleffekteinstellungen geändert."
msgid "Particle Effects"
msgstr "Partikeleffekte"
-#: ../src/gui/debugwindow.cpp:69
-#: ../src/gui/debugwindow.cpp:111
+#: ../src/gui/debugwindow.cpp:107
#, c-format
msgid "Particle count: %d"
msgstr "Partikelzählung: %d"
-#: ../src/gui/setup_video.cpp:255
+#: ../src/gui/setup_video.cpp:192
#, fuzzy
-msgid "Particle detail"
+msgid "Particle detail:"
msgstr "Partikeldetail"
-#: ../src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Partikeldetails: %s"
-
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:169
msgid "Particle effects"
msgstr "Partikeleffekte"
@@ -2376,8 +2382,19 @@ msgstr "Party"
msgid "Party Name"
msgstr "Party"
-#: ../src/commandhandler.cpp:448
-#: ../src/net/tmwa/gui/partytab.cpp:109
+#: ../src/net/manaserv/partyhandler.cpp:152
+msgid ""
+"Party invitation rejected by server, because of too many invitations in a "
+"short time."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:75
+#, c-format
+msgid ""
+"Party invite failed, because no player called %s is within the visual range."
+msgstr ""
+
+#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
msgid "Party name is missing."
msgstr "Name der Party fehlt."
@@ -2390,18 +2407,16 @@ msgstr "Party erfolgreich erstellt."
msgid "Party: %s"
msgstr "Party (%s)"
-#: ../src/client.cpp:916
+#: ../src/client.cpp:913
msgid "Password Change"
msgstr "Passwort ändern:"
-#: ../src/client.cpp:917
+#: ../src/client.cpp:914
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
-#: ../src/gui/changepassworddialog.cpp:61
-#: ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68
-#: ../src/gui/unregisterdialog.cpp:53
+#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
+#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
msgid "Password:"
msgstr "Passwort:"
@@ -2409,7 +2424,7 @@ msgstr "Passwort:"
msgid "Passwords do not match."
msgstr "Passwörter stimmen nicht überein."
-#: ../src/gui/popupmenu.cpp:188
+#: ../src/gui/popupmenu.cpp:191
#, c-format
msgid "Pick up %s"
msgstr "Hebe %s auf"
@@ -2433,12 +2448,14 @@ msgstr "Spieler wird bereits ignoriert!"
#: ../src/commandhandler.cpp:553
#, fuzzy
msgid "Player could not be ignored!"
-msgstr "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+msgstr ""
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
#: ../src/commandhandler.cpp:575
#, fuzzy
msgid "Player could not be unignored!"
-msgstr "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+msgstr ""
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
#: ../src/net/manaserv/charhandler.cpp:210
msgid "Player deleted."
@@ -2466,8 +2483,7 @@ msgstr "Spieler"
msgid "Players in this channel:"
msgstr "Spieler im Kanal:"
-#: ../src/gui/charcreatedialog.cpp:99
-#: ../src/gui/charcreatedialog.cpp:257
+#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:257
#, c-format
msgid "Please distribute %d points"
msgstr "Bitte verteile %d Punkte"
@@ -2477,8 +2493,7 @@ msgstr "Bitte verteile %d Punkte"
msgid "Please remove %d points"
msgstr "Bitte entferne %d Punkte"
-#: ../src/commandhandler.cpp:461
-#: ../src/commandhandler.cpp:538
+#: ../src/commandhandler.cpp:461 ../src/commandhandler.cpp:538
#: ../src/commandhandler.cpp:560
msgid "Please specify a name."
msgstr "Bitte gib einen Namen an."
@@ -2504,23 +2519,20 @@ msgstr "Download wird vorbereitet"
msgid "Present: %s; %d players are present."
msgstr "Anwesend: %s ;%d Spieler sind anwesend."
-#: ../src/net/manaserv/beinghandler.cpp:303
+#: ../src/net/manaserv/beinghandler.cpp:329
msgid "Press OK to respawn."
msgstr "Drücke \"OK\" um neu anzufangen."
-#: ../src/gui/setup_joystick.cpp:37
-#: ../src/gui/setup_joystick.cpp:78
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Knopf drücken, um die Kalibrierung zu starten"
-#: ../src/keyboardconfig.cpp:99
+#: ../src/keyboardconfig.cpp:98
msgid "Previous Chat Tab"
msgstr "Voriger Tab"
-#: ../src/gui/buy.cpp:69
-#: ../src/gui/buy.cpp:267
-#: ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:288
+#: ../src/gui/buy.cpp:70 ../src/gui/buy.cpp:277 ../src/gui/sell.cpp:72
+#: ../src/gui/sell.cpp:298
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preis: %s / Gesamt: %s"
@@ -2533,8 +2545,7 @@ msgstr "Drucke '..'"
msgid "Propose trade"
msgstr "Handel vorschlagen"
-#: ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:86
+#: ../src/gui/setup_colors.cpp:85 ../src/gui/setup_colors.cpp:86
#: ../src/gui/setup_colors.cpp:332
msgid "Pulse"
msgstr "Pulsierend"
@@ -2543,18 +2554,14 @@ msgstr "Pulsierend"
msgid "Put all whispers in tabs"
msgstr "Alle privaten Nachrichten in Tabs öffnen"
-#: ../src/gui/buy.cpp:79
-#: ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77
-#: ../src/gui/serverdialog.cpp:228
-#: ../src/keyboardconfig.cpp:102
+#: ../src/gui/buy.cpp:80 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
+#: ../src/gui/sell.cpp:78 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:101
msgid "Quit"
msgstr "Beenden"
-#: ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:88
+#: ../src/gui/setup_colors.cpp:87 ../src/gui/setup_colors.cpp:88
#: ../src/gui/setup_colors.cpp:333
msgid "Rainbow"
msgstr "Regenbogen"
@@ -2576,8 +2583,7 @@ msgstr "Aufzeichnung läuft..."
msgid "Red:"
msgstr "Rot: "
-#: ../src/gui/login.cpp:61
-#: ../src/gui/register.cpp:58
+#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
#: ../src/gui/register.cpp:73
msgid "Register"
msgstr "Registrieren"
@@ -2614,17 +2620,17 @@ msgstr "Benutzername merken"
msgid "Request for Trade"
msgstr "Erbitte einen Handel"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
#, fuzzy
msgid "Request to quit denied!"
msgstr "Erbitte einen Handel"
-#: ../src/client.cpp:809
+#: ../src/client.cpp:806
#, fuzzy
msgid "Requesting characters"
msgstr "Spielfigur auswählen"
-#: ../src/client.cpp:889
+#: ../src/client.cpp:886
msgid "Requesting registration details"
msgstr "Fordere Registrierungsdetails an"
@@ -2633,25 +2639,23 @@ msgstr "Fordere Registrierungsdetails an"
msgid "Requesting to join channel %s."
msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
-#: ../src/gui/npcdialog.cpp:134
+#: ../src/gui/npcdialog.cpp:135
msgid "Reset"
msgstr "Zurücksetzten"
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Reset Windows"
msgstr "Fenster zurücksetzen"
-#: ../src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:335
msgid "Restart needed for changes to take effect."
msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
-#: ../src/gui/setup_video.cpp:571
-#: ../src/gui/setup_video.cpp:576
+#: ../src/gui/setup_video.cpp:442 ../src/gui/setup_video.cpp:447
msgid "Restart your client for the change to take effect."
msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
-#: ../src/gui/inventorywindow.cpp:132
-#: ../src/gui/popupmenu.cpp:385
+#: ../src/gui/inventorywindow.cpp:133 ../src/gui/popupmenu.cpp:388
msgid "Retrieve"
msgstr "Abholen"
@@ -2667,17 +2671,16 @@ msgstr "Enter-Taste schließt Chatzeile."
msgid "Rotate the stick"
msgstr "Kreise den Steuerknüppel"
-#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/manaserv/beinghandler.cpp:321
#: ../src/net/tmwa/playerhandler.cpp:110
msgid "Sadly, no trace of you was ever found..."
msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
-#: ../src/game.cpp:354
+#: ../src/game.cpp:342
msgid "Saving screenshot failed!"
msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
-#: ../src/gui/setup_video.cpp:570
-#: ../src/gui/setup_video.cpp:575
+#: ../src/gui/setup_video.cpp:441 ../src/gui/setup_video.cpp:446
#, fuzzy
msgid "Screen Resolution Changed"
msgstr "Auflösung geändert"
@@ -2686,20 +2689,20 @@ msgstr "Auflösung geändert"
msgid "Screenshot"
msgstr "Bildschirmfoto"
-#: ../src/game.cpp:349
+#: ../src/game.cpp:337
#, fuzzy
msgid "Screenshot saved as "
msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
-#: ../src/keyboardconfig.cpp:98
+#: ../src/keyboardconfig.cpp:97
msgid "Scroll Chat Down"
msgstr "Im Chat runter scrollen"
-#: ../src/keyboardconfig.cpp:97
+#: ../src/keyboardconfig.cpp:96
msgid "Scroll Chat Up"
msgstr "Im Chat hochscrollen"
-#: ../src/gui/inventorywindow.cpp:87
+#: ../src/gui/inventorywindow.cpp:88
msgid "Search:"
msgstr "Suchen:"
@@ -2707,7 +2710,7 @@ msgstr "Suchen:"
msgid "Seems you need more money... ;-)"
msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
-#: ../src/keyboardconfig.cpp:101
+#: ../src/keyboardconfig.cpp:100
msgid "Select OK"
msgstr "OK auswählen"
@@ -2741,9 +2744,7 @@ msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
msgid "Selection out of range."
msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
-#: ../src/gui/buysell.cpp:47
-#: ../src/gui/sell.cpp:49
-#: ../src/gui/sell.cpp:76
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:50 ../src/gui/sell.cpp:77
msgid "Sell"
msgstr "Verkaufen"
@@ -2764,18 +2765,15 @@ msgstr "Server Protokoll nicht unterstützt."
msgid "Server type:"
msgstr "Server:"
-#: ../src/gui/serverdialog.cpp:206
-#: ../src/gui/widgets/chattab.cpp:142
+#: ../src/gui/serverdialog.cpp:206 ../src/gui/widgets/chattab.cpp:142
msgid "Server:"
msgstr "Server:"
-#: ../src/client.cpp:580
-#: ../src/gui/setup.cpp:43
-#: ../src/gui/windowmenu.cpp:66
+#: ../src/client.cpp:577 ../src/gui/setup.cpp:44 ../src/gui/windowmenu.cpp:66
msgid "Setup"
msgstr "Einstellungen"
-#: ../src/keyboardconfig.cpp:77
+#: ../src/keyboardconfig.cpp:76
msgid "Setup Window"
msgstr "Einstellungen"
@@ -2791,17 +2789,15 @@ msgstr "Geschäft"
msgid "Shortcut"
msgstr "Tastenkürzel"
-#: ../src/commandhandler.cpp:505
-#: ../src/commandhandler.cpp:514
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:514
msgid "Show IP: Off"
msgstr "IP Anzeige: Aus"
-#: ../src/commandhandler.cpp:505
-#: ../src/commandhandler.cpp:518
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:518
msgid "Show IP: On"
msgstr "IP Anzeige: An"
-#: ../src/gui/setup_video.cpp:246
+#: ../src/gui/setup_interface.cpp:125
#, fuzzy
msgid "Show damage"
msgstr "Eigener Name"
@@ -2811,15 +2807,21 @@ msgstr "Eigener Name"
msgid "Show gender"
msgstr "Geschlecht"
-#: ../src/gui/setup_video.cpp:219
+#: ../src/gui/setup_interface.cpp:107
#, fuzzy
msgid "Show own name"
msgstr "Eigener Name"
-#: ../src/gui/setup_video.cpp:221
-msgid "Show pickup notification"
+#: ../src/gui/setup_interface.cpp:109
+#, fuzzy
+msgid "Show pickup notification:"
msgstr "Benachrichtigung beim Aufheben"
+#: ../src/gui/debugwindow.cpp:133
+#, fuzzy
+msgid "Show:"
+msgstr "Zeigen"
+
#: ../src/keyboardconfig.cpp:53
msgid "Sit"
msgstr "Sitzen"
@@ -2828,35 +2830,34 @@ msgstr "Sitzen"
msgid "Sit failed!"
msgstr "Sitzen fehlgeschlagen!"
-#: ../src/gui/skilldialog.cpp:377
+#: ../src/gui/skilldialog.cpp:379
#, fuzzy, c-format
msgid "Skill %d"
msgstr "Fertigkeiten"
-#: ../src/gui/skilldialog.cpp:368
+#: ../src/gui/skilldialog.cpp:370
#, fuzzy, c-format
msgid "Skill Set %d"
msgstr "Fähigkeitspunkte: %d"
-#: ../src/keyboardconfig.cpp:73
+#: ../src/keyboardconfig.cpp:72
msgid "Skill Window"
msgstr "Fertigkeitenfenster"
-#: ../src/gui/skilldialog.cpp:273
+#: ../src/gui/skilldialog.cpp:275
#, fuzzy, c-format
msgid "Skill points available: %d"
msgstr "Fähigkeitspunkte: %d"
-#: ../src/gui/skilldialog.cpp:215
-#: ../src/gui/windowmenu.cpp:59
+#: ../src/gui/skilldialog.cpp:215 ../src/gui/windowmenu.cpp:59
msgid "Skills"
msgstr "Fertigkeiten"
-#: ../src/gui/inventorywindow.cpp:86
+#: ../src/gui/inventorywindow.cpp:87
msgid "Slots:"
msgstr "Plätze:"
-#: ../src/gui/setup_video.cpp:129
+#: ../src/gui/setup_interface.cpp:60
msgid "Small"
msgstr "Klein"
@@ -2864,20 +2865,21 @@ msgstr "Klein"
msgid "Smilie"
msgstr "Grinsen"
-#: ../src/gui/socialwindow.cpp:312
-#: ../src/gui/windowmenu.cpp:64
+#: ../src/gui/socialwindow.cpp:312 ../src/gui/windowmenu.cpp:64
#, fuzzy
msgid "Social"
msgstr "Special"
-#: ../src/keyboardconfig.cpp:79
+#: ../src/keyboardconfig.cpp:78
#, fuzzy
msgid "Social Window"
msgstr "Fertigkeitenfenster"
-#: ../src/gui/setup_video.cpp:573
+#: ../src/gui/setup_video.cpp:444
msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Einige Fenster können verschoben werden um sich an die geänderte Auflösung anzupassen."
+msgstr ""
+"Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
+"anzupassen."
#: ../src/net/tmwa/generalhandler.cpp:139
msgid "Someone else is trying to use this account."
@@ -2891,13 +2893,31 @@ msgstr "Ton"
msgid "Sound Engine"
msgstr "Soundengine"
-#: ../src/gui/specialswindow.cpp:79
-#: ../src/gui/windowmenu.cpp:62
+#: ../src/gui/debugwindow.cpp:143
+#, fuzzy
+msgid "Special 1"
+msgstr "Spezial %d"
+
+#: ../src/gui/debugwindow.cpp:144
+#, fuzzy
+msgid "Special 2"
+msgstr "Spezial %d"
+
+#: ../src/gui/debugwindow.cpp:145
+#, fuzzy
+msgid "Special 3"
+msgstr "Spezial %d"
+
+#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
msgid "Specials"
msgstr "Special"
-#: ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:90
+#: ../src/gui/debugwindow.cpp:141
+#, fuzzy
+msgid "Specials:"
+msgstr "Special"
+
+#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
#: ../src/gui/setup_colors.cpp:333
msgid "Spectrum"
msgstr "Spektrum"
@@ -2906,12 +2926,11 @@ msgstr "Spektrum"
msgid "Speed hack detected."
msgstr "Geschwindigkeitsproblem festgestellt"
-#: ../src/gui/inventorywindow.cpp:108
-#: ../src/gui/popupmenu.cpp:378
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/popupmenu.cpp:381
msgid "Split"
msgstr "Aufteilen"
-#: ../src/localplayer.cpp:899
+#: ../src/localplayer.cpp:926
msgid "Stack is too big."
msgstr "Stapel ist zu groß."
@@ -2919,8 +2938,7 @@ msgstr "Stapel ist zu groß."
msgid "Starting to record..."
msgstr "Starte Aufzeichnung..."
-#: ../src/gui/setup_colors.cpp:83
-#: ../src/gui/setup_colors.cpp:331
+#: ../src/gui/setup_colors.cpp:83 ../src/gui/setup_colors.cpp:331
msgid "Static"
msgstr "Statisch"
@@ -2928,7 +2946,7 @@ msgstr "Statisch"
msgid "Status"
msgstr "Status"
-#: ../src/keyboardconfig.cpp:70
+#: ../src/keyboardconfig.cpp:69
msgid "Status Window"
msgstr "Statusfenster"
@@ -2944,12 +2962,11 @@ msgstr "Angriff abbrechen"
msgid "Stop recording"
msgstr "Stoppe Aufzeichnung"
-#: ../src/gui/inventorywindow.cpp:59
+#: ../src/gui/inventorywindow.cpp:60
msgid "Storage"
msgstr "Lager"
-#: ../src/gui/inventorywindow.cpp:131
-#: ../src/gui/popupmenu.cpp:358
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:361
msgid "Store"
msgstr "Einlagern"
@@ -2972,7 +2989,7 @@ msgstr "Stärke %+d"
msgid "Strength:"
msgstr "Stärke:"
-#: ../src/gui/npcdialog.cpp:51
+#: ../src/gui/npcdialog.cpp:52
msgid "Submit"
msgstr "Absenden"
@@ -2988,7 +3005,12 @@ msgstr "Spielfigur wechseln"
msgid "Switch server"
msgstr "Server wechseln"
-#: ../src/gui/setup_video.cpp:437
+#: ../src/gui/debugwindow.cpp:239
+#, fuzzy
+msgid "Switches"
+msgstr "Server wechseln"
+
+#: ../src/gui/setup_video.cpp:334
#, fuzzy
msgid "Switching to Full Screen"
msgstr "Wechsle zum Vollbildmodus"
@@ -2997,7 +3019,7 @@ msgstr "Wechsle zum Vollbildmodus"
msgid "Talk"
msgstr "Sprechen"
-#: ../src/gui/popupmenu.cpp:150
+#: ../src/gui/popupmenu.cpp:153
#, c-format
msgid "Talk to %s"
msgstr "Rede mit %s"
@@ -3019,7 +3041,7 @@ msgstr "NPC anvisieren"
msgid "Target Player"
msgstr "Spieler anvisieren"
-#: ../src/gui/setup_video.cpp:158
+#: ../src/gui/setup_interface.cpp:89
msgid "Text"
msgstr "Text"
@@ -3031,15 +3053,16 @@ msgstr "Vielen Dank für den Einkauf."
msgid "Thanks for selling."
msgstr "Vielen Dank für den Verkauf."
-#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/manaserv/beinghandler.cpp:313
#: ../src/net/tmwa/playerhandler.cpp:99
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Die kalten Hände des Sensenmanns greifen nach Deiner Seele."
-#: ../src/game.cpp:385
+#: ../src/game.cpp:373
#, fuzzy
msgid "The connection to the server was lost."
-msgstr "Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
+msgstr ""
+"Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
#: ../src/gui/changeemaildialog.cpp:141
msgid "The email address entries mismatch."
@@ -3073,14 +3096,12 @@ msgstr "Das neue Passwort muss aus mindestens %d Zeichen bestehen."
msgid "The new password needs to be less than %d characters long."
msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
-#: ../src/gui/register.cpp:182
-#: ../src/gui/unregisterdialog.cpp:117
+#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Das Passwort muss aus mindestens %d Zeichen bestehen."
-#: ../src/gui/register.cpp:190
-#: ../src/gui/unregisterdialog.cpp:124
+#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Das Passwort muss kürzer als %d Zeichen sein."
@@ -3114,7 +3135,9 @@ msgstr "Dieser Befehl ändert das Teilen der Erfahrungspunkte in einer Party."
#: ../src/net/tmwa/gui/partytab.cpp:86
msgid "This command changes the party's item sharing policy."
-msgstr "Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in einer Party."
+msgstr ""
+"Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in einer "
+"Party."
#: ../src/commandhandler.cpp:274
#, fuzzy
@@ -3152,11 +3175,15 @@ msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
#: ../src/net/tmwa/gui/partytab.cpp:101
msgid "This command displays the party's current experience sharing policy."
-msgstr "Dieser Befehl zeigt an, ob das Teilen von Erfahrungspunkten in der Party aktiviert ist."
+msgstr ""
+"Dieser Befehl zeigt an, ob das Teilen von Erfahrungspunkten in der Party "
+"aktiviert ist."
#: ../src/net/tmwa/gui/partytab.cpp:91
msgid "This command displays the party's current item sharing policy."
-msgstr "Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder nicht."
+msgstr ""
+"Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder "
+"nicht."
#: ../src/commandhandler.cpp:312
msgid "This command displays the return toggle status."
@@ -3167,8 +3194,13 @@ msgid "This command finishes a recording session."
msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
#: ../src/commandhandler.cpp:291
-msgid "This command gets a list of players within hearing and sends it to either the record log if recording, or the chat log otherwise."
-msgstr "Dieser Befehl erstellt eine Liste mit allen Spielern in Hörreichweite und sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im Chatfenster an."
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+"Dieser Befehl erstellt eine Liste mit allen Spielern in Hörreichweite und "
+"sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
+"Chatfenster an."
#: ../src/commandhandler.cpp:233
msgid "This command ignores the given player regardless of current relations."
@@ -3179,8 +3211,7 @@ msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
msgid "This command ignores the other player regardless of current relations."
msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
-#: ../src/commandhandler.cpp:284
-#: ../src/net/tmwa/gui/partytab.cpp:74
+#: ../src/commandhandler.cpp:284 ../src/net/tmwa/gui/partytab.cpp:74
msgid "This command invites <nick> to party with you."
msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
@@ -3207,7 +3238,9 @@ msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
#: ../src/commandhandler.cpp:222
msgid "This command sends the message <msg> to all players currently online."
-msgstr "Dieser Befehl versendet die Nachricht <Nachricht> an alle Spieler die gerade online sind."
+msgstr ""
+"Dieser Befehl versendet die Nachricht <Nachricht> an alle Spieler die gerade "
+"online sind."
#: ../src/commandhandler.cpp:257
msgid "This command sends the text <message> to <nick>."
@@ -3218,8 +3251,13 @@ msgid "This command sets the topic to <message>."
msgstr "Dieser Befehl setzt das Theme auf <Thema>."
#: ../src/commandhandler.cpp:306
-msgid "This command sets whether the return key should toggle the chat log, or whether the chat log turns off automatically."
-msgstr "Mit diesem Befehl kannst Du entscheiden, ob die Chatzeile schließt, sobald eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut gedrückt wurde."
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+"Mit diesem Befehl kannst Du entscheiden, ob die Chatzeile schließt, sobald "
+"eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut "
+"gedrückt wurde."
#: ../src/commandhandler.cpp:245
msgid "This command shows a list of all channels."
@@ -3231,16 +3269,21 @@ msgstr "Dieser Befehl zeigt eine Liste der Spieler im aktuellen Kanal."
#: ../src/commandhandler.cpp:298
msgid "This command starts recording the chat log to the file <filename>."
-msgstr "Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei <Dateiname>."
+msgstr ""
+"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
+"<Dateiname>."
#: ../src/commandhandler.cpp:317
msgid "This command stops ignoring the given player if they are being ignored"
-msgstr "Dieser Befehl hebt die Ignorierung des angegeben ignorierten Spieler auf."
+msgstr ""
+"Dieser Befehl hebt die Ignorierung des angegeben ignorierten Spieler auf."
#: ../src/gui/widgets/whispertab.cpp:96
#, fuzzy
msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei <Dateiname>."
+msgstr ""
+"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
+"<Dateiname>."
#: ../src/commandhandler.cpp:250
msgid "This command tell others you are (doing) <msg>."
@@ -3252,22 +3295,28 @@ msgstr "Dieser Befehl teilt deine Abwesenheit und deren angegebenen Grund mit."
#: ../src/commandhandler.cpp:265
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr "Dieser Befehl erstellt einen neuen Tab für private Nachrichten zwischen Dir und Spieler <Name>."
+msgstr ""
+"Dieser Befehl erstellt einen neuen Tab für private Nachrichten zwischen Dir "
+"und Spieler <Name>."
#: ../src/gui/setup_colors.cpp:46
msgid "This is what the color looks like"
msgstr "So wird die Farbe aussehen"
-#: ../src/client.cpp:783
+#: ../src/client.cpp:780
#, fuzzy
-msgid "This server is missing needed world data. Please contact the administrator(s)."
-msgstr "Client Registrierung wurde deaktiviert. Bitte den Serveradministrator kontaktieren."
+msgid ""
+"This server is missing needed world data. Please contact the administrator"
+"(s)."
+msgstr ""
+"Client Registrierung wurde deaktiviert. Bitte den Serveradministrator "
+"kontaktieren."
#: ../src/net/tmwa/loginhandler.cpp:185
msgid "This user name is already taken."
msgstr "Dieser Spielername ist bereits vergeben"
-#: ../src/gui/setup_video.cpp:128
+#: ../src/gui/setup_interface.cpp:59
msgid "Tiny"
msgstr "Winzig"
@@ -3275,7 +3324,7 @@ msgstr "Winzig"
msgid "To:"
msgstr "Nach:"
-#: ../src/keyboardconfig.cpp:96
+#: ../src/keyboardconfig.cpp:95
msgid "Toggle Chat"
msgstr "Chat ein/aus"
@@ -3286,8 +3335,7 @@ msgstr "Chat ein/aus"
msgid "Topic: %s"
msgstr "Thema: %s"
-#: ../src/gui/trade.cpp:73
-#: ../src/gui/trade.cpp:74
+#: ../src/gui/trade.cpp:73 ../src/gui/trade.cpp:74
msgid "Trade"
msgstr "Handeln"
@@ -3341,16 +3389,16 @@ msgstr "Handel nicht möglich. Handelspartner ist zu weit weg."
msgid "Trading with %s"
msgstr "Handele mit %s"
-#: ../src/gui/setup_video.cpp:469
+#: ../src/gui/setup_video.cpp:366
#, fuzzy
msgid "Transparency disabled"
msgstr "Teilen der Erfahrungspunkte deaktiviert."
-#: ../src/gui/setup_video.cpp:477
+#: ../src/gui/setup_video.cpp:374
msgid "Transparency enabled"
msgstr "Transparenz aktiviert."
-#: ../src/localplayer.cpp:895
+#: ../src/localplayer.cpp:922
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Kann Gegenstand nicht aufheben."
@@ -3375,7 +3423,7 @@ msgstr "Typ: "
msgid "Unable to buy."
msgstr "Kauf fehlgeschlagen."
-#: ../src/net/tmwa/inventoryhandler.cpp:401
+#: ../src/net/tmwa/inventoryhandler.cpp:400
msgid "Unable to equip."
msgstr "Kann Gegenstand nicht ausrüsten."
@@ -3387,19 +3435,17 @@ msgstr "Nicht möglich den host \" aufzulösen"
msgid "Unable to sell."
msgstr "Verkauf fehlgeschlagen."
-#: ../src/net/tmwa/inventoryhandler.cpp:413
+#: ../src/net/tmwa/inventoryhandler.cpp:412
msgid "Unable to unequip."
msgstr "Kann Gegenstand nicht ablegen."
-#: ../src/gui/setup_keyboard.cpp:90
+#: ../src/gui/setup_keyboard.cpp:92
#, fuzzy
msgid "Unassign"
msgstr "Zuordnen"
-#: ../src/gui/equipmentwindow.cpp:88
-#: ../src/gui/inventorywindow.cpp:94
-#: ../src/gui/inventorywindow.cpp:352
-#: ../src/gui/popupmenu.cpp:364
+#: ../src/gui/equipmentwindow.cpp:73 ../src/gui/inventorywindow.cpp:95
+#: ../src/gui/inventorywindow.cpp:360 ../src/gui/popupmenu.cpp:367
msgid "Unequip"
msgstr "Ablegen"
@@ -3416,8 +3462,7 @@ msgstr ""
msgid "Unhandled trade cancel packet."
msgstr "Übergangenes Handelsabbruchspaket."
-#: ../src/gui/popupmenu.cpp:114
-#: ../src/gui/popupmenu.cpp:123
+#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
#, c-format
msgid "Unignore %s"
msgstr "Ignoriere %s nicht mehr"
@@ -3437,8 +3482,7 @@ msgstr "Unbekannter Befehl."
msgid "Unknown char-server failure."
msgstr "Unbekannter Fehler"
-#: ../src/commandhandler.cpp:136
-#: ../src/commandhandler.cpp:333
+#: ../src/commandhandler.cpp:136 ../src/commandhandler.cpp:333
msgid "Unknown command."
msgstr "Unbekannter Befehl."
@@ -3457,8 +3501,7 @@ msgstr "Unbekannter Fehler"
#: ../src/net/manaserv/loginhandler.cpp:161
#: ../src/net/manaserv/loginhandler.cpp:279
#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95
-#: ../src/net/tmwa/loginhandler.cpp:191
+#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:191
msgid "Unknown error."
msgstr "Unbekannter Fehler"
@@ -3472,23 +3515,21 @@ msgstr "Unbekannte Reaktion auf die Einladung von %s."
msgid "Unknown invite response for %s."
msgstr "Unbekannte Reaktion auf die Einladung von %s."
-#: ../src/resources/itemdb.cpp:324
-#: ../src/resources/itemdb.cpp:425
+#: ../src/resources/itemdb.cpp:69
msgid "Unknown item"
msgstr "Unbekannter Gegenstand"
-#: ../src/localplayer.cpp:902
+#: ../src/localplayer.cpp:929
#, fuzzy
msgid "Unknown problem picking up item."
msgstr "Kann Gegenstand nicht aufheben."
-#: ../src/gui/charselectdialog.cpp:145
-#: ../src/gui/unregisterdialog.cpp:47
+#: ../src/gui/charselectdialog.cpp:145 ../src/gui/unregisterdialog.cpp:47
#: ../src/gui/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "Abmelden"
-#: ../src/client.cpp:955
+#: ../src/client.cpp:952
#, fuzzy
msgid "Unregister Successful"
msgstr "Abmelden"
@@ -3497,7 +3538,7 @@ msgstr "Abmelden"
msgid "Unregistered ID."
msgstr "Unbekannte ID"
-#: ../src/gui/skilldialog.cpp:228
+#: ../src/gui/skilldialog.cpp:230
msgid "Up"
msgstr "Erhöhen"
@@ -3505,7 +3546,7 @@ msgstr "Erhöhen"
msgid "Updating..."
msgstr "Aktualisiere..."
-#: ../src/gui/inventorywindow.cpp:93
+#: ../src/gui/inventorywindow.cpp:94
msgid "Use"
msgstr "Benutzen"
@@ -3528,11 +3569,11 @@ msgstr "Benutzername bereits vorhanden"
msgid "Username permanently erased."
msgstr "Benutzername bereits vorhanden"
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Video"
-#: ../src/gui/setup_video.cpp:215
+#: ../src/gui/setup_interface.cpp:105
msgid "Visible names"
msgstr "Sichtbare Namen"
@@ -3555,7 +3596,7 @@ msgstr "Gesundheit %+d"
msgid "Vitality:"
msgstr "Vitalität:"
-#: ../src/gui/npcdialog.cpp:48
+#: ../src/gui/npcdialog.cpp:49
msgid "Waiting for server"
msgstr "Warte auf den Server"
@@ -3567,16 +3608,17 @@ msgstr "Warte auf den Server"
msgid "Warp failed..."
msgstr "Warp fehlgeschlagen..."
-#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/manaserv/beinghandler.cpp:310
#: ../src/net/tmwa/playerhandler.cpp:96
msgid "We regret to inform you that your character was killed in battle."
-msgstr "Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
+msgstr ""
+"Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
-#: ../src/keyboardconfig.cpp:82
+#: ../src/keyboardconfig.cpp:81
msgid "Wear Outfit"
msgstr "Ausrüstung anziehen"
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:112
msgid "Weight:"
msgstr "Gewicht:"
@@ -3602,7 +3644,8 @@ msgstr "Nachricht konnte nicht gesendet werden, Spieler ist offline."
#: ../src/net/tmwa/chathandler.cpp:96
#, fuzzy, c-format
msgid "Whisper could not be sent, ignored by %s."
-msgstr "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+msgstr ""
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
#: ../src/gui/chat.cpp:494
#, c-format
@@ -3648,7 +3691,7 @@ msgstr "Benutzername, Passwort oder E-Mailadresse falsch"
msgid "Yes"
msgstr "Ja"
-#: ../src/net/manaserv/beinghandler.cpp:304
+#: ../src/net/manaserv/beinghandler.cpp:330
msgid "You Died"
msgstr "Du bist tot."
@@ -3657,10 +3700,13 @@ msgid "You are an ex-player."
msgstr "Du warst einmal ein Spieler."
#: ../src/net/tmwa/playerhandler.cpp:254
-msgid "You are carrying more than half your weight. You are unable to regain health."
-msgstr "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr heilen."
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
+"heilen."
-#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/manaserv/beinghandler.cpp:309
#: ../src/net/tmwa/playerhandler.cpp:95
msgid "You are dead."
msgstr "Ach ja: Du bist Tot."
@@ -3669,7 +3715,7 @@ msgstr "Ach ja: Du bist Tot."
msgid "You are no more."
msgstr "Du bist nicht mehr."
-#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/manaserv/beinghandler.cpp:312
#: ../src/net/tmwa/playerhandler.cpp:98
msgid "You are not that alive anymore."
msgstr "Du bist nicht länger lebendig."
@@ -3690,8 +3736,7 @@ msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
msgid "You don't have enough money."
msgstr "Du hast nicht genügend Geld."
-#: ../src/gui/trade.cpp:98
-#: ../src/gui/trade.cpp:134
+#: ../src/gui/trade.cpp:98 ../src/gui/trade.cpp:134
#, fuzzy, c-format
msgid "You get %s"
msgstr "Du erhältst %s."
@@ -3711,8 +3756,11 @@ msgid "You have been invited you to join a party."
msgstr "%s hat dich in seine Party eingeladen."
#: ../src/net/tmwa/loginhandler.cpp:168
-msgid "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM-Team."
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM-"
+"Team."
#: ../src/net/tmwa/loginhandler.cpp:175
#, c-format
@@ -3741,10 +3789,11 @@ msgstr "Dein Level ist noch nicht hoch genug!"
#: ../src/gui/setup_audio.cpp:94
msgid "You may have to restart your client if you want to download new music"
-msgstr "Der Client muss neugestartet werden, wenn die neue Musik heruntergeladen werden soll"
+msgstr ""
+"Der Client muss neugestartet werden, wenn die neue Musik heruntergeladen "
+"werden soll"
-#: ../src/gui/setup_video.cpp:470
-#: ../src/gui/setup_video.cpp:478
+#: ../src/gui/setup_video.cpp:367 ../src/gui/setup_video.cpp:375
msgid "You must restart to apply changes."
msgstr "Bitte neustarten um Änderungen zu übernehmen."
@@ -3760,7 +3809,7 @@ msgstr "Du brauchst noch einen roten Edelstein!"
msgid "You need to use the website to register an account for this server."
msgstr "Du musst auf der Webseite ein Konto für diesen Server erstellen."
-#: ../src/localplayer.cpp:920
+#: ../src/localplayer.cpp:947
#, fuzzy, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -3772,14 +3821,18 @@ msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
msgid "You picked up %s."
msgstr "Du hast %s aufgehoben "
-#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/manaserv/beinghandler.cpp:324
#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir ein paar Neue."
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir ein "
+"paar Neue."
#: ../src/net/manaserv/loginhandler.cpp:312
msgid "You took too long with the captcha or your response was incorrect."
-msgstr "Du hast für das Captcha zu lange gebraucht oder deine Eingabe war inkorrekt."
+msgstr ""
+"Du hast für das Captcha zu lange gebraucht oder deine Eingabe war inkorrekt."
#: ../src/net/tmwa/playerhandler.cpp:123
msgid "You're a stiff."
@@ -3810,8 +3863,12 @@ msgid "You've kicked the bucket."
msgstr "Jetzt passt Du in 'nen Eimer."
#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You've shuffled off your mortal coil, run down the curtain and joined the bleedin' choir invisibile."
-msgstr "Du hast Deine sterbliche Hülle abgelegt, der Schleier legt sich über Dich und Du trittst dem Chor der blutenden Unsichtbaren bei."
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Du hast Deine sterbliche Hülle abgelegt, der Schleier legt sich über Dich "
+"und Du trittst dem Chor der blutenden Unsichtbaren bei."
#: ../src/net/tmwa/guildhandler.cpp:311
msgid "Your guild is full."
@@ -3825,30 +3882,32 @@ msgstr "Deine Körperfunktionen sind nun Geschichte."
msgid "Your name needs to be at least 4 characters."
msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
-#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/manaserv/beinghandler.cpp:317
#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "Your plan of breaking your enemies weapon by bashing it with your throat failed."
-msgstr "Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider nicht ganz so genial, wie Du dachtest..."
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
+"nicht ganz so genial, wie Du dachtest..."
#: ../src/main.cpp:43
msgid "[mana-file] : The mana file is an XML file (.mana)"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_interface.cpp:113
msgid "as particle"
msgstr "als Partikeleffekt"
-#: ../src/gui/setup_video.cpp:174
-#: ../src/gui/setup_video.cpp:188
+#: ../src/gui/setup_video.cpp:136 ../src/gui/setup_video.cpp:150
msgid "high"
msgstr "Hoch"
-#: ../src/gui/setup_video.cpp:223
+#: ../src/gui/setup_interface.cpp:111
msgid "in chat"
msgstr "im Chatfenster"
-#: ../src/gui/setup_video.cpp:173
-#: ../src/gui/setup_video.cpp:186
+#: ../src/gui/setup_video.cpp:135 ../src/gui/setup_video.cpp:148
msgid "low"
msgstr "Niedrig"
@@ -3856,15 +3915,15 @@ msgstr "Niedrig"
msgid "mana [options] [mana-file]"
msgstr "mana [Optionen] [mana-Datei]"
-#: ../src/gui/setup_video.cpp:189
+#: ../src/gui/setup_video.cpp:151
msgid "max"
msgstr "Maximal"
-#: ../src/gui/setup_video.cpp:187
+#: ../src/gui/setup_video.cpp:149
msgid "medium"
msgstr "Mittel"
-#: ../src/gui/setup_video.cpp:172
+#: ../src/gui/setup_video.cpp:134
msgid "off"
msgstr "Aus"
@@ -3877,8 +3936,7 @@ msgstr "benötigt eine neuere Version"
msgid "requires v%s"
msgstr "benötigt v%s"
-#: ../src/resources/beinginfo.cpp:32
-#: ../src/resources/itemdb.cpp:260
+#: ../src/resources/beinginfo.cpp:33 ../src/resources/itemdb.cpp:271
#: ../src/resources/monsterdb.cpp:77
msgid "unnamed"
msgstr "unbenannt"
@@ -3966,6 +4024,9 @@ msgstr "unbenannt"
#~ msgid "Adjust scrolling by %d:%d"
#~ msgstr "Justiere Scrolling %d:%d"
+#~ msgid "Ambient FX: %s"
+#~ msgstr "Hintergrundeffekte: %s"
+
#~ msgid "Ammo"
#~ msgstr "Munition"
@@ -4107,6 +4168,9 @@ msgstr "unbenannt"
#~ msgid "Failed to switch to "
#~ msgstr "Konnte Auflösung nicht ändern zu "
+#~ msgid "Find Path to Mouse"
+#~ msgstr "Finde Weg zum Mauszeiger"
+
#~ msgid "Floating '...' bubble"
#~ msgstr "Schwebende '...' Blase"
@@ -4172,6 +4236,9 @@ msgstr "unbenannt"
#~ msgid "Job Level: %d"
#~ msgstr "Berufsstufe: %d"
+#~ msgid "Joined party."
+#~ msgstr "Der Party beigetreten."
+
#, fuzzy
#~ msgid "Level"
#~ msgstr "Stufe: %d"
@@ -4265,6 +4332,9 @@ msgstr "unbenannt"
#~ msgid "Pants"
#~ msgstr "Hosen"
+#~ msgid "Particle detail: %s"
+#~ msgstr "Partikeldetails: %s"
+
#~ msgid "Party Window"
#~ msgstr "Partyfenster"
@@ -4306,9 +4376,6 @@ msgstr "unbenannt"
#~ msgid "Scroll laziness"
#~ msgstr "Scroll-Trägheit"
-#~ msgid "Scroll radius"
-#~ msgstr "Scroll-Radius"
-
#~ msgid "Server"
#~ msgstr "Server"
@@ -4321,15 +4388,9 @@ msgstr "unbenannt"
#~ msgid "Shoes"
#~ msgstr "Schuhe"
-#~ msgid "Show"
-#~ msgstr "Zeigen"
-
#~ msgid "Slots: "
#~ msgstr "Plätze: "
-#~ msgid "Special %d"
-#~ msgstr "Spezial %d"
-
#~ msgid "Specials Set %d"
#~ msgstr "Spezial Sets %d"
diff --git a/po/es.po b/po/es.po
index 597746b8..b0f1a476 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mana\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 16:41+0200\n"
+"POT-Creation-Date: 2011-06-24 01:55+0200\n"
"PO-Revision-Date: 2010-12-23 12:08+0100\n"
"Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
"Language-Team: Spanish Translator <natsuki.sumon@gmail.com>\n"
@@ -21,7 +21,7 @@ msgstr ""
"X-Poedit-Language: Spanish\n"
"X-Poedit-Country: SPAIN\n"
-#: ../src/gui/npcdialog.cpp:208
+#: ../src/gui/npcdialog.cpp:209
msgid ""
"\n"
"> Next\n"
@@ -103,6 +103,11 @@ msgstr " -u --skip-update : Saltarse las actualizaciones"
msgid " -v --version : Display the version"
msgstr " -v --version : Muestra la versión"
+#: ../src/net/manaserv/partyhandler.cpp:126
+#, fuzzy, c-format
+msgid " on invitation from %s"
+msgstr "Invitacion desconocida para %s."
+
#: ../src/gui/updatewindow.cpp:419
msgid "##1 It is strongly recommended that"
msgstr "##1 Es altamente recomendado que"
@@ -130,17 +135,17 @@ msgstr "% Crítico"
msgid "% Evade"
msgstr "% Evasión"
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
+#: ../src/gui/debugwindow.cpp:59
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: ../src/gui/debugwindow.cpp:56
+#: ../src/gui/debugwindow.cpp:54
#, c-format
msgid "%d FPS (OpenGL)"
msgstr "%d FPS (OpenGL)"
-#: ../src/client.cpp:1154 ../src/client.cpp:1182
+#: ../src/client.cpp:1151 ../src/client.cpp:1179
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s no existe y no puede ser creado! Saliendo."
@@ -185,6 +190,11 @@ msgstr "%s colocó en el modo %s al usuario %s."
msgid "%s is already a member of a party."
msgstr "%s ya es miembro de otro grupo."
+#: ../src/net/manaserv/partyhandler.cpp:157
+#, fuzzy, c-format
+msgid "%s is already in a party."
+msgstr "%s ya es miembro de otro grupo."
+
#: ../src/net/tmwa/partyhandler.cpp:368
#, c-format
msgid "%s is not in your party!"
@@ -195,9 +205,9 @@ msgstr "%s no está en tu grupo!"
msgid "%s is now a member of your party."
msgstr "%s ahora es un miembro de tu grupo."
-#: ../src/net/manaserv/partyhandler.cpp:105
-#, c-format
-msgid "%s joined the party."
+#: ../src/net/manaserv/partyhandler.cpp:128
+#, fuzzy, c-format
+msgid "%s joined the party%s."
msgstr "%s ha entrado a formar parte del grupo."
#: ../src/net/manaserv/chathandler.cpp:311
@@ -210,7 +220,7 @@ msgstr "%s dejó el canal."
msgid "%s refused your invitation."
msgstr "%s cancelo tu invitación."
-#: ../src/net/manaserv/partyhandler.cpp:123
+#: ../src/net/manaserv/partyhandler.cpp:148
#, c-format
msgid "%s rejected your invite."
msgstr "%s canceló tu invitación."
@@ -234,15 +244,15 @@ msgstr "(vacío)"
msgid "*** only available to a GM ***"
msgstr "*** Disponible solo para GMs ***"
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
-#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:464
+#: ../src/gui/buy.cpp:75 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:466
msgid "+"
msgstr "+"
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
-#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:476
+#: ../src/gui/buy.cpp:78 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:126 ../src/gui/sell.cpp:76
+#: ../src/gui/statuswindow.cpp:478
msgid "-"
msgstr "-"
@@ -437,7 +447,7 @@ msgstr ""
msgid ">"
msgstr ">"
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
+#: ../src/gui/setup_interface.cpp:78 ../src/gui/setup_players.cpp:206
msgid "???"
msgstr "???"
@@ -459,7 +469,7 @@ msgstr "Aceptar invitación al clan"
msgid "Accepted party invite from %s."
msgstr "Aceptada la invitación de %s."
-#: ../src/game.cpp:738
+#: ../src/game.cpp:722
msgid "Accepting incoming trade requests"
msgstr "Aceptando las propuestas de intercambio"
@@ -501,7 +511,7 @@ msgstr "Cuenta no encontrada. Por favor conéctate de nuevo."
msgid "Account: %s"
msgstr "Cuenta: %s"
-#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/popupmenu.cpp:372
msgid "Activate"
msgstr ""
@@ -509,11 +519,11 @@ msgstr ""
msgid "Add"
msgstr "Anadir"
-#: ../src/gui/popupmenu.cpp:171
+#: ../src/gui/popupmenu.cpp:174
msgid "Add name to chat"
msgstr "Anadir el nombre al chat"
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
+#: ../src/gui/popupmenu.cpp:193 ../src/gui/popupmenu.cpp:390
msgid "Add to chat"
msgstr "Añadir al chat"
@@ -565,34 +575,30 @@ msgstr "El personaje ya está conectado."
msgid "Already recording."
msgstr "Ya se está llevando a cabo la grabación."
-#: ../src/gui/setup_video.cpp:254
-msgid "Ambient FX"
+#: ../src/gui/setup_video.cpp:191
+#, fuzzy
+msgid "Ambient FX:"
msgstr "Ambiente FX"
-#: ../src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
-msgstr "Ambiente FX: %s"
-
#: ../src/net/tmwa/partyhandler.cpp:299
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Un miembro desconocido intentó decir: %s"
-#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/manaserv/beinghandler.cpp:322
#: ../src/net/tmwa/playerhandler.cpp:112
msgid "Annihilated."
msgstr "Aniquilado."
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Apply"
msgstr "Aplicar"
-#: ../src/gui/setup_video.cpp:461
+#: ../src/gui/setup_video.cpp:358
msgid "Applying change to OpenGL requires restart."
msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:350
msgid ""
"Applying change to OpenGL requires restart. In case OpenGL messes up your "
"game graphics, restart the game with the command line option \"--no-opengl\"."
@@ -615,7 +621,7 @@ msgstr "Estás seguro de dejar el clan %s?"
msgid "Are you sure you want to leave party %s?"
msgstr "Estás seguro de que quieres salir del grupo %s?"
-#: ../src/gui/setup_keyboard.cpp:86
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr "Atribuir"
@@ -628,12 +634,12 @@ msgstr ""
msgid "Attack"
msgstr "Atacar"
-#: ../src/resources/itemdb.cpp:310
+#: ../src/resources/itemdb.cpp:321
#, c-format
msgid "Attack %+d"
msgstr "Ataque %+d"
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:161
#, c-format
msgid "Attack %s"
msgstr "Atacar %s"
@@ -650,7 +656,7 @@ msgstr "Audio"
msgid "Authentication failed."
msgstr "Fallo en la autentificación."
-#: ../src/localplayer.cpp:1030
+#: ../src/localplayer.cpp:1057
msgid "Away"
msgstr "Fuera del Teclado"
@@ -663,6 +669,20 @@ msgstr "Ser amigo %s"
msgid "Being"
msgstr "Personaje"
+#: ../src/gui/debugwindow.cpp:136
+#, fuzzy
+msgid "Being collision radius"
+msgstr "Desplazar Radius"
+
+#: ../src/gui/debugwindow.cpp:138
+#, fuzzy
+msgid "Being path"
+msgstr "Personaje"
+
+#: ../src/gui/debugwindow.cpp:137
+msgid "Being positions"
+msgstr ""
+
#: ../src/net/tmwa/playerhandler.cpp:124
msgid "Bereft of life, you rest in peace."
msgstr "Sin vida, descansa en paz."
@@ -675,15 +695,15 @@ msgstr "Parpadear nombre"
msgid "Blue:"
msgstr "Azul:"
-#: ../src/gui/setup_video.cpp:160
+#: ../src/gui/setup_interface.cpp:91
msgid "Bubbles with names"
msgstr "Burbujas con nombres"
-#: ../src/gui/setup_video.cpp:159
+#: ../src/gui/setup_interface.cpp:90
msgid "Bubbles, no names"
msgstr "Burbujas sin nombres"
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+#: ../src/gui/buy.cpp:50 ../src/gui/buy.cpp:79 ../src/gui/buysell.cpp:47
msgid "Buy"
msgstr "Comprar"
@@ -694,10 +714,10 @@ msgstr "Calibrar"
#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:178
+#: ../src/gui/popupmenu.cpp:197 ../src/gui/popupmenu.cpp:392
#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/setup.cpp:52 ../src/gui/socialwindow.cpp:275
#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
#: ../src/gui/updatewindow.cpp:144
msgid "Cancel"
@@ -761,15 +781,15 @@ msgstr "Cambiar contraseña"
msgid "Change Server"
msgstr "Cambiar de servidor"
-#: ../src/gui/setup_video.cpp:607
+#: ../src/gui/setup_video.cpp:466
msgid "Changes will take effect on map change."
msgstr "Los cambios tendran efecto cuando se cambie de mapa."
-#: ../src/client.cpp:848
+#: ../src/client.cpp:845
msgid "Changing game servers"
msgstr "Cambiando el servidor del juego"
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:349
msgid "Changing to OpenGL"
msgstr "Cambiando a OpenGL"
@@ -790,7 +810,7 @@ msgstr "Canales no son soportados!"
msgid "Character deleted."
msgstr "Personaje Borrado."
-#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
+#: ../src/gui/statuswindow.cpp:213 ../src/gui/statuswindow.cpp:250
#, c-format
msgid "Character points: %d"
msgstr "Puntos del personaje: %d"
@@ -815,7 +835,7 @@ msgstr "Atributos del personaje son muy bajos."
msgid "Chat"
msgstr "Chat"
-#: ../src/keyboardconfig.cpp:75
+#: ../src/keyboardconfig.cpp:74
msgid "Chat Window"
msgstr "Ventana de Chat"
@@ -843,7 +863,7 @@ msgstr "Escoja el nombre de su clan."
msgid "Choose your party's name."
msgstr "Escoja el nombre del grupo."
-#: ../src/gui/npcdialog.cpp:118
+#: ../src/gui/npcdialog.cpp:119
msgid "Clear log"
msgstr "Limpiar log"
@@ -864,10 +884,14 @@ msgstr "La version del cliente es demasiado antigua."
msgid "Client version is too old."
msgstr "La version del cliente es demasiado antigua."
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:51
msgid "Close"
msgstr "Cerrar"
+#: ../src/gui/debugwindow.cpp:135
+msgid "Collision tiles"
+msgstr ""
+
#: ../src/gui/setup_colors.cpp:51
msgid "Colors"
msgstr "Colores"
@@ -1062,11 +1086,11 @@ msgstr ""
msgid "Connect"
msgstr "Conectar"
-#: ../src/client.cpp:661
+#: ../src/client.cpp:658
msgid "Connecting to server"
msgstr "Conectando al servidor"
-#: ../src/client.cpp:838
+#: ../src/client.cpp:835
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
@@ -1078,16 +1102,16 @@ msgstr "Conectando..."
msgid "Connection to server terminated. "
msgstr "Conexión al servidor terminada."
-#: ../src/keyboardconfig.cpp:83
+#: ../src/keyboardconfig.cpp:82
msgid "Copy Outfit"
msgstr "Copiar el conjunto"
-#: ../src/gui/statuswindow.cpp:256
+#: ../src/gui/statuswindow.cpp:258
#, c-format
msgid "Correction points: %d"
msgstr "Puntos de corrección: %d"
-#: ../src/game.cpp:966
+#: ../src/game.cpp:950
msgid "Could Not Load Map"
msgstr "No se pudo cargar el mapa"
@@ -1096,7 +1120,8 @@ msgid "Could not create party."
msgstr "No es posible crear un grupo."
#: ../src/net/tmwa/guildhandler.cpp:296
-msgid "Could not inivte user to guild."
+#, fuzzy
+msgid "Could not invite user to guild."
msgstr "No se puede invitar jugadores al clan."
#: ../src/net/tmwa/specialhandler.cpp:157
@@ -1146,7 +1171,7 @@ msgstr "Fallo al crear un Grupo escoja un nombre mas corto."
msgid "Critical Hit"
msgstr "Golpe Critico"
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: ../src/gui/debugwindow.cpp:96
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Cursor: (%d, %d)"
@@ -1155,23 +1180,23 @@ msgstr "Cursor: (%d, %d)"
msgid "Custom Server"
msgstr "Servidor propio"
-#: ../src/gui/setup_video.cpp:213
+#: ../src/gui/setup_video.cpp:167
msgid "Custom cursor"
msgstr "Cursor propio"
-#: ../src/gui/setup_video.cpp:460
+#: ../src/gui/setup_video.cpp:357
msgid "Deactivating OpenGL"
msgstr "Desativando OpenGL"
-#: ../src/gui/debugwindow.cpp:43
+#: ../src/gui/debugwindow.cpp:219
msgid "Debug"
msgstr "Depurador"
-#: ../src/keyboardconfig.cpp:78
+#: ../src/keyboardconfig.cpp:77
msgid "Debug Window"
msgstr "Ventana de Problemas"
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:96
msgid "Default"
msgstr "Por defecto"
@@ -1179,7 +1204,7 @@ msgstr "Por defecto"
msgid "Defense"
msgstr "Defensa"
-#: ../src/resources/itemdb.cpp:311
+#: ../src/resources/itemdb.cpp:322
#, c-format
msgid "Defense %+d"
msgstr "Defensa %+d"
@@ -1212,7 +1237,7 @@ msgstr "Destreza %+d"
msgid "Dexterity:"
msgstr "Destreza:"
-#: ../src/gui/setup_video.cpp:241
+#: ../src/gui/setup_video.cpp:181
msgid "Disable transparency (Low CPU mode)"
msgstr "Desabilitar transparencia (CPU Modo)"
@@ -1225,7 +1250,7 @@ msgstr "Desagregar %s"
msgid "Disregarded"
msgstr "Desconocido"
-#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/manaserv/beinghandler.cpp:320
#: ../src/net/tmwa/playerhandler.cpp:108
msgid "Do you want your possessions identified?"
msgstr "Deseas que tus posesiones sean identificadas?"
@@ -1239,12 +1264,12 @@ msgstr "Bajar Música"
msgid "Downloading server list...%2.2f%%"
msgstr "Bajando la lista de servidores...%2.2f%%"
-#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
+#: ../src/gui/inventorywindow.cpp:373 ../src/gui/popupmenu.cpp:377
msgid "Drop"
msgstr "Tirar"
-#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
-#: ../src/gui/popupmenu.cpp:372
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/inventorywindow.cpp:371
+#: ../src/gui/popupmenu.cpp:375
msgid "Drop..."
msgstr "Tirar..."
@@ -1252,7 +1277,7 @@ msgstr "Tirar..."
msgid "Duplicated login."
msgstr "Login duplicado."
-#: ../src/client.cpp:935
+#: ../src/client.cpp:932
msgid "Email Change"
msgstr "Cambiar e-mail"
@@ -1260,7 +1285,7 @@ msgstr "Cambiar e-mail"
msgid "Email address already exists."
msgstr "El e-mail ya existe."
-#: ../src/client.cpp:936
+#: ../src/client.cpp:933
msgid "Email changed successfully!"
msgstr "Email modificado correctamente!"
@@ -1268,17 +1293,17 @@ msgstr "Email modificado correctamente!"
msgid "Email:"
msgstr "Email:"
-#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
-#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
-#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
-#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
-#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
-#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
#, c-format
msgid "Emote Shortcut %d"
msgstr "Atajo para Emoticono %d"
-#: ../src/keyboardconfig.cpp:80
+#: ../src/keyboardconfig.cpp:79
msgid "Emote Shortcut Window"
msgstr "Ventana de Emoticonos"
@@ -1311,12 +1336,12 @@ msgstr "Fin de la lista de canales."
msgid "Enter the old password first."
msgstr "Escribe la contraseña antigua."
-#: ../src/client.cpp:721
+#: ../src/client.cpp:718
msgid "Entering game world"
msgstr "Entrando al juego"
-#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
-#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
+#: ../src/gui/inventorywindow.cpp:93 ../src/gui/inventorywindow.cpp:106
+#: ../src/gui/inventorywindow.cpp:362 ../src/gui/popupmenu.cpp:369
msgid "Equip"
msgstr "Equipar"
@@ -1324,15 +1349,15 @@ msgstr "Equipar"
msgid "Equip arrows first."
msgstr "Equipar las flechas primero."
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+#: ../src/gui/equipmentwindow.cpp:54 ../src/gui/windowmenu.cpp:55
msgid "Equipment"
msgstr "Equipamento"
-#: ../src/keyboardconfig.cpp:72
+#: ../src/keyboardconfig.cpp:71
msgid "Equipment Window"
msgstr "Ventana de equipamento"
-#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/client.cpp:1033 ../src/gui/changeemaildialog.cpp:156
#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
@@ -1346,7 +1371,7 @@ msgstr "Error"
msgid "Error creating guild."
msgstr "Error al crear el clan."
-#: ../src/client.cpp:1336 ../src/client.cpp:1342
+#: ../src/client.cpp:1333 ../src/client.cpp:1339
msgid "Error creating updates directory!"
msgstr "Error creando la carpeta de actualizaciones!"
@@ -1358,7 +1383,7 @@ msgstr "Error al entrar al canal."
msgid "Error retreiving server list!"
msgstr "Error al recuperar la lista de servers!"
-#: ../src/game.cpp:967
+#: ../src/game.cpp:951
#, c-format
msgid "Error while loading %s"
msgstr "Error mientras cargaba %s"
@@ -1367,7 +1392,7 @@ msgstr "Error mientras cargaba %s"
msgid "Exp Notification"
msgstr "Aviso de experiencia"
-#: ../src/gui/statuswindow.cpp:122
+#: ../src/gui/statuswindow.cpp:124
msgid "Exp:"
msgstr "Exp:"
@@ -1387,7 +1412,7 @@ msgstr "Imposible compartir experiencia."
msgid "Experience sharing unknown."
msgstr "Compartir experiencia desconocido."
-#: ../src/gui/setup_video.cpp:230
+#: ../src/gui/setup_video.cpp:171
msgid "FPS limit:"
msgstr "Limite FPS:"
@@ -1429,24 +1454,24 @@ msgstr "Fallo al enviar o mensaje inválido."
msgid "Failed to start recording."
msgstr "Fallo al empezar la grabación."
-#: ../src/gui/setup_video.cpp:426
+#: ../src/gui/setup_video.cpp:323
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:420
+#: ../src/gui/setup_video.cpp:317
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/net/tmwa/inventoryhandler.cpp:287
+#: ../src/net/tmwa/inventoryhandler.cpp:286
msgid "Failed to use item."
msgstr "Fallo al usar el objeto."
-#: ../src/client.cpp:956
+#: ../src/client.cpp:953
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
@@ -1454,16 +1479,13 @@ msgstr "Adiós, vuelve cuando quieras..."
msgid "Female"
msgstr "Mujer"
-#: ../src/keyboardconfig.cpp:56
-msgid "Find Path to Mouse"
-msgstr "Encontrar Camino al Mouse"
-
#: ../src/gui/recorder.cpp:87
msgid "Finishing recording."
msgstr "Finalizando grabación."
-#: ../src/gui/setup_video.cpp:256
-msgid "Font size"
+#: ../src/gui/setup_interface.cpp:130
+#, fuzzy
+msgid "Font size:"
msgstr "Tamaño de fuente"
#: ../src/commandhandler.cpp:204
@@ -1474,7 +1496,7 @@ msgstr "Para mas informacion, pon /help <comando>."
msgid "Friend"
msgstr "Amigo"
-#: ../src/gui/setup_video.cpp:211
+#: ../src/gui/setup_video.cpp:165
msgid "Full screen"
msgstr "Pantalla completa"
@@ -1482,16 +1504,16 @@ msgstr "Pantalla completa"
msgid "GM Names"
msgstr "Nombres De Los GMs"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Game"
msgstr "Juego"
-#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/manaserv/beinghandler.cpp:314
#: ../src/net/tmwa/playerhandler.cpp:100
msgid "Game Over!"
msgstr "Fin Del Juego!"
-#: ../src/game.cpp:181
+#: ../src/game.cpp:179
msgid "General"
msgstr "General"
@@ -1512,7 +1534,11 @@ msgstr "Desconectado del servidor!"
msgid "Green:"
msgstr "Verde:"
-#: ../src/gui/setup_video.cpp:253
+#: ../src/gui/debugwindow.cpp:134
+msgid "Grid"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:129
msgid "Gui opacity"
msgstr "Opacidad"
@@ -1545,12 +1571,12 @@ msgstr "La creación de guilds no esta soportada."
msgid "Guild name is missing."
msgstr "Falta el nombre del clan."
-#: ../src/resources/itemdb.cpp:312
+#: ../src/resources/itemdb.cpp:323
#, c-format
msgid "HP %+d"
msgstr "PV %+d"
-#: ../src/gui/statuswindow.cpp:117
+#: ../src/gui/statuswindow.cpp:119
msgid "HP:"
msgstr "PV:"
@@ -1566,7 +1592,7 @@ msgstr "Estilo de pelo:"
msgid "Help"
msgstr "Ayuda"
-#: ../src/keyboardconfig.cpp:69
+#: ../src/keyboardconfig.cpp:68
msgid "Help Window"
msgstr "Ventana de ayuda"
@@ -1578,7 +1604,7 @@ msgstr "Esconder ventanas"
msgid "Huh? What's that?"
msgstr "Huh? Qué es eso?"
-#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/manaserv/beinghandler.cpp:319
#: ../src/net/tmwa/playerhandler.cpp:106
msgid "I guess this did not run too well."
msgstr "Creo que esto no fue muy bien."
@@ -1606,11 +1632,11 @@ msgstr "Si eres la última persona de este canal , será eliminado."
msgid "Ignore %s"
msgstr "Ignorar %s"
-#: ../src/keyboardconfig.cpp:103
+#: ../src/keyboardconfig.cpp:102
msgid "Ignore input 1"
msgstr "Ignorar input 1"
-#: ../src/keyboardconfig.cpp:104
+#: ../src/keyboardconfig.cpp:103
msgid "Ignore input 2"
msgstr "Ignorar input 2"
@@ -1618,7 +1644,7 @@ msgstr "Ignorar input 2"
msgid "Ignored"
msgstr "Ignorado"
-#: ../src/game.cpp:733
+#: ../src/game.cpp:717
msgid "Ignoring incoming trade requests"
msgstr "Ignorando las propuestas de intercambio"
@@ -1626,7 +1652,7 @@ msgstr "Ignorando las propuestas de intercambio"
msgid "Ignoring incoming trade requests."
msgstr "Ignorar las propuestas de intercambio entrantes."
-#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/gui/debugwindow.cpp:235 ../src/net/manaserv/charhandler.cpp:210
#: ../src/net/tmwa/charserverhandler.cpp:146
msgid "Info"
msgstr "Información"
@@ -1662,6 +1688,10 @@ msgstr "Inteligencia %+d"
msgid "Intelligence:"
msgstr "Inteligencia:"
+#: ../src/gui/setup_interface.cpp:120
+msgid "Interface"
+msgstr ""
+
#: ../src/net/manaserv/charhandler.cpp:267
#, fuzzy
msgid "Invalid character slot selected."
@@ -1688,20 +1718,20 @@ msgstr "Nombre no válido."
msgid "Invalid slot number."
msgstr "Nombre no válido."
-#: ../src/client.cpp:1302
+#: ../src/client.cpp:1299
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de actualización inválido: %s"
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+#: ../src/gui/inventorywindow.cpp:60 ../src/gui/windowmenu.cpp:56
msgid "Inventory"
msgstr "Inventario"
-#: ../src/keyboardconfig.cpp:71
+#: ../src/keyboardconfig.cpp:70
msgid "Inventory Window"
msgstr "Ventana de inventario"
-#: ../src/localplayer.cpp:898
+#: ../src/localplayer.cpp:925
#, fuzzy
msgid "Inventory is full."
msgstr "Servidor lleno."
@@ -1715,7 +1745,7 @@ msgstr "Invitar"
msgid "Invite %s to join your guild"
msgstr "Invitar a %s para unirse a tu clan"
-#: ../src/gui/popupmenu.cpp:134
+#: ../src/gui/popupmenu.cpp:136
#, c-format
msgid "Invite %s to join your party"
msgstr "Invitar a %s para su grupo"
@@ -1739,29 +1769,29 @@ msgstr "Jugador %s invitado al grupo."
msgid "Inviting failed, because you can't see a player called %s."
msgstr "Imposible invitar por que no puedes ver al jugador %s."
-#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
-#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
-#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
-#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
-#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
-#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:56 ../src/keyboardconfig.cpp:57
+#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
+#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
+#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
+#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
+#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
#, c-format
msgid "Item Shortcut %d"
msgstr "Atajo para el objeto %d"
-#: ../src/keyboardconfig.cpp:76
+#: ../src/keyboardconfig.cpp:75
msgid "Item Shortcut Window"
msgstr "Ventana de atajos para objetos"
-#: ../src/localplayer.cpp:901
+#: ../src/localplayer.cpp:928
msgid "Item belongs to someone else."
msgstr ""
-#: ../src/localplayer.cpp:897
+#: ../src/localplayer.cpp:924
msgid "Item is too far away"
msgstr ""
-#: ../src/localplayer.cpp:896
+#: ../src/localplayer.cpp:923
msgid "Item is too heavy."
msgstr ""
@@ -1781,33 +1811,39 @@ msgstr "No es posible el compartir objetos."
msgid "Item sharing unknown."
msgstr "Compartir objetos desconocido."
-#: ../src/client.cpp:785
+#: ../src/client.cpp:782
#, fuzzy
msgid "ItemDB: Error while loading "
msgstr "Error mientras cargaba %s"
-#: ../src/gui/statuswindow.cpp:159
+#: ../src/gui/statuswindow.cpp:161
msgid "Job:"
msgstr "Trabajo:"
-#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
+#: ../src/gui/statuswindow.cpp:160 ../src/gui/statuswindow.cpp:278
#, c-format
msgid "Job: %d"
msgstr "Trabajo: %d"
-#: ../src/net/manaserv/partyhandler.cpp:87
-msgid "Joined party."
-msgstr "Entraste al grupo."
+#: ../src/net/manaserv/partyhandler.cpp:98
+msgid ""
+"Joining party failed, because the invitation has timed out on the server."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:102
+#, fuzzy
+msgid "Joining party failed, because the inviter has left the game."
+msgstr "Fallo al crear un Grupo escoja un nombre mas corto."
#: ../src/gui/setup_joystick.cpp:41
msgid "Joystick"
msgstr "Joystick"
-#: ../src/gui/setup_keyboard.cpp:125
+#: ../src/gui/setup_keyboard.cpp:127
msgid "Key Conflict(s) Detected."
msgstr "Conflicto de teclas detectado."
-#: ../src/gui/setup_keyboard.cpp:77
+#: ../src/gui/setup_keyboard.cpp:78
msgid "Keyboard"
msgstr "Teclado"
@@ -1815,11 +1851,11 @@ msgstr "Teclado"
msgid "Kick failed!"
msgstr "Error al expulsar!"
-#: ../src/gui/popupmenu.cpp:163
+#: ../src/gui/popupmenu.cpp:166
msgid "Kick monster"
msgstr "Expulsar monstruo"
-#: ../src/gui/popupmenu.cpp:141
+#: ../src/gui/popupmenu.cpp:144
msgid "Kick player"
msgstr "Expulsar jugador"
@@ -1827,7 +1863,7 @@ msgstr "Expulsar jugador"
msgid "Kick succeeded!"
msgstr "Expulsado satisfactoriamente!"
-#: ../src/gui/setup_video.cpp:131
+#: ../src/gui/setup_interface.cpp:62
msgid "Large"
msgstr "Grande"
@@ -1843,8 +1879,8 @@ msgstr "Salir del clan?"
msgid "Leave Party?"
msgstr "Salir del grupo?"
-#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
-#: ../src/gui/statuswindow.cpp:263
+#: ../src/gui/statuswindow.cpp:115 ../src/gui/statuswindow.cpp:217
+#: ../src/gui/statuswindow.cpp:265
#, c-format
msgid "Level: %d"
msgstr "Nivel: %d"
@@ -1865,11 +1901,11 @@ msgstr "Cuando le atacas al monstruo"
msgid "Local Player Miss"
msgstr "Cuando fallas un ataque"
-#: ../src/gui/setup_video.cpp:220
+#: ../src/gui/setup_interface.cpp:108
msgid "Log NPC dialogue"
msgstr "Log dealogos con un NPC"
-#: ../src/client.cpp:688
+#: ../src/client.cpp:685
msgid "Logging in"
msgstr "Acediendo a la cuenta"
@@ -1881,7 +1917,7 @@ msgstr "Login"
msgid "Login attempt too soon after previous attempt."
msgstr "Intento de conexión muy pronto tras intento previo."
-#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/manaserv/beinghandler.cpp:323
#: ../src/net/tmwa/playerhandler.cpp:114
msgid "Looks like you got your head handed to you."
msgstr "Parece que te tiraron tu cabeza a tus manos."
@@ -1899,12 +1935,12 @@ msgstr "Suerte %+d"
msgid "Luck:"
msgstr "Suerte:"
-#: ../src/gui/skilldialog.cpp:470
+#: ../src/gui/skilldialog.cpp:472
#, c-format
msgid "Lvl: %d"
msgstr "Nivel: %d"
-#: ../src/gui/skilldialog.cpp:459
+#: ../src/gui/skilldialog.cpp:461
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nivel: %d (%+d)"
@@ -1917,12 +1953,12 @@ msgstr "Ataque M."
msgid "M.Defense"
msgstr "Defensa M."
-#: ../src/resources/itemdb.cpp:313
+#: ../src/resources/itemdb.cpp:324
#, c-format
msgid "MP %+d"
msgstr "PM %+d"
-#: ../src/gui/statuswindow.cpp:130
+#: ../src/gui/statuswindow.cpp:132
msgid "MP:"
msgstr "PM:"
@@ -1934,22 +1970,22 @@ msgstr "Jugador VIP."
msgid "Male"
msgstr "Hombre"
-#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:87
msgid "Map"
msgstr "Mapa"
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: ../src/gui/debugwindow.cpp:103
#, c-format
msgid "Map: %s"
msgstr "Mapa: %s"
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
-#: ../src/gui/statuswindow.cpp:497
+#: ../src/gui/buy.cpp:81 ../src/gui/sell.cpp:79
+#: ../src/gui/statuswindow.cpp:387 ../src/gui/statuswindow.cpp:465
+#: ../src/gui/statuswindow.cpp:499
msgid "Max"
msgstr "Máximo"
-#: ../src/gui/setup_video.cpp:130
+#: ../src/gui/setup_interface.cpp:61
msgid "Medium"
msgstr "Media"
@@ -1977,11 +2013,11 @@ msgstr "El mensaje cierra el chat."
msgid "Message now closes chat."
msgstr "Mensaje ahora cierra el chat."
-#: ../src/keyboardconfig.cpp:74
+#: ../src/keyboardconfig.cpp:73
msgid "Minimap Window"
msgstr "Ventana del minimapa"
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
+#: ../src/gui/debugwindow.cpp:101
#, c-format
msgid "Minimap: %s"
msgstr "Minimapa: %s"
@@ -1990,8 +2026,8 @@ msgstr "Minimapa: %s"
msgid "Misses"
msgstr "Muchos fallos al atacar"
-#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
-#: ../src/gui/statuswindow.cpp:240
+#: ../src/gui/statuswindow.cpp:116 ../src/gui/statuswindow.cpp:210
+#: ../src/gui/statuswindow.cpp:242
#, c-format
msgid "Money: %s"
msgstr "Dinero: %s"
@@ -2004,6 +2040,10 @@ msgstr "Cuando un monstruo te ataca"
msgid "Monsters"
msgstr "Monstruos"
+#: ../src/gui/debugwindow.cpp:139
+msgid "Mouse path"
+msgstr ""
+
#: ../src/keyboardconfig.cpp:40
msgid "Move Down"
msgstr "Mover para abajo"
@@ -2024,12 +2064,12 @@ msgstr "Mover para arriba"
msgid "Music volume"
msgstr "Volumen de Música"
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#: ../src/gui/debugwindow.cpp:100
#, c-format
msgid "Music: %s"
msgstr "Música: %s"
-#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
+#: ../src/gui/npcdialog.cpp:74 ../src/gui/npcpostdialog.cpp:41
msgid "NPC"
msgstr "NPC"
@@ -2051,7 +2091,7 @@ msgstr "Nombre:"
msgid "Name: %s"
msgstr "Nombre: %s"
-#: ../src/gui/ministatus.cpp:236
+#: ../src/gui/ministatus.cpp:234
msgid "Need"
msgstr "Necesitas"
@@ -2063,7 +2103,7 @@ msgstr "Se necesita un usuario a expulsar!"
msgid "Need a user to op!"
msgstr "Se necesita un usuario para ser operador!"
-#: ../src/game.cpp:386
+#: ../src/game.cpp:374
msgid "Network Error"
msgstr "Error de conexión"
@@ -2083,11 +2123,11 @@ msgstr "Nueva contraseña incorrecta."
msgid "New password too short."
msgstr "Nueva contrasena es muy corta."
-#: ../src/gui/npcdialog.cpp:49
+#: ../src/gui/npcdialog.cpp:50
msgid "Next"
msgstr "Siguiente"
-#: ../src/keyboardconfig.cpp:100
+#: ../src/keyboardconfig.cpp:99
msgid "Next Chat Tab"
msgstr "Siguiente Pestaña De Chat"
@@ -2111,11 +2151,11 @@ msgstr "No hay servidores disponibles."
msgid "No servers available."
msgstr "Servidores indiponibles."
-#: ../src/gui/setup_video.cpp:157
+#: ../src/gui/setup_interface.cpp:88
msgid "No text"
msgstr "Sin texto"
-#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/manaserv/beinghandler.cpp:315
#: ../src/net/tmwa/playerhandler.cpp:102
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
@@ -2124,11 +2164,15 @@ msgstr ""
"No, niños. Tu jugador no murió realmente. Solo... eeeh... fue a un lugar "
"mejor ."
-#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
-#: ../src/gui/setup_video.cpp:656
+#: ../src/gui/setup_video.cpp:200 ../src/gui/setup_video.cpp:407
+#: ../src/gui/setup_video.cpp:487
msgid "None"
msgstr "Nada"
+#: ../src/gui/debugwindow.cpp:142
+msgid "Normal"
+msgstr ""
+
#: ../src/gui/recorder.cpp:91
msgid "Not currently recording."
msgstr "No se está grabando en este momento."
@@ -2161,12 +2205,12 @@ msgstr "E-mail antiguo incorrecto."
msgid "Old password incorrect."
msgstr "Contrasena antigua incorrecta."
-#: ../src/net/tmwa/gamehandler.cpp:89
+#: ../src/net/tmwa/gamehandler.cpp:83
#, c-format
msgid "Online users: %d"
msgstr "Jugadores online: %d"
-#: ../src/gui/setup_video.cpp:212
+#: ../src/gui/setup_video.cpp:166
msgid "OpenGL"
msgstr "OpenGL"
@@ -2194,23 +2238,24 @@ msgstr "Nombres de otros jugadores"
msgid "Outfit: %d"
msgstr "Conjuntos: %d"
-#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
+#: ../src/gui/inventorywindow.cpp:110 ../src/gui/outfitwindow.cpp:51
msgid "Outfits"
msgstr "Conjuntos"
-#: ../src/keyboardconfig.cpp:81
+#: ../src/keyboardconfig.cpp:80
msgid "Outfits Window"
msgstr "Ventana de Conjuntos"
-#: ../src/gui/setup_video.cpp:252
-msgid "Overhead text"
+#: ../src/gui/setup_interface.cpp:128
+#, fuzzy
+msgid "Overhead text:"
msgstr "Texto sobrescrito"
#: ../src/resources/userpalette.cpp:93
msgid "Own Name"
msgstr "Propio Nombre"
-#: ../src/gui/setup_video.cpp:606
+#: ../src/gui/setup_video.cpp:465
msgid "Particle Effect Settings Changed."
msgstr "Configuración del efecto de las partículas cambiado."
@@ -2218,21 +2263,17 @@ msgstr "Configuración del efecto de las partículas cambiado."
msgid "Particle Effects"
msgstr "Efectos Particulares"
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#: ../src/gui/debugwindow.cpp:107
#, c-format
msgid "Particle count: %d"
msgstr "Recuento de partículas: %d"
-#: ../src/gui/setup_video.cpp:255
-msgid "Particle detail"
+#: ../src/gui/setup_video.cpp:192
+#, fuzzy
+msgid "Particle detail:"
msgstr "Detalle de partículas"
-#: ../src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Detalle de partícula: %s"
-
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:169
msgid "Particle effects"
msgstr "Efectos de partículas"
@@ -2253,6 +2294,18 @@ msgstr "Miembros del grupo"
msgid "Party Name"
msgstr "Nombre del grupo"
+#: ../src/net/manaserv/partyhandler.cpp:152
+msgid ""
+"Party invitation rejected by server, because of too many invitations in a "
+"short time."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:75
+#, c-format
+msgid ""
+"Party invite failed, because no player called %s is within the visual range."
+msgstr ""
+
#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
msgid "Party name is missing."
msgstr "Falta el nombre del grupo."
@@ -2266,11 +2319,11 @@ msgstr "Grupo creado."
msgid "Party: %s"
msgstr "Grupo: %s"
-#: ../src/client.cpp:916
+#: ../src/client.cpp:913
msgid "Password Change"
msgstr "Cambiar contraseña"
-#: ../src/client.cpp:917
+#: ../src/client.cpp:914
msgid "Password changed successfully!"
msgstr "Le contraseña se cambió correctamente!"
@@ -2283,7 +2336,7 @@ msgstr "Contraseña:"
msgid "Passwords do not match."
msgstr "Las contraseñas no coinciden."
-#: ../src/gui/popupmenu.cpp:188
+#: ../src/gui/popupmenu.cpp:191
#, c-format
msgid "Pick up %s"
msgstr "Coger %s"
@@ -2373,7 +2426,7 @@ msgstr "Preparando la descarga"
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jugadores estan presentes."
-#: ../src/net/manaserv/beinghandler.cpp:303
+#: ../src/net/manaserv/beinghandler.cpp:329
msgid "Press OK to respawn."
msgstr "Pulsa OK para reaparecer."
@@ -2381,12 +2434,12 @@ msgstr "Pulsa OK para reaparecer."
msgid "Press the button to start calibration"
msgstr "Aprieta el botón para empezar a calibrar"
-#: ../src/keyboardconfig.cpp:99
+#: ../src/keyboardconfig.cpp:98
msgid "Previous Chat Tab"
msgstr "Pestaña de Chat Anterior"
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:288
+#: ../src/gui/buy.cpp:70 ../src/gui/buy.cpp:277 ../src/gui/sell.cpp:72
+#: ../src/gui/sell.cpp:298
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Precio: %s / Total: %s"
@@ -2408,10 +2461,10 @@ msgstr "Pulso"
msgid "Put all whispers in tabs"
msgstr "Mostrar nuevos susurros en pestañas"
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/buy.cpp:80 ../src/gui/quitdialog.cpp:40
#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
-#: ../src/keyboardconfig.cpp:102
+#: ../src/gui/sell.cpp:78 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:101
msgid "Quit"
msgstr "Salir"
@@ -2472,15 +2525,15 @@ msgstr "Recordar nombre de usuario"
msgid "Request for Trade"
msgstr "Propuesta de intercambio"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Request to quit denied!"
msgstr "Petición de salida denegada!"
-#: ../src/client.cpp:809
+#: ../src/client.cpp:806
msgid "Requesting characters"
msgstr "Cargando jugadores"
-#: ../src/client.cpp:889
+#: ../src/client.cpp:886
msgid "Requesting registration details"
msgstr "Detalles de registración"
@@ -2489,23 +2542,23 @@ msgstr "Detalles de registración"
msgid "Requesting to join channel %s."
msgstr "Solicitando la entrada del canal %s."
-#: ../src/gui/npcdialog.cpp:134
+#: ../src/gui/npcdialog.cpp:135
msgid "Reset"
msgstr "Resetear"
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Reset Windows"
msgstr "Restaurar Ventanas"
-#: ../src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:335
msgid "Restart needed for changes to take effect."
msgstr "Reinicio necesario para que los cambios tengan su efecto."
-#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
+#: ../src/gui/setup_video.cpp:442 ../src/gui/setup_video.cpp:447
msgid "Restart your client for the change to take effect."
msgstr "Reincie el juego para que los cambios tengan efecto."
-#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
+#: ../src/gui/inventorywindow.cpp:133 ../src/gui/popupmenu.cpp:388
msgid "Retrieve"
msgstr "Retirar"
@@ -2521,16 +2574,16 @@ msgstr "Volver a alternar el chat."
msgid "Rotate the stick"
msgstr "Gira el stick"
-#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/manaserv/beinghandler.cpp:321
#: ../src/net/tmwa/playerhandler.cpp:110
msgid "Sadly, no trace of you was ever found..."
msgstr "Desgraciadamente, nada de ti fue encontrado..."
-#: ../src/game.cpp:354
+#: ../src/game.cpp:342
msgid "Saving screenshot failed!"
msgstr "Fallo al guardar screenshot!"
-#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
+#: ../src/gui/setup_video.cpp:441 ../src/gui/setup_video.cpp:446
msgid "Screen Resolution Changed"
msgstr "Resolución de pantalla cambiada"
@@ -2538,19 +2591,19 @@ msgstr "Resolución de pantalla cambiada"
msgid "Screenshot"
msgstr "Imprimir pantalla"
-#: ../src/game.cpp:349
+#: ../src/game.cpp:337
msgid "Screenshot saved as "
msgstr "Screenshot guardada como"
-#: ../src/keyboardconfig.cpp:98
+#: ../src/keyboardconfig.cpp:97
msgid "Scroll Chat Down"
msgstr "Tirar el chat para abajo"
-#: ../src/keyboardconfig.cpp:97
+#: ../src/keyboardconfig.cpp:96
msgid "Scroll Chat Up"
msgstr "Tirar el chat para arriba"
-#: ../src/gui/inventorywindow.cpp:87
+#: ../src/gui/inventorywindow.cpp:88
msgid "Search:"
msgstr ""
@@ -2558,7 +2611,7 @@ msgstr ""
msgid "Seems you need more money... ;-)"
msgstr "Parece que necesitas más dinero... ;-)"
-#: ../src/keyboardconfig.cpp:101
+#: ../src/keyboardconfig.cpp:100
msgid "Select OK"
msgstr "Seleccionar OK"
@@ -2590,7 +2643,7 @@ msgstr "Selecionar la cantidad de objetos a intercambiar."
msgid "Selection out of range."
msgstr "Seleccion fuera de rango."
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:50 ../src/gui/sell.cpp:77
msgid "Sell"
msgstr "Vender"
@@ -2614,11 +2667,11 @@ msgstr "Tipo de servidor:"
msgid "Server:"
msgstr "Servidor:"
-#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+#: ../src/client.cpp:577 ../src/gui/setup.cpp:44 ../src/gui/windowmenu.cpp:66
msgid "Setup"
msgstr "Configuración"
-#: ../src/keyboardconfig.cpp:77
+#: ../src/keyboardconfig.cpp:76
msgid "Setup Window"
msgstr "Ventana de Configuración"
@@ -2642,7 +2695,7 @@ msgstr "Mostrar IP: Cancelado"
msgid "Show IP: On"
msgstr "Mostrar IP: Activado"
-#: ../src/gui/setup_video.cpp:246
+#: ../src/gui/setup_interface.cpp:125
#, fuzzy
msgid "Show damage"
msgstr "mostrar nombre"
@@ -2651,14 +2704,20 @@ msgstr "mostrar nombre"
msgid "Show gender"
msgstr "Mostrar género (del personaje)"
-#: ../src/gui/setup_video.cpp:219
+#: ../src/gui/setup_interface.cpp:107
msgid "Show own name"
msgstr "Mostrar nombre propio"
-#: ../src/gui/setup_video.cpp:221
-msgid "Show pickup notification"
+#: ../src/gui/setup_interface.cpp:109
+#, fuzzy
+msgid "Show pickup notification:"
msgstr "Mostrar aviso al coger algo"
+#: ../src/gui/debugwindow.cpp:133
+#, fuzzy
+msgid "Show:"
+msgstr "Mostrar IP: Activado"
+
#: ../src/keyboardconfig.cpp:53
msgid "Sit"
msgstr "Sentarse"
@@ -2667,21 +2726,21 @@ msgstr "Sentarse"
msgid "Sit failed!"
msgstr "Fallo al sentarse!"
-#: ../src/gui/skilldialog.cpp:377
+#: ../src/gui/skilldialog.cpp:379
#, c-format
msgid "Skill %d"
msgstr "Habilidad %d"
-#: ../src/gui/skilldialog.cpp:368
+#: ../src/gui/skilldialog.cpp:370
#, c-format
msgid "Skill Set %d"
msgstr "Habilidades %d"
-#: ../src/keyboardconfig.cpp:73
+#: ../src/keyboardconfig.cpp:72
msgid "Skill Window"
msgstr "Ventana de habilidades"
-#: ../src/gui/skilldialog.cpp:273
+#: ../src/gui/skilldialog.cpp:275
#, c-format
msgid "Skill points available: %d"
msgstr "Puntos de habilidades: %d"
@@ -2690,11 +2749,11 @@ msgstr "Puntos de habilidades: %d"
msgid "Skills"
msgstr "Habilidades"
-#: ../src/gui/inventorywindow.cpp:86
+#: ../src/gui/inventorywindow.cpp:87
msgid "Slots:"
msgstr "Espacios:"
-#: ../src/gui/setup_video.cpp:129
+#: ../src/gui/setup_interface.cpp:60
msgid "Small"
msgstr "Pequeño"
@@ -2706,11 +2765,11 @@ msgstr "Emoticono"
msgid "Social"
msgstr "Social"
-#: ../src/keyboardconfig.cpp:79
+#: ../src/keyboardconfig.cpp:78
msgid "Social Window"
msgstr "Ventana Social"
-#: ../src/gui/setup_video.cpp:573
+#: ../src/gui/setup_video.cpp:444
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
@@ -2726,10 +2785,30 @@ msgstr "Sonido"
msgid "Sound Engine"
msgstr "Mecanismo de Sonido"
+#: ../src/gui/debugwindow.cpp:143
+#, fuzzy
+msgid "Special 1"
+msgstr "Especial %d"
+
+#: ../src/gui/debugwindow.cpp:144
+#, fuzzy
+msgid "Special 2"
+msgstr "Especial %d"
+
+#: ../src/gui/debugwindow.cpp:145
+#, fuzzy
+msgid "Special 3"
+msgstr "Especial %d"
+
#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
msgid "Specials"
msgstr "Especiales"
+#: ../src/gui/debugwindow.cpp:141
+#, fuzzy
+msgid "Specials:"
+msgstr "Especiales"
+
#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
#: ../src/gui/setup_colors.cpp:333
msgid "Spectrum"
@@ -2739,11 +2818,11 @@ msgstr "Espectro"
msgid "Speed hack detected."
msgstr "Hack de velocidad detectado."
-#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/popupmenu.cpp:381
msgid "Split"
msgstr "Dividir"
-#: ../src/localplayer.cpp:899
+#: ../src/localplayer.cpp:926
msgid "Stack is too big."
msgstr ""
@@ -2759,7 +2838,7 @@ msgstr "Estático"
msgid "Status"
msgstr "Status"
-#: ../src/keyboardconfig.cpp:70
+#: ../src/keyboardconfig.cpp:69
msgid "Status Window"
msgstr "Ventana de status"
@@ -2775,11 +2854,11 @@ msgstr "Parar el ataque"
msgid "Stop recording"
msgstr "Parar de grabar"
-#: ../src/gui/inventorywindow.cpp:59
+#: ../src/gui/inventorywindow.cpp:60
msgid "Storage"
msgstr "Almacén"
-#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:361
msgid "Store"
msgstr "Almacenar"
@@ -2802,7 +2881,7 @@ msgstr "Fuerza %+d"
msgid "Strength:"
msgstr "Fuerza:"
-#: ../src/gui/npcdialog.cpp:51
+#: ../src/gui/npcdialog.cpp:52
msgid "Submit"
msgstr "Enviar"
@@ -2818,7 +2897,12 @@ msgstr "Cambiar de personaje"
msgid "Switch server"
msgstr "Cambiar de servidor"
-#: ../src/gui/setup_video.cpp:437
+#: ../src/gui/debugwindow.cpp:239
+#, fuzzy
+msgid "Switches"
+msgstr "Cambiar de servidor"
+
+#: ../src/gui/setup_video.cpp:334
msgid "Switching to Full Screen"
msgstr "Cambiando a pantalla completa"
@@ -2826,7 +2910,7 @@ msgstr "Cambiando a pantalla completa"
msgid "Talk"
msgstr "Hablar"
-#: ../src/gui/popupmenu.cpp:150
+#: ../src/gui/popupmenu.cpp:153
#, c-format
msgid "Talk to %s"
msgstr "Hablar con %s"
@@ -2847,7 +2931,7 @@ msgstr "Seleccionar NPC"
msgid "Target Player"
msgstr "Seleccionar Jugador"
-#: ../src/gui/setup_video.cpp:158
+#: ../src/gui/setup_interface.cpp:89
msgid "Text"
msgstr "Texto"
@@ -2859,12 +2943,12 @@ msgstr "Gracias por comprar."
msgid "Thanks for selling."
msgstr "Gracias por vender."
-#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/manaserv/beinghandler.cpp:313
#: ../src/net/tmwa/playerhandler.cpp:99
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Las frías manos de la muerte se llevaron tu alma su reino."
-#: ../src/game.cpp:385
+#: ../src/game.cpp:373
msgid "The connection to the server was lost."
msgstr "Se ha perdido la conexión del servidor."
@@ -3093,7 +3177,7 @@ msgstr ""
msgid "This is what the color looks like"
msgstr "Así es como se verá el color"
-#: ../src/client.cpp:783
+#: ../src/client.cpp:780
#, fuzzy
msgid ""
"This server is missing needed world data. Please contact the administrator"
@@ -3106,7 +3190,7 @@ msgstr ""
msgid "This user name is already taken."
msgstr "Este nombre de usuario ya está escogido."
-#: ../src/gui/setup_video.cpp:128
+#: ../src/gui/setup_interface.cpp:59
msgid "Tiny"
msgstr "Minúsculo"
@@ -3114,7 +3198,7 @@ msgstr "Minúsculo"
msgid "To:"
msgstr "Para:"
-#: ../src/keyboardconfig.cpp:96
+#: ../src/keyboardconfig.cpp:95
msgid "Toggle Chat"
msgstr "Cambiar de Chat"
@@ -3179,15 +3263,15 @@ msgstr "Intercambio es imposible. El otro personaje está muy alejado."
msgid "Trading with %s"
msgstr "Intercambiando con %s"
-#: ../src/gui/setup_video.cpp:469
+#: ../src/gui/setup_video.cpp:366
msgid "Transparency disabled"
msgstr "Transparencia desabilitada"
-#: ../src/gui/setup_video.cpp:477
+#: ../src/gui/setup_video.cpp:374
msgid "Transparency enabled"
msgstr "Transparencia habilitada."
-#: ../src/localplayer.cpp:895
+#: ../src/localplayer.cpp:922
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Imposible coger el objeto."
@@ -3212,7 +3296,7 @@ msgstr "Tipo:"
msgid "Unable to buy."
msgstr "Imposible comprar."
-#: ../src/net/tmwa/inventoryhandler.cpp:401
+#: ../src/net/tmwa/inventoryhandler.cpp:400
msgid "Unable to equip."
msgstr "Imposible equipar."
@@ -3224,16 +3308,16 @@ msgstr "No es posible determinar el host \""
msgid "Unable to sell."
msgstr "Imposible vender."
-#: ../src/net/tmwa/inventoryhandler.cpp:413
+#: ../src/net/tmwa/inventoryhandler.cpp:412
msgid "Unable to unequip."
msgstr "Imposible quitárselo."
-#: ../src/gui/setup_keyboard.cpp:90
+#: ../src/gui/setup_keyboard.cpp:92
msgid "Unassign"
msgstr "Retirar"
-#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
-#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
+#: ../src/gui/equipmentwindow.cpp:73 ../src/gui/inventorywindow.cpp:95
+#: ../src/gui/inventorywindow.cpp:360 ../src/gui/popupmenu.cpp:367
msgid "Unequip"
msgstr "Quitárselo"
@@ -3300,11 +3384,11 @@ msgstr "Invitación desconocida a una guild."
msgid "Unknown invite response for %s."
msgstr "Invitacion desconocida para %s."
-#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
+#: ../src/resources/itemdb.cpp:69
msgid "Unknown item"
msgstr "Objeto desconocido"
-#: ../src/localplayer.cpp:902
+#: ../src/localplayer.cpp:929
#, fuzzy
msgid "Unknown problem picking up item."
msgstr "Imposible coger el objeto."
@@ -3314,7 +3398,7 @@ msgstr "Imposible coger el objeto."
msgid "Unregister"
msgstr "Cancelar Registro"
-#: ../src/client.cpp:955
+#: ../src/client.cpp:952
msgid "Unregister Successful"
msgstr "Registro cancelado"
@@ -3322,7 +3406,7 @@ msgstr "Registro cancelado"
msgid "Unregistered ID."
msgstr "ID no registrada."
-#: ../src/gui/skilldialog.cpp:228
+#: ../src/gui/skilldialog.cpp:230
msgid "Up"
msgstr "Encima"
@@ -3330,7 +3414,7 @@ msgstr "Encima"
msgid "Updating..."
msgstr "Actualizando..."
-#: ../src/gui/inventorywindow.cpp:93
+#: ../src/gui/inventorywindow.cpp:94
msgid "Use"
msgstr "Usar"
@@ -3351,11 +3435,11 @@ msgstr "Usuario ya existe."
msgid "Username permanently erased."
msgstr "Usuario ya existe."
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Vídeo"
-#: ../src/gui/setup_video.cpp:215
+#: ../src/gui/setup_interface.cpp:105
msgid "Visible names"
msgstr "Nombres Visibles"
@@ -3378,7 +3462,7 @@ msgstr "Vitalidad %+d"
msgid "Vitality:"
msgstr "Vitalidad:"
-#: ../src/gui/npcdialog.cpp:48
+#: ../src/gui/npcdialog.cpp:49
msgid "Waiting for server"
msgstr "Esperando al servidor"
@@ -3390,16 +3474,16 @@ msgstr "Esperando al servidor..."
msgid "Warp failed..."
msgstr "Fallo al teletransportar..."
-#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/manaserv/beinghandler.cpp:310
#: ../src/net/tmwa/playerhandler.cpp:96
msgid "We regret to inform you that your character was killed in battle."
msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate."
-#: ../src/keyboardconfig.cpp:82
+#: ../src/keyboardconfig.cpp:81
msgid "Wear Outfit"
msgstr "Ponerse el conjunto"
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:112
msgid "Weight:"
msgstr "Peso:"
@@ -3471,7 +3555,7 @@ msgstr "E-mail, nombre de usuario o contraseña incorrectos."
msgid "Yes"
msgstr "Sí"
-#: ../src/net/manaserv/beinghandler.cpp:304
+#: ../src/net/manaserv/beinghandler.cpp:330
msgid "You Died"
msgstr "Has muerto"
@@ -3484,7 +3568,7 @@ msgid ""
"You are carrying more than half your weight. You are unable to regain health."
msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
-#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/manaserv/beinghandler.cpp:309
#: ../src/net/tmwa/playerhandler.cpp:95
msgid "You are dead."
msgstr "Estás muerto"
@@ -3493,7 +3577,7 @@ msgstr "Estás muerto"
msgid "You are no more."
msgstr "Tu ya no existes más."
-#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/manaserv/beinghandler.cpp:312
#: ../src/net/tmwa/playerhandler.cpp:98
msgid "You are not that alive anymore."
msgstr "Ya no estás tan vivo..."
@@ -3568,7 +3652,7 @@ msgstr "Usted no tiene suficiente nivel!"
msgid "You may have to restart your client if you want to download new music"
msgstr "Necesitas reiniciar el client si quieres descargar la musica"
-#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
+#: ../src/gui/setup_video.cpp:367 ../src/gui/setup_video.cpp:375
msgid "You must restart to apply changes."
msgstr "Debes reiniciar el cliente para aplicar los cambios."
@@ -3584,7 +3668,7 @@ msgstr "Necesitas otra Gema Roja!"
msgid "You need to use the website to register an account for this server."
msgstr "Necesitas registrarte desde la web para difrutar del juego."
-#: ../src/localplayer.cpp:920
+#: ../src/localplayer.cpp:947
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -3596,7 +3680,7 @@ msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
msgid "You picked up %s."
msgstr "Has cogido %s."
-#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/manaserv/beinghandler.cpp:324
#: ../src/net/tmwa/playerhandler.cpp:116
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
@@ -3654,7 +3738,7 @@ msgstr "Tus procesos metabólicos son ya historia."
msgid "Your name needs to be at least 4 characters."
msgstr "Su nombre debe de tener como mínimo 4 caracteres."
-#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/manaserv/beinghandler.cpp:317
#: ../src/net/tmwa/playerhandler.cpp:104
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
@@ -3666,19 +3750,19 @@ msgstr ""
msgid "[mana-file] : The mana file is an XML file (.mana)"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_interface.cpp:113
msgid "as particle"
msgstr "como partícula"
-#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
+#: ../src/gui/setup_video.cpp:136 ../src/gui/setup_video.cpp:150
msgid "high"
msgstr "alto"
-#: ../src/gui/setup_video.cpp:223
+#: ../src/gui/setup_interface.cpp:111
msgid "in chat"
msgstr "en chat"
-#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
+#: ../src/gui/setup_video.cpp:135 ../src/gui/setup_video.cpp:148
msgid "low"
msgstr "bajo"
@@ -3686,15 +3770,15 @@ msgstr "bajo"
msgid "mana [options] [mana-file]"
msgstr "mana [opciones] [archivo-mana]"
-#: ../src/gui/setup_video.cpp:189
+#: ../src/gui/setup_video.cpp:151
msgid "max"
msgstr "máximo"
-#: ../src/gui/setup_video.cpp:187
+#: ../src/gui/setup_video.cpp:149
msgid "medium"
msgstr "medio"
-#: ../src/gui/setup_video.cpp:172
+#: ../src/gui/setup_video.cpp:134
msgid "off"
msgstr "apagado"
@@ -3707,7 +3791,7 @@ msgstr "requiere una version mas nueva"
msgid "requires v%s"
msgstr "requiere v%s"
-#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/beinginfo.cpp:33 ../src/resources/itemdb.cpp:271
#: ../src/resources/monsterdb.cpp:77
msgid "unnamed"
msgstr "Sin Nombre"
@@ -3796,6 +3880,9 @@ msgstr "Sin Nombre"
#~ msgid "Access denied."
#~ msgstr "Acesso denegado."
+#~ msgid "Ambient FX: %s"
+#~ msgstr "Ambiente FX: %s"
+
#~ msgid "Ammo"
#~ msgstr "Municion"
@@ -3865,6 +3952,9 @@ msgstr "Sin Nombre"
#~ msgid "Failed to switch to "
#~ msgstr "Fallo al cambiar a "
+#~ msgid "Find Path to Mouse"
+#~ msgstr "Encontrar Camino al Mouse"
+
#~ msgid "Floating '...' bubble"
#~ msgstr "Burbuja '...' flotante"
@@ -3918,6 +4008,9 @@ msgstr "Sin Nombre"
#~ msgid "Job Level: %d"
#~ msgstr "Nivel de trabajo: %d"
+#~ msgid "Joined party."
+#~ msgstr "Entraste al grupo."
+
#~ msgid "Knife"
#~ msgstr "Navaja"
@@ -3964,6 +4057,9 @@ msgstr "Sin Nombre"
#~ msgid "Pants"
#~ msgstr "Pantalones"
+#~ msgid "Particle detail: %s"
+#~ msgstr "Detalle de partícula: %s"
+
#~ msgid "Party Window"
#~ msgstr "Ventana de Grupo"
@@ -4000,9 +4096,6 @@ msgstr "Sin Nombre"
#~ msgid "Scroll laziness"
#~ msgstr "Desplazar Laziness"
-#~ msgid "Scroll radius"
-#~ msgstr "Desplazar Radius"
-
#~ msgid "Select Server"
#~ msgstr "Selecionar Servidor"
@@ -4027,9 +4120,6 @@ msgstr "Sin Nombre"
#~ msgid "Slots: "
#~ msgstr "ranuras: "
-#~ msgid "Special %d"
-#~ msgstr "Especial %d"
-
#~ msgid "Specials Set %d"
#~ msgstr "Especiales %d"
diff --git a/po/fi.po b/po/fi.po
index cacb288b..6323cc59 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mana\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 16:50+0200\n"
+"POT-Creation-Date: 2011-06-24 01:55+0200\n"
"PO-Revision-Date: 2011-04-10 19:21+0300\n"
"Last-Translator: Sini Ruohomaa <sini.ruohomaa@iki.fi>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: ../src/gui/npcdialog.cpp:208
+#: ../src/gui/npcdialog.cpp:209
msgid ""
"\n"
"> Next\n"
@@ -101,6 +101,12 @@ msgstr " -u --skip-update : Ohita päivityslataukset"
msgid " -v --version : Display the version"
msgstr " -v --version : Näytä versionumero"
+# TODO: is it a player or something else?
+#: ../src/net/manaserv/partyhandler.cpp:126
+#, fuzzy, c-format
+msgid " on invitation from %s"
+msgstr "Tuntematon vastaus kutsuun pelaajalle %s."
+
#: ../src/gui/updatewindow.cpp:419
msgid "##1 It is strongly recommended that"
msgstr "##1 Suosittelemme vahvasti että"
@@ -130,18 +136,18 @@ msgstr "% Täysosuma"
msgid "% Evade"
msgstr "% Välttö"
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
+#: ../src/gui/debugwindow.cpp:59
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
# Note: considering Frames Per Second a "standard" unit name here
-#: ../src/gui/debugwindow.cpp:56
+#: ../src/gui/debugwindow.cpp:54
#, c-format
msgid "%d FPS (OpenGL)"
msgstr "%d FPS (OpenGL)"
-#: ../src/client.cpp:1154 ../src/client.cpp:1182
+#: ../src/client.cpp:1151 ../src/client.cpp:1179
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -186,6 +192,11 @@ msgstr "%s asetti tilan %s käyttäjälle %s."
msgid "%s is already a member of a party."
msgstr "%s kuuluu jo johonkin ryhmään."
+#: ../src/net/manaserv/partyhandler.cpp:157
+#, fuzzy, c-format
+msgid "%s is already in a party."
+msgstr "%s kuuluu jo johonkin ryhmään."
+
#: ../src/net/tmwa/partyhandler.cpp:368
#, c-format
msgid "%s is not in your party!"
@@ -196,9 +207,9 @@ msgstr "%s ei ole ryhmässäsi!"
msgid "%s is now a member of your party."
msgstr "%s on nyt ryhmäsi jäsen."
-#: ../src/net/manaserv/partyhandler.cpp:105
-#, c-format
-msgid "%s joined the party."
+#: ../src/net/manaserv/partyhandler.cpp:128
+#, fuzzy, c-format
+msgid "%s joined the party%s."
msgstr "%s liittyi ryhmään."
#: ../src/net/manaserv/chathandler.cpp:311
@@ -211,7 +222,7 @@ msgstr "%s poistui kanavalta."
msgid "%s refused your invitation."
msgstr "%s ei ottanut kutsuasi vastaan."
-#: ../src/net/manaserv/partyhandler.cpp:123
+#: ../src/net/manaserv/partyhandler.cpp:148
#, c-format
msgid "%s rejected your invite."
msgstr "%s ei ottanut kutsuasi vastaan."
@@ -235,15 +246,15 @@ msgstr "(tyhjä)"
msgid "*** only available to a GM ***"
msgstr "*** Vain GM-pelaajien käytettävissä ***"
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
-#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:464
+#: ../src/gui/buy.cpp:75 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:466
msgid "+"
msgstr "+"
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
-#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:476
+#: ../src/gui/buy.cpp:78 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:126 ../src/gui/sell.cpp:76
+#: ../src/gui/statuswindow.cpp:478
msgid "-"
msgstr "-"
@@ -445,7 +456,7 @@ msgstr ""
msgid ">"
msgstr ">"
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
+#: ../src/gui/setup_interface.cpp:78 ../src/gui/setup_players.cpp:206
msgid "???"
msgstr "???"
@@ -467,7 +478,7 @@ msgstr "Ota kiltakutsu vastaan"
msgid "Accepted party invite from %s."
msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
-#: ../src/game.cpp:738
+#: ../src/game.cpp:722
msgid "Accepting incoming trade requests"
msgstr "Hyväksyt kaupankäyntipyynnöt"
@@ -509,7 +520,7 @@ msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
msgid "Account: %s"
msgstr "Tili: %s"
-#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/popupmenu.cpp:372
msgid "Activate"
msgstr ""
@@ -517,11 +528,11 @@ msgstr ""
msgid "Add"
msgstr "Lisää"
-#: ../src/gui/popupmenu.cpp:171
+#: ../src/gui/popupmenu.cpp:174
msgid "Add name to chat"
msgstr "Lisää nimi keskusteluun"
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
+#: ../src/gui/popupmenu.cpp:193 ../src/gui/popupmenu.cpp:390
msgid "Add to chat"
msgstr "Lisää keskusteluun"
@@ -573,35 +584,31 @@ msgstr "Tällä tunnuksella on jo kirjauduttu sisään."
msgid "Already recording."
msgstr "Tallennan jo."
-#: ../src/gui/setup_video.cpp:254
-msgid "Ambient FX"
+#: ../src/gui/setup_video.cpp:191
+#, fuzzy
+msgid "Ambient FX:"
msgstr "Taustaäänet"
-#: ../src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
-msgstr "Taustaäänet: %s"
-
#: ../src/net/tmwa/partyhandler.cpp:299
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Tuntematon jäsen yritti sanoa: %s"
# Final Fantasy reference mangled to localized D. Duck reference.
-#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/manaserv/beinghandler.cpp:322
#: ../src/net/tmwa/playerhandler.cpp:112
msgid "Annihilated."
msgstr "Pim! Olet annihiloitu."
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Apply"
msgstr "Hyväksy"
-#: ../src/gui/setup_video.cpp:461
+#: ../src/gui/setup_video.cpp:358
msgid "Applying change to OpenGL requires restart."
msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:350
msgid ""
"Applying change to OpenGL requires restart. In case OpenGL messes up your "
"game graphics, restart the game with the command line option \"--no-opengl\"."
@@ -624,7 +631,7 @@ msgstr "Haluatko varmasti erota killasta %s?"
msgid "Are you sure you want to leave party %s?"
msgstr "Haluatko varmasti erota ryhmästä %s?"
-#: ../src/gui/setup_keyboard.cpp:86
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr "Aseta"
@@ -637,13 +644,13 @@ msgstr ""
msgid "Attack"
msgstr "Hyökkää"
-#: ../src/resources/itemdb.cpp:310
+#: ../src/resources/itemdb.cpp:321
#, c-format
msgid "Attack %+d"
msgstr "Hyökkäys %+d"
# TODO: Should clarify that this is a verb in trans comment.
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:161
#, c-format
msgid "Attack %s"
msgstr "Hyökkää pelaajan %s kimppuun"
@@ -660,7 +667,7 @@ msgstr "Ääni"
msgid "Authentication failed."
msgstr "Tunnistus epäonnistui."
-#: ../src/localplayer.cpp:1030
+#: ../src/localplayer.cpp:1057
msgid "Away"
msgstr "Poissa"
@@ -674,6 +681,21 @@ msgstr "Merkitse %s ystäväksesi"
msgid "Being"
msgstr "Olo"
+#: ../src/gui/debugwindow.cpp:136
+#, fuzzy
+msgid "Being collision radius"
+msgstr "Kameran perässälaahaus"
+
+# TODO: WTF?
+#: ../src/gui/debugwindow.cpp:138
+#, fuzzy
+msgid "Being path"
+msgstr "Olo"
+
+#: ../src/gui/debugwindow.cpp:137
+msgid "Being positions"
+msgstr ""
+
#: ../src/net/tmwa/playerhandler.cpp:124
msgid "Bereft of life, you rest in peace."
msgstr "Olet eloton, mutta lepäät rauhassa."
@@ -686,15 +708,15 @@ msgstr "Vilkuta nimeä"
msgid "Blue:"
msgstr "Sininen:"
-#: ../src/gui/setup_video.cpp:160
+#: ../src/gui/setup_interface.cpp:91
msgid "Bubbles with names"
msgstr "Puhekuplat nimillä"
-#: ../src/gui/setup_video.cpp:159
+#: ../src/gui/setup_interface.cpp:90
msgid "Bubbles, no names"
msgstr "Puhekuplat, ei nimiä"
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+#: ../src/gui/buy.cpp:50 ../src/gui/buy.cpp:79 ../src/gui/buysell.cpp:47
msgid "Buy"
msgstr "Osta"
@@ -705,10 +727,10 @@ msgstr "Kalibroi"
#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:178
+#: ../src/gui/popupmenu.cpp:197 ../src/gui/popupmenu.cpp:392
#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/setup.cpp:52 ../src/gui/socialwindow.cpp:275
#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
#: ../src/gui/updatewindow.cpp:144
msgid "Cancel"
@@ -773,15 +795,15 @@ msgstr "Vaihda salasana"
msgid "Change Server"
msgstr "Vaihda palvelinta"
-#: ../src/gui/setup_video.cpp:607
+#: ../src/gui/setup_video.cpp:466
msgid "Changes will take effect on map change."
msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
-#: ../src/client.cpp:848
+#: ../src/client.cpp:845
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:349
msgid "Changing to OpenGL"
msgstr "Vaihdetaan käyttämään OpenGL:ää"
@@ -802,7 +824,7 @@ msgstr "Kanavia ei tueta!"
msgid "Character deleted."
msgstr "Hahmo poistettu."
-#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
+#: ../src/gui/statuswindow.cpp:213 ../src/gui/statuswindow.cpp:250
#, c-format
msgid "Character points: %d"
msgstr "Hahmopisteitä: %d"
@@ -827,7 +849,7 @@ msgstr "Hahmon arvot ovat liian matalat. (Lurjus.)"
msgid "Chat"
msgstr "Keskustelu"
-#: ../src/keyboardconfig.cpp:75
+#: ../src/keyboardconfig.cpp:74
msgid "Chat Window"
msgstr "Keskusteluikkuna"
@@ -855,7 +877,7 @@ msgstr "Valitse killallesi nimi."
msgid "Choose your party's name."
msgstr "Anna ryhmällesi nimi."
-#: ../src/gui/npcdialog.cpp:118
+#: ../src/gui/npcdialog.cpp:119
msgid "Clear log"
msgstr "Tyhjennä loki"
@@ -876,10 +898,14 @@ msgstr "Asiakasohjelman versio on liian vanha."
msgid "Client version is too old."
msgstr "Asiakasohjelman versio on liian vanha."
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:51
msgid "Close"
msgstr "Sulje"
+#: ../src/gui/debugwindow.cpp:135
+msgid "Collision tiles"
+msgstr ""
+
#: ../src/gui/setup_colors.cpp:51
msgid "Colors"
msgstr "Värit"
@@ -1074,11 +1100,11 @@ msgstr ""
msgid "Connect"
msgstr "Yhdistä"
-#: ../src/client.cpp:661
+#: ../src/client.cpp:658
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
-#: ../src/client.cpp:838
+#: ../src/client.cpp:835
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
@@ -1090,16 +1116,16 @@ msgstr "Yhdistetään..."
msgid "Connection to server terminated. "
msgstr "Yhteys palvelimeen katkaistu. "
-#: ../src/keyboardconfig.cpp:83
+#: ../src/keyboardconfig.cpp:82
msgid "Copy Outfit"
msgstr "Kopioi asu"
-#: ../src/gui/statuswindow.cpp:256
+#: ../src/gui/statuswindow.cpp:258
#, c-format
msgid "Correction points: %d"
msgstr "Korjauspisteitä: %d"
-#: ../src/game.cpp:966
+#: ../src/game.cpp:950
msgid "Could Not Load Map"
msgstr "Kartan lataaminen epäonnistui"
@@ -1108,7 +1134,8 @@ msgid "Could not create party."
msgstr "Ryhmän luonti epäonnistui."
#: ../src/net/tmwa/guildhandler.cpp:296
-msgid "Could not inivte user to guild."
+#, fuzzy
+msgid "Could not invite user to guild."
msgstr "Pelaajan kutsuminen kiltaan epäonnistui."
#: ../src/net/tmwa/specialhandler.cpp:157
@@ -1158,7 +1185,7 @@ msgstr "Ryhmän luonti epäonnistui, ole hyvä ja valitse lyhyempi nimi."
msgid "Critical Hit"
msgstr "Täysosuma"
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: ../src/gui/debugwindow.cpp:96
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Kursori: (%d, %d)"
@@ -1167,23 +1194,23 @@ msgstr "Kursori: (%d, %d)"
msgid "Custom Server"
msgstr "Muu palvelin"
-#: ../src/gui/setup_video.cpp:213
+#: ../src/gui/setup_video.cpp:167
msgid "Custom cursor"
msgstr "Tyylitelty hiiren osoitin"
-#: ../src/gui/setup_video.cpp:460
+#: ../src/gui/setup_video.cpp:357
msgid "Deactivating OpenGL"
msgstr "Kytken OpenGL:n pois käytöstä"
-#: ../src/gui/debugwindow.cpp:43
+#: ../src/gui/debugwindow.cpp:219
msgid "Debug"
msgstr "Debug"
-#: ../src/keyboardconfig.cpp:78
+#: ../src/keyboardconfig.cpp:77
msgid "Debug Window"
msgstr "Debug-ikkuna"
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:96
msgid "Default"
msgstr "Oletus"
@@ -1191,7 +1218,7 @@ msgstr "Oletus"
msgid "Defense"
msgstr "Puolustus"
-#: ../src/resources/itemdb.cpp:311
+#: ../src/resources/itemdb.cpp:322
#, c-format
msgid "Defense %+d"
msgstr "Puolustus %+d"
@@ -1224,7 +1251,7 @@ msgstr "Näppäryys %+d"
msgid "Dexterity:"
msgstr "Näppäryys:"
-#: ../src/gui/setup_video.cpp:241
+#: ../src/gui/setup_video.cpp:181
msgid "Disable transparency (Low CPU mode)"
msgstr "Poista läpinäkyvyys (hitaille suorittimille)"
@@ -1238,7 +1265,7 @@ msgid "Disregarded"
msgstr "Vaimennettu"
# Nethack reference, no point in direct translation.
-#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/manaserv/beinghandler.cpp:320
#: ../src/net/tmwa/playerhandler.cpp:108
msgid "Do you want your possessions identified?"
msgstr "Haluatko tietää mitä rojua kanniskelit oikeasti mukanasi?"
@@ -1252,12 +1279,12 @@ msgstr "Lataa musiikki"
msgid "Downloading server list...%2.2f%%"
msgstr "Lataan palvelinluettelon...%2.2f%%"
-#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
+#: ../src/gui/inventorywindow.cpp:373 ../src/gui/popupmenu.cpp:377
msgid "Drop"
msgstr "Pudota"
-#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
-#: ../src/gui/popupmenu.cpp:372
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/inventorywindow.cpp:371
+#: ../src/gui/popupmenu.cpp:375
msgid "Drop..."
msgstr "Pudota..."
@@ -1266,7 +1293,7 @@ msgstr "Pudota..."
msgid "Duplicated login."
msgstr "Kaksinkertainen sisäänkirjautuminen."
-#: ../src/client.cpp:935
+#: ../src/client.cpp:932
msgid "Email Change"
msgstr "Sähköpostin vaihto"
@@ -1274,7 +1301,7 @@ msgstr "Sähköpostin vaihto"
msgid "Email address already exists."
msgstr "Sähköpostiosoite on jo käytössä."
-#: ../src/client.cpp:936
+#: ../src/client.cpp:933
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
@@ -1282,17 +1309,17 @@ msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
msgid "Email:"
msgstr "Sähköpostiosoite:"
-#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
-#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
-#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
-#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
-#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
-#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
#, c-format
msgid "Emote Shortcut %d"
msgstr "Eleen pikavalinta %d"
-#: ../src/keyboardconfig.cpp:80
+#: ../src/keyboardconfig.cpp:79
msgid "Emote Shortcut Window"
msgstr "Eleiden pikavalintaikkuna"
@@ -1324,12 +1351,12 @@ msgstr "Kanavalistauksen loppu."
msgid "Enter the old password first."
msgstr "Anna ensin vanha salasana."
-#: ../src/client.cpp:721
+#: ../src/client.cpp:718
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
-#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
-#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
+#: ../src/gui/inventorywindow.cpp:93 ../src/gui/inventorywindow.cpp:106
+#: ../src/gui/inventorywindow.cpp:362 ../src/gui/popupmenu.cpp:369
msgid "Equip"
msgstr "Ota käyttöön"
@@ -1337,15 +1364,15 @@ msgstr "Ota käyttöön"
msgid "Equip arrows first."
msgstr "Varusta ensin nuolia."
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+#: ../src/gui/equipmentwindow.cpp:54 ../src/gui/windowmenu.cpp:55
msgid "Equipment"
msgstr "Varusteet"
-#: ../src/keyboardconfig.cpp:72
+#: ../src/keyboardconfig.cpp:71
msgid "Equipment Window"
msgstr "Varusteikkuna"
-#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/client.cpp:1033 ../src/gui/changeemaildialog.cpp:156
#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
@@ -1359,7 +1386,7 @@ msgstr "Virhe"
msgid "Error creating guild."
msgstr "Killan luonti epäonnistui."
-#: ../src/client.cpp:1336 ../src/client.cpp:1342
+#: ../src/client.cpp:1333 ../src/client.cpp:1339
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
@@ -1371,7 +1398,7 @@ msgstr "Kanavalle liittyminen epäonnistui."
msgid "Error retreiving server list!"
msgstr "Palvelinluettelon hakeminen epäonnistui!"
-#: ../src/game.cpp:967
+#: ../src/game.cpp:951
#, c-format
msgid "Error while loading %s"
msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -1380,7 +1407,7 @@ msgstr "Kohdetta %s ladattaessa tapahtui virhe."
msgid "Exp Notification"
msgstr "Kokemusilmoitus"
-#: ../src/gui/statuswindow.cpp:122
+#: ../src/gui/statuswindow.cpp:124
msgid "Exp:"
msgstr "Kok:"
@@ -1400,7 +1427,7 @@ msgstr "Kokemuksen jako ei ole mahdollista."
msgid "Experience sharing unknown."
msgstr "Kokemuksen jaon tila on tuntematon."
-#: ../src/gui/setup_video.cpp:230
+#: ../src/gui/setup_video.cpp:171
msgid "FPS limit:"
msgstr "Piirtonopeusrajoitin (kuvaa / sekunti):"
@@ -1444,21 +1471,21 @@ msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
msgid "Failed to start recording."
msgstr "Tallentamisen aloittaminen epäonnistui."
-#: ../src/gui/setup_video.cpp:426
+#: ../src/gui/setup_video.cpp:323
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:420
+#: ../src/gui/setup_video.cpp:317
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/net/tmwa/inventoryhandler.cpp:287
+#: ../src/net/tmwa/inventoryhandler.cpp:286
msgid "Failed to use item."
msgstr "Esineen käyttö epäonnistui."
-#: ../src/client.cpp:956
+#: ../src/client.cpp:953
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
@@ -1466,16 +1493,13 @@ msgstr "Näkemisiin, tule pian takaisin..."
msgid "Female"
msgstr "Naispuolinen"
-#: ../src/keyboardconfig.cpp:56
-msgid "Find Path to Mouse"
-msgstr "Löydä polku hiiren kursorin luo"
-
#: ../src/gui/recorder.cpp:87
msgid "Finishing recording."
msgstr "Lopetan tallentamisen."
-#: ../src/gui/setup_video.cpp:256
-msgid "Font size"
+#: ../src/gui/setup_interface.cpp:130
+#, fuzzy
+msgid "Font size:"
msgstr "Kirjasimen koko"
#: ../src/commandhandler.cpp:204
@@ -1486,7 +1510,7 @@ msgstr "Saat lisätietoa komennoista kirjoittamalla /help <komennon nimi>."
msgid "Friend"
msgstr "Ystävä"
-#: ../src/gui/setup_video.cpp:211
+#: ../src/gui/setup_video.cpp:165
msgid "Full screen"
msgstr "Kokoruututila"
@@ -1494,16 +1518,16 @@ msgstr "Kokoruututila"
msgid "GM Names"
msgstr "GM-nimet"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Game"
msgstr "Peli"
-#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/manaserv/beinghandler.cpp:314
#: ../src/net/tmwa/playerhandler.cpp:100
msgid "Game Over!"
msgstr "Se siitä!"
-#: ../src/game.cpp:181
+#: ../src/game.cpp:179
msgid "General"
msgstr "Yleiset"
@@ -1524,7 +1548,11 @@ msgstr "Yhteys palvelimeen katkesi!"
msgid "Green:"
msgstr "Vihreä:"
-#: ../src/gui/setup_video.cpp:253
+#: ../src/gui/debugwindow.cpp:134
+msgid "Grid"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:129
msgid "Gui opacity"
msgstr "Käyttöliittymän läpinäkyvyys"
@@ -1559,12 +1587,12 @@ msgid "Guild name is missing."
msgstr "Killan nimi puuttuu."
# VP: voimapisteet
-#: ../src/resources/itemdb.cpp:312
+#: ../src/resources/itemdb.cpp:323
#, c-format
msgid "HP %+d"
msgstr "VP %+d"
-#: ../src/gui/statuswindow.cpp:117
+#: ../src/gui/statuswindow.cpp:119
msgid "HP:"
msgstr "VP:"
@@ -1580,7 +1608,7 @@ msgstr "Hiustyyli:"
msgid "Help"
msgstr "Apua"
-#: ../src/keyboardconfig.cpp:69
+#: ../src/keyboardconfig.cpp:68
msgid "Help Window"
msgstr "Ohjeikkuna"
@@ -1592,7 +1620,7 @@ msgstr "Piilota ikkunat"
msgid "Huh? What's that?"
msgstr "Siis mikä?"
-#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/manaserv/beinghandler.cpp:319
#: ../src/net/tmwa/playerhandler.cpp:106
msgid "I guess this did not run too well."
msgstr "Ei tainnut mennä kovin lujaa."
@@ -1620,11 +1648,11 @@ msgstr "Jos olet viimeinen henkilö kanavalla niin se katoaa."
msgid "Ignore %s"
msgstr "Jätä %s huomiotta"
-#: ../src/keyboardconfig.cpp:103
+#: ../src/keyboardconfig.cpp:102
msgid "Ignore input 1"
msgstr "Jätä huomiotta syöte 1"
-#: ../src/keyboardconfig.cpp:104
+#: ../src/keyboardconfig.cpp:103
msgid "Ignore input 2"
msgstr "Jätä huomiotta syöte 2"
@@ -1632,7 +1660,7 @@ msgstr "Jätä huomiotta syöte 2"
msgid "Ignored"
msgstr "Huomiotta jätetty"
-#: ../src/game.cpp:733
+#: ../src/game.cpp:717
msgid "Ignoring incoming trade requests"
msgstr "Et huomioi kaupankäyntipyyntöjä"
@@ -1640,7 +1668,7 @@ msgstr "Et huomioi kaupankäyntipyyntöjä"
msgid "Ignoring incoming trade requests."
msgstr "Jätät tulevat kaupantekoehdotukset huomiotta."
-#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/gui/debugwindow.cpp:235 ../src/net/manaserv/charhandler.cpp:210
#: ../src/net/tmwa/charserverhandler.cpp:146
msgid "Info"
msgstr "Tietoja"
@@ -1677,6 +1705,10 @@ msgstr "Älykkyys %+d"
msgid "Intelligence:"
msgstr "Älykkyys:"
+#: ../src/gui/setup_interface.cpp:120
+msgid "Interface"
+msgstr ""
+
#: ../src/net/manaserv/charhandler.cpp:267
#, fuzzy
msgid "Invalid character slot selected."
@@ -1703,20 +1735,20 @@ msgstr "Epäkelpo nimi."
msgid "Invalid slot number."
msgstr "Epäkelpo nimi."
-#: ../src/client.cpp:1302
+#: ../src/client.cpp:1299
#, c-format
msgid "Invalid update host: %s"
msgstr "Epäkelpo päivitysosoite: %s"
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+#: ../src/gui/inventorywindow.cpp:60 ../src/gui/windowmenu.cpp:56
msgid "Inventory"
msgstr "Tavarat"
-#: ../src/keyboardconfig.cpp:71
+#: ../src/keyboardconfig.cpp:70
msgid "Inventory Window"
msgstr "Tavaraikkuna"
-#: ../src/localplayer.cpp:898
+#: ../src/localplayer.cpp:925
#, fuzzy
msgid "Inventory is full."
msgstr "Tavarat"
@@ -1730,7 +1762,7 @@ msgstr "Kutsu"
msgid "Invite %s to join your guild"
msgstr "Kutsu %s kiltaasi"
-#: ../src/gui/popupmenu.cpp:134
+#: ../src/gui/popupmenu.cpp:136
#, c-format
msgid "Invite %s to join your party"
msgstr "Kutsu %s ryhmääsi"
@@ -1754,29 +1786,29 @@ msgstr "Käyttäjä %s kutsuttu ryhmään."
msgid "Inviting failed, because you can't see a player called %s."
msgstr "Kutsu epäonnistui: et näe käyttäjää %s."
-#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
-#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
-#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
-#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
-#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
-#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:56 ../src/keyboardconfig.cpp:57
+#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
+#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
+#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
+#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
+#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
#, c-format
msgid "Item Shortcut %d"
msgstr "Esinepikavalinta %d"
-#: ../src/keyboardconfig.cpp:76
+#: ../src/keyboardconfig.cpp:75
msgid "Item Shortcut Window"
msgstr "Esineiden pikavalintaikkuna"
-#: ../src/localplayer.cpp:901
+#: ../src/localplayer.cpp:928
msgid "Item belongs to someone else."
msgstr ""
-#: ../src/localplayer.cpp:897
+#: ../src/localplayer.cpp:924
msgid "Item is too far away"
msgstr ""
-#: ../src/localplayer.cpp:896
+#: ../src/localplayer.cpp:923
msgid "Item is too heavy."
msgstr ""
@@ -1796,33 +1828,39 @@ msgstr "Esineiden jakaminen ei ole mahdollista."
msgid "Item sharing unknown."
msgstr "Esineiden jaon tila on tuntematon."
-#: ../src/client.cpp:785
+#: ../src/client.cpp:782
#, fuzzy
msgid "ItemDB: Error while loading "
msgstr "Kohdetta %s ladattaessa tapahtui virhe."
-#: ../src/gui/statuswindow.cpp:159
+#: ../src/gui/statuswindow.cpp:161
msgid "Job:"
msgstr "Työ:"
-#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
+#: ../src/gui/statuswindow.cpp:160 ../src/gui/statuswindow.cpp:278
#, c-format
msgid "Job: %d"
msgstr "Työ: %d"
-#: ../src/net/manaserv/partyhandler.cpp:87
-msgid "Joined party."
-msgstr "Liityit ryhmään."
+#: ../src/net/manaserv/partyhandler.cpp:98
+msgid ""
+"Joining party failed, because the invitation has timed out on the server."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:102
+#, fuzzy
+msgid "Joining party failed, because the inviter has left the game."
+msgstr "Ryhmän luonti epäonnistui, ole hyvä ja valitse lyhyempi nimi."
#: ../src/gui/setup_joystick.cpp:41
msgid "Joystick"
msgstr "Peliohjain"
-#: ../src/gui/setup_keyboard.cpp:125
+#: ../src/gui/setup_keyboard.cpp:127
msgid "Key Conflict(s) Detected."
msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
-#: ../src/gui/setup_keyboard.cpp:77
+#: ../src/gui/setup_keyboard.cpp:78
msgid "Keyboard"
msgstr "Näppäimistö"
@@ -1831,11 +1869,11 @@ msgid "Kick failed!"
msgstr "Potkiminen epäonnistui!"
# TODO: What?
-#: ../src/gui/popupmenu.cpp:163
+#: ../src/gui/popupmenu.cpp:166
msgid "Kick monster"
msgstr "Potkaise hirviötä"
-#: ../src/gui/popupmenu.cpp:141
+#: ../src/gui/popupmenu.cpp:144
msgid "Kick player"
msgstr "Potki pelaaja pois"
@@ -1843,7 +1881,7 @@ msgstr "Potki pelaaja pois"
msgid "Kick succeeded!"
msgstr "Potkiminen onnistui!"
-#: ../src/gui/setup_video.cpp:131
+#: ../src/gui/setup_interface.cpp:62
msgid "Large"
msgstr "Suuri"
@@ -1859,8 +1897,8 @@ msgstr "Eroa killasta?"
msgid "Leave Party?"
msgstr "Eroa ryhmästä?"
-#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
-#: ../src/gui/statuswindow.cpp:263
+#: ../src/gui/statuswindow.cpp:115 ../src/gui/statuswindow.cpp:217
+#: ../src/gui/statuswindow.cpp:265
#, c-format
msgid "Level: %d"
msgstr "Taso: %d"
@@ -1884,11 +1922,11 @@ msgstr "Paikallinen pelaaja lyö hirviötä"
msgid "Local Player Miss"
msgstr "Paikallisen pelaajan huti"
-#: ../src/gui/setup_video.cpp:220
+#: ../src/gui/setup_interface.cpp:108
msgid "Log NPC dialogue"
msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
-#: ../src/client.cpp:688
+#: ../src/client.cpp:685
msgid "Logging in"
msgstr "Kirjaudun sisään"
@@ -1900,7 +1938,7 @@ msgstr "Kirjaudu sisään"
msgid "Login attempt too soon after previous attempt."
msgstr "Sisäänkirjautumista yritetty liian pian edellisen yrityksen jälḱeen."
-#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/manaserv/beinghandler.cpp:323
#: ../src/net/tmwa/playerhandler.cpp:114
msgid "Looks like you got your head handed to you."
msgstr "Jäi näköjään oma pää vetävän käteen."
@@ -1918,12 +1956,12 @@ msgstr "Tuuri %+d"
msgid "Luck:"
msgstr "Tuuri:"
-#: ../src/gui/skilldialog.cpp:470
+#: ../src/gui/skilldialog.cpp:472
#, c-format
msgid "Lvl: %d"
msgstr "Taso: %d"
-#: ../src/gui/skilldialog.cpp:459
+#: ../src/gui/skilldialog.cpp:461
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Taso: %d (%+d)"
@@ -1937,12 +1975,12 @@ msgid "M.Defense"
msgstr "T.-puolustus"
# MP: manapisteet (ei taikapisteet, ollaanhan MANA worldissa!)
-#: ../src/resources/itemdb.cpp:313
+#: ../src/resources/itemdb.cpp:324
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: ../src/gui/statuswindow.cpp:130
+#: ../src/gui/statuswindow.cpp:132
msgid "MP:"
msgstr "MP:"
@@ -1955,22 +1993,22 @@ msgstr "MVP-pelaaja."
msgid "Male"
msgstr "Miespuolinen"
-#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:87
msgid "Map"
msgstr "Kartta"
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: ../src/gui/debugwindow.cpp:103
#, c-format
msgid "Map: %s"
msgstr "Kartta: %s"
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
-#: ../src/gui/statuswindow.cpp:497
+#: ../src/gui/buy.cpp:81 ../src/gui/sell.cpp:79
+#: ../src/gui/statuswindow.cpp:387 ../src/gui/statuswindow.cpp:465
+#: ../src/gui/statuswindow.cpp:499
msgid "Max"
msgstr "Max"
-#: ../src/gui/setup_video.cpp:130
+#: ../src/gui/setup_interface.cpp:61
msgid "Medium"
msgstr "Keskikokoinen"
@@ -1998,11 +2036,11 @@ msgstr "Viesti sulkee keskustelun."
msgid "Message now closes chat."
msgstr "Nyt viesti sulkee keskustelun."
-#: ../src/keyboardconfig.cpp:74
+#: ../src/keyboardconfig.cpp:73
msgid "Minimap Window"
msgstr "Karttaikkuna"
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
+#: ../src/gui/debugwindow.cpp:101
#, c-format
msgid "Minimap: %s"
msgstr "Pikkukartta: %s"
@@ -2011,8 +2049,8 @@ msgstr "Pikkukartta: %s"
msgid "Misses"
msgstr "Hudit"
-#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
-#: ../src/gui/statuswindow.cpp:240
+#: ../src/gui/statuswindow.cpp:116 ../src/gui/statuswindow.cpp:210
+#: ../src/gui/statuswindow.cpp:242
#, c-format
msgid "Money: %s"
msgstr "Rahat: %s"
@@ -2025,6 +2063,10 @@ msgstr "Hirviö lyö pelaajaa"
msgid "Monsters"
msgstr "Hirviöt"
+#: ../src/gui/debugwindow.cpp:139
+msgid "Mouse path"
+msgstr ""
+
#: ../src/keyboardconfig.cpp:40
msgid "Move Down"
msgstr "Alaspäin"
@@ -2045,12 +2087,12 @@ msgstr "Ylöspäin"
msgid "Music volume"
msgstr "Musiikin voimakkuus"
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#: ../src/gui/debugwindow.cpp:100
#, c-format
msgid "Music: %s"
msgstr "Musiikki: %s"
-#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
+#: ../src/gui/npcdialog.cpp:74 ../src/gui/npcpostdialog.cpp:41
msgid "NPC"
msgstr "Ei-pelaajahahmo (NPC)"
@@ -2073,7 +2115,7 @@ msgid "Name: %s"
msgstr "Nimi: %s"
# TODO: What?
-#: ../src/gui/ministatus.cpp:236
+#: ../src/gui/ministatus.cpp:234
msgid "Need"
msgstr "Tarvitaan"
@@ -2085,7 +2127,7 @@ msgstr "Anna potkittavan käyttäjän nimi!"
msgid "Need a user to op!"
msgstr "Anna operaattoriksi korotettavan käyttäjän nimi!"
-#: ../src/game.cpp:386
+#: ../src/game.cpp:374
msgid "Network Error"
msgstr "Verkkovirhe"
@@ -2105,11 +2147,11 @@ msgstr "Uusi salasana on väärä."
msgid "New password too short."
msgstr "Uusi salasana on liian lyhyt."
-#: ../src/gui/npcdialog.cpp:49
+#: ../src/gui/npcdialog.cpp:50
msgid "Next"
msgstr "Seuraava"
-#: ../src/keyboardconfig.cpp:100
+#: ../src/keyboardconfig.cpp:99
msgid "Next Chat Tab"
msgstr "Seuraava keskusteluvälilehti"
@@ -2133,11 +2175,11 @@ msgstr "Pelipalvelimia ei ole saatavilla."
msgid "No servers available."
msgstr "Palvelimia ei saatavilla."
-#: ../src/gui/setup_video.cpp:157
+#: ../src/gui/setup_interface.cpp:88
msgid "No text"
msgstr "Ei tekstiä"
-#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/manaserv/beinghandler.cpp:315
#: ../src/net/tmwa/playerhandler.cpp:102
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
@@ -2147,11 +2189,15 @@ msgstr ""
"paikkaan."
# TODO: Hm.
-#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
-#: ../src/gui/setup_video.cpp:656
+#: ../src/gui/setup_video.cpp:200 ../src/gui/setup_video.cpp:407
+#: ../src/gui/setup_video.cpp:487
msgid "None"
msgstr "-"
+#: ../src/gui/debugwindow.cpp:142
+msgid "Normal"
+msgstr ""
+
#: ../src/gui/recorder.cpp:91
msgid "Not currently recording."
msgstr "En tallenna tällä hetkellä."
@@ -2184,12 +2230,12 @@ msgstr "Vanha sähköpostiosoite ei kelpaa."
msgid "Old password incorrect."
msgstr "Vanha salsana on väärä."
-#: ../src/net/tmwa/gamehandler.cpp:89
+#: ../src/net/tmwa/gamehandler.cpp:83
#, c-format
msgid "Online users: %d"
msgstr "Käyttäjiä palvelimella: %d"
-#: ../src/gui/setup_video.cpp:212
+#: ../src/gui/setup_video.cpp:166
msgid "OpenGL"
msgstr "OpenGL"
@@ -2218,23 +2264,24 @@ msgstr "Muiden pelaajien nimet"
msgid "Outfit: %d"
msgstr "Asu: %d"
-#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
+#: ../src/gui/inventorywindow.cpp:110 ../src/gui/outfitwindow.cpp:51
msgid "Outfits"
msgstr "Asukokonaisuudet"
-#: ../src/keyboardconfig.cpp:81
+#: ../src/keyboardconfig.cpp:80
msgid "Outfits Window"
msgstr "Asukokonaisuusikkuna"
-#: ../src/gui/setup_video.cpp:252
-msgid "Overhead text"
+#: ../src/gui/setup_interface.cpp:128
+#, fuzzy
+msgid "Overhead text:"
msgstr "Tekstinä yläpuolella"
#: ../src/resources/userpalette.cpp:93
msgid "Own Name"
msgstr "Oma nimi"
-#: ../src/gui/setup_video.cpp:606
+#: ../src/gui/setup_video.cpp:465
msgid "Particle Effect Settings Changed."
msgstr "Hiukkastehosteiden asetuksia on muutettu."
@@ -2242,21 +2289,17 @@ msgstr "Hiukkastehosteiden asetuksia on muutettu."
msgid "Particle Effects"
msgstr "Hiukkastehosteet"
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#: ../src/gui/debugwindow.cpp:107
#, c-format
msgid "Particle count: %d"
msgstr "Hiukkasluku: %d"
-#: ../src/gui/setup_video.cpp:255
-msgid "Particle detail"
+#: ../src/gui/setup_video.cpp:192
+#, fuzzy
+msgid "Particle detail:"
msgstr "Hiukkastehosteiden yksityiskohtaisuus"
-#: ../src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Hiukkastehosteiden yksityiskohtaisuus: %s"
-
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:169
msgid "Particle effects"
msgstr "Hiukkastehosteet"
@@ -2278,6 +2321,18 @@ msgstr "Ryhmän jäsenet"
msgid "Party Name"
msgstr "Ryhmän nimi"
+#: ../src/net/manaserv/partyhandler.cpp:152
+msgid ""
+"Party invitation rejected by server, because of too many invitations in a "
+"short time."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:75
+#, c-format
+msgid ""
+"Party invite failed, because no player called %s is within the visual range."
+msgstr ""
+
#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
msgid "Party name is missing."
msgstr "Ryhmän nimi puuttuu."
@@ -2291,11 +2346,11 @@ msgstr "Ryhmä luotu."
msgid "Party: %s"
msgstr "Ryhmä: %s"
-#: ../src/client.cpp:916
+#: ../src/client.cpp:913
msgid "Password Change"
msgstr "Salasanan vaihto"
-#: ../src/client.cpp:917
+#: ../src/client.cpp:914
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
@@ -2308,7 +2363,7 @@ msgstr "Salasana:"
msgid "Passwords do not match."
msgstr "Salasanat eivät täsmää."
-#: ../src/gui/popupmenu.cpp:188
+#: ../src/gui/popupmenu.cpp:191
#, c-format
msgid "Pick up %s"
msgstr "Ota %s"
@@ -2400,7 +2455,7 @@ msgstr "Valmistelen latausta"
msgid "Present: %s; %d players are present."
msgstr "Läsnä: %s; %d pelaajaa paikalla."
-#: ../src/net/manaserv/beinghandler.cpp:303
+#: ../src/net/manaserv/beinghandler.cpp:329
msgid "Press OK to respawn."
msgstr "Paina OK syntyäksesi uudelleen."
@@ -2408,12 +2463,12 @@ msgstr "Paina OK syntyäksesi uudelleen."
msgid "Press the button to start calibration"
msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
-#: ../src/keyboardconfig.cpp:99
+#: ../src/keyboardconfig.cpp:98
msgid "Previous Chat Tab"
msgstr "Edellinen keskusteluvälilehti"
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:288
+#: ../src/gui/buy.cpp:70 ../src/gui/buy.cpp:277 ../src/gui/sell.cpp:72
+#: ../src/gui/sell.cpp:298
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Hinta: %s / Kaikkiaan: %s"
@@ -2435,10 +2490,10 @@ msgstr "Sykkivä"
msgid "Put all whispers in tabs"
msgstr "Laita kaikki kuiskaukset välilehtiin"
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/buy.cpp:80 ../src/gui/quitdialog.cpp:40
#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
-#: ../src/keyboardconfig.cpp:102
+#: ../src/gui/sell.cpp:78 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:101
msgid "Quit"
msgstr "Sulje"
@@ -2501,15 +2556,15 @@ msgstr "Muista käyttäjätunnus"
msgid "Request for Trade"
msgstr "Kaupantekoehdotus"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Request to quit denied!"
msgstr "Lopetuspyyntö evätty!"
-#: ../src/client.cpp:809
+#: ../src/client.cpp:806
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
-#: ../src/client.cpp:889
+#: ../src/client.cpp:886
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
@@ -2519,23 +2574,23 @@ msgid "Requesting to join channel %s."
msgstr "Pyyntö liittyä kanavalle %s lähetetty."
# TODO: Hmm?
-#: ../src/gui/npcdialog.cpp:134
+#: ../src/gui/npcdialog.cpp:135
msgid "Reset"
msgstr "Nollaa"
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Reset Windows"
msgstr "Palauta ikkunoiden oletusasetukset"
-#: ../src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:335
msgid "Restart needed for changes to take effect."
msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
-#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
+#: ../src/gui/setup_video.cpp:442 ../src/gui/setup_video.cpp:447
msgid "Restart your client for the change to take effect."
msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
-#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
+#: ../src/gui/inventorywindow.cpp:133 ../src/gui/popupmenu.cpp:388
msgid "Retrieve"
msgstr "Ota"
@@ -2552,17 +2607,17 @@ msgid "Rotate the stick"
msgstr "Pyöräytä ohjainta ääriasennoissaan"
# Secret of Mana reference.
-#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/manaserv/beinghandler.cpp:321
#: ../src/net/tmwa/playerhandler.cpp:110
msgid "Sadly, no trace of you was ever found..."
msgstr "Ikävä kyllä sinusta ei jäänyt lopulta jälkeäkään löydettäväksi..."
-#: ../src/game.cpp:354
+#: ../src/game.cpp:342
msgid "Saving screenshot failed!"
msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
# TODO: Screen resolution?? It's really used for window size, AFAIK.
-#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
+#: ../src/gui/setup_video.cpp:441 ../src/gui/setup_video.cpp:446
msgid "Screen Resolution Changed"
msgstr "Ikkunan koko vaihdettu"
@@ -2570,19 +2625,19 @@ msgstr "Ikkunan koko vaihdettu"
msgid "Screenshot"
msgstr "Kuvankaappaus"
-#: ../src/game.cpp:349
+#: ../src/game.cpp:337
msgid "Screenshot saved as "
msgstr "Ruutukaappaus tallennettu nimellä "
-#: ../src/keyboardconfig.cpp:98
+#: ../src/keyboardconfig.cpp:97
msgid "Scroll Chat Down"
msgstr "Vieritä keskustelua alas"
-#: ../src/keyboardconfig.cpp:97
+#: ../src/keyboardconfig.cpp:96
msgid "Scroll Chat Up"
msgstr "Vieritä keskustelua ylös"
-#: ../src/gui/inventorywindow.cpp:87
+#: ../src/gui/inventorywindow.cpp:88
msgid "Search:"
msgstr ""
@@ -2590,7 +2645,7 @@ msgstr ""
msgid "Seems you need more money... ;-)"
msgstr "Näyttää siltä että tarvitset lisää rahaa."
-#: ../src/keyboardconfig.cpp:101
+#: ../src/keyboardconfig.cpp:100
msgid "Select OK"
msgstr "Valitse OK"
@@ -2622,7 +2677,7 @@ msgstr "Anna vaihtokaupattavien tavaroiden määrä."
msgid "Selection out of range."
msgstr "Valinta sallittujen arvojen ulkopuolella."
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:50 ../src/gui/sell.cpp:77
msgid "Sell"
msgstr "Myy"
@@ -2646,11 +2701,11 @@ msgstr "Palvelintyyppi:"
msgid "Server:"
msgstr "Palvelin:"
-#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+#: ../src/client.cpp:577 ../src/gui/setup.cpp:44 ../src/gui/windowmenu.cpp:66
msgid "Setup"
msgstr "Asetukset"
-#: ../src/keyboardconfig.cpp:77
+#: ../src/keyboardconfig.cpp:76
msgid "Setup Window"
msgstr "Asetusikkuna"
@@ -2674,7 +2729,7 @@ msgstr "Näytä IP: pois päältä"
msgid "Show IP: On"
msgstr "Näytä IP: päällä"
-#: ../src/gui/setup_video.cpp:246
+#: ../src/gui/setup_interface.cpp:125
msgid "Show damage"
msgstr "Näytä vahinko"
@@ -2682,14 +2737,20 @@ msgstr "Näytä vahinko"
msgid "Show gender"
msgstr "Näytä sukupuoli"
-#: ../src/gui/setup_video.cpp:219
+#: ../src/gui/setup_interface.cpp:107
msgid "Show own name"
msgstr "Näytä oma nimi"
-#: ../src/gui/setup_video.cpp:221
-msgid "Show pickup notification"
+#: ../src/gui/setup_interface.cpp:109
+#, fuzzy
+msgid "Show pickup notification:"
msgstr "Näytä ottoviesti"
+#: ../src/gui/debugwindow.cpp:133
+#, fuzzy
+msgid "Show:"
+msgstr "Näytä IP: päällä"
+
#: ../src/keyboardconfig.cpp:53
msgid "Sit"
msgstr "Istu"
@@ -2698,21 +2759,21 @@ msgstr "Istu"
msgid "Sit failed!"
msgstr "Istuminen epäonnistui!"
-#: ../src/gui/skilldialog.cpp:377
+#: ../src/gui/skilldialog.cpp:379
#, c-format
msgid "Skill %d"
msgstr "Taito %d"
-#: ../src/gui/skilldialog.cpp:368
+#: ../src/gui/skilldialog.cpp:370
#, c-format
msgid "Skill Set %d"
msgstr "Taitojoukko %d"
-#: ../src/keyboardconfig.cpp:73
+#: ../src/keyboardconfig.cpp:72
msgid "Skill Window"
msgstr "Taitoikkuna"
-#: ../src/gui/skilldialog.cpp:273
+#: ../src/gui/skilldialog.cpp:275
#, c-format
msgid "Skill points available: %d"
msgstr "%d taitopistettä käyttämättä"
@@ -2721,11 +2782,11 @@ msgstr "%d taitopistettä käyttämättä"
msgid "Skills"
msgstr "Taidot"
-#: ../src/gui/inventorywindow.cpp:86
+#: ../src/gui/inventorywindow.cpp:87
msgid "Slots:"
msgstr "Paikkoja:"
-#: ../src/gui/setup_video.cpp:129
+#: ../src/gui/setup_interface.cpp:60
msgid "Small"
msgstr "Pieni"
@@ -2737,11 +2798,11 @@ msgstr "Hymiö"
msgid "Social"
msgstr "Suhteet"
-#: ../src/keyboardconfig.cpp:79
+#: ../src/keyboardconfig.cpp:78
msgid "Social Window"
msgstr "Suhdeikkuna"
-#: ../src/gui/setup_video.cpp:573
+#: ../src/gui/setup_video.cpp:444
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
@@ -2758,11 +2819,32 @@ msgstr "Ääni"
msgid "Sound Engine"
msgstr "Äänimoottori"
+#: ../src/gui/debugwindow.cpp:143
+#, fuzzy
+msgid "Special 1"
+msgstr "Erikoisuus %d"
+
+#: ../src/gui/debugwindow.cpp:144
+#, fuzzy
+msgid "Special 2"
+msgstr "Erikoisuus %d"
+
+#: ../src/gui/debugwindow.cpp:145
+#, fuzzy
+msgid "Special 3"
+msgstr "Erikoisuus %d"
+
# TODO: Say what
#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
msgid "Specials"
msgstr "Erikoisuudet"
+# TODO: Say what
+#: ../src/gui/debugwindow.cpp:141
+#, fuzzy
+msgid "Specials:"
+msgstr "Erikoisuudet"
+
#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
#: ../src/gui/setup_colors.cpp:333
msgid "Spectrum"
@@ -2772,11 +2854,11 @@ msgstr "Spektri"
msgid "Speed hack detected."
msgstr "Nopeusviritelmä havaittu."
-#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/popupmenu.cpp:381
msgid "Split"
msgstr "Jaa"
-#: ../src/localplayer.cpp:899
+#: ../src/localplayer.cpp:926
msgid "Stack is too big."
msgstr ""
@@ -2792,7 +2874,7 @@ msgstr "Staattinen"
msgid "Status"
msgstr "Hahmon tiedot"
-#: ../src/keyboardconfig.cpp:70
+#: ../src/keyboardconfig.cpp:69
msgid "Status Window"
msgstr "Tilaikkuna"
@@ -2808,11 +2890,11 @@ msgstr "Keskeytä hyökkäys"
msgid "Stop recording"
msgstr "Lopeta tallentaminen"
-#: ../src/gui/inventorywindow.cpp:59
+#: ../src/gui/inventorywindow.cpp:60
msgid "Storage"
msgstr "Varasto"
-#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:361
msgid "Store"
msgstr "Varastoi"
@@ -2835,7 +2917,7 @@ msgstr "Voima %+d"
msgid "Strength:"
msgstr "Voima:"
-#: ../src/gui/npcdialog.cpp:51
+#: ../src/gui/npcdialog.cpp:52
msgid "Submit"
msgstr "Lähetä"
@@ -2851,7 +2933,12 @@ msgstr "Vaihda hahmoa"
msgid "Switch server"
msgstr "Vaihda palvelinta"
-#: ../src/gui/setup_video.cpp:437
+#: ../src/gui/debugwindow.cpp:239
+#, fuzzy
+msgid "Switches"
+msgstr "Vaihda palvelinta"
+
+#: ../src/gui/setup_video.cpp:334
msgid "Switching to Full Screen"
msgstr "Vaihdan kokoruututilaan"
@@ -2859,7 +2946,7 @@ msgstr "Vaihdan kokoruututilaan"
msgid "Talk"
msgstr "Keskustele"
-#: ../src/gui/popupmenu.cpp:150
+#: ../src/gui/popupmenu.cpp:153
#, c-format
msgid "Talk to %s"
msgstr "Puhu pelaajalle %s"
@@ -2880,7 +2967,7 @@ msgstr "Kohdista ei-pelaajahahmoon"
msgid "Target Player"
msgstr "Kohdista pelaajaan"
-#: ../src/gui/setup_video.cpp:158
+#: ../src/gui/setup_interface.cpp:89
msgid "Text"
msgstr "Teksti"
@@ -2892,12 +2979,12 @@ msgstr "Kiitos kaupoista."
msgid "Thanks for selling."
msgstr "Kiitos kaupoista."
-#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/manaserv/beinghandler.cpp:313
#: ../src/net/tmwa/playerhandler.cpp:99
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Tuonelasta käy sieluusi kylmä viima."
-#: ../src/game.cpp:385
+#: ../src/game.cpp:373
msgid "The connection to the server was lost."
msgstr "Yhteys palvelimeen katkesi."
@@ -3129,7 +3216,7 @@ msgstr ""
msgid "This is what the color looks like"
msgstr "Väri näyttää tältä"
-#: ../src/client.cpp:783
+#: ../src/client.cpp:780
#, fuzzy
msgid ""
"This server is missing needed world data. Please contact the administrator"
@@ -3142,7 +3229,7 @@ msgstr ""
msgid "This user name is already taken."
msgstr "Käyttäjätunnus on jo käytössä."
-#: ../src/gui/setup_video.cpp:128
+#: ../src/gui/setup_interface.cpp:59
msgid "Tiny"
msgstr "Pikkuruinen"
@@ -3150,7 +3237,7 @@ msgstr "Pikkuruinen"
msgid "To:"
msgstr "Vastaanottaja:"
-#: ../src/keyboardconfig.cpp:96
+#: ../src/keyboardconfig.cpp:95
msgid "Toggle Chat"
msgstr "Ota keskustelu käyttöön/pois käytöstä"
@@ -3216,15 +3303,15 @@ msgstr "Kaupanteko ei ole mahdollista. kauppa kumppani on liian kaukana."
msgid "Trading with %s"
msgstr "Kaupantekoa pelaajan %s kanssa"
-#: ../src/gui/setup_video.cpp:469
+#: ../src/gui/setup_video.cpp:366
msgid "Transparency disabled"
msgstr "Läpinäkyvyys poistettu käytöstä"
-#: ../src/gui/setup_video.cpp:477
+#: ../src/gui/setup_video.cpp:374
msgid "Transparency enabled"
msgstr "Läpinäkyvyys käytössä"
-#: ../src/localplayer.cpp:895
+#: ../src/localplayer.cpp:922
#, fuzzy
msgid "Tried to pick up nonexistent item."
msgstr "Esineen ottaminen epäonnistui."
@@ -3249,7 +3336,7 @@ msgstr "Tyyppi:"
msgid "Unable to buy."
msgstr "Ostaminen epäonnistui."
-#: ../src/net/tmwa/inventoryhandler.cpp:401
+#: ../src/net/tmwa/inventoryhandler.cpp:400
msgid "Unable to equip."
msgstr "Käyttöönotto epäonnistui."
@@ -3262,16 +3349,16 @@ msgstr "Osoitetta ei löydy: \""
msgid "Unable to sell."
msgstr "Myyminen epäonnistui."
-#: ../src/net/tmwa/inventoryhandler.cpp:413
+#: ../src/net/tmwa/inventoryhandler.cpp:412
msgid "Unable to unequip."
msgstr "Käytöstä poisto epäonnistui."
-#: ../src/gui/setup_keyboard.cpp:90
+#: ../src/gui/setup_keyboard.cpp:92
msgid "Unassign"
msgstr "Poista asetus"
-#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
-#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
+#: ../src/gui/equipmentwindow.cpp:73 ../src/gui/inventorywindow.cpp:95
+#: ../src/gui/inventorywindow.cpp:360 ../src/gui/popupmenu.cpp:367
msgid "Unequip"
msgstr "Poista varuste käytöstä"
@@ -3339,11 +3426,11 @@ msgstr "Tuntematon vastaus kiltakutsuun."
msgid "Unknown invite response for %s."
msgstr "Tuntematon vastaus kutsuun pelaajalle %s."
-#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
+#: ../src/resources/itemdb.cpp:69
msgid "Unknown item"
msgstr "Tuntematon esine"
-#: ../src/localplayer.cpp:902
+#: ../src/localplayer.cpp:929
#, fuzzy
msgid "Unknown problem picking up item."
msgstr "Esineen ottaminen epäonnistui."
@@ -3354,7 +3441,7 @@ msgid "Unregister"
msgstr "Poista palvelimelta"
# TODO: Unregister?! That's not English.
-#: ../src/client.cpp:955
+#: ../src/client.cpp:952
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
@@ -3362,7 +3449,7 @@ msgstr "Tietojen poisto onnistui"
msgid "Unregistered ID."
msgstr "Rekisteröimätön tunniste."
-#: ../src/gui/skilldialog.cpp:228
+#: ../src/gui/skilldialog.cpp:230
msgid "Up"
msgstr "Ylös"
@@ -3370,7 +3457,7 @@ msgstr "Ylös"
msgid "Updating..."
msgstr "Päivitetään..."
-#: ../src/gui/inventorywindow.cpp:93
+#: ../src/gui/inventorywindow.cpp:94
msgid "Use"
msgstr "Käytä"
@@ -3391,11 +3478,11 @@ msgstr "Käyttäjätunnus on jo käytössä."
msgid "Username permanently erased."
msgstr "Käyttäjätunnus on jo käytössä."
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Kuva"
-#: ../src/gui/setup_video.cpp:215
+#: ../src/gui/setup_interface.cpp:105
msgid "Visible names"
msgstr "Näytä nimet"
@@ -3418,7 +3505,7 @@ msgstr "Elinvoima %+d"
msgid "Vitality:"
msgstr "Elinvoima:"
-#: ../src/gui/npcdialog.cpp:48
+#: ../src/gui/npcdialog.cpp:49
msgid "Waiting for server"
msgstr "Odotetaan palvelinta"
@@ -3430,16 +3517,16 @@ msgstr "Odotan palvelinta..."
msgid "Warp failed..."
msgstr "Siirtymä (warp) epäonnistui..."
-#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/manaserv/beinghandler.cpp:310
#: ../src/net/tmwa/playerhandler.cpp:96
msgid "We regret to inform you that your character was killed in battle."
msgstr "Ikävä kyllä joudumme kertomaan hahmosi kuolleen taistelussa."
-#: ../src/keyboardconfig.cpp:82
+#: ../src/keyboardconfig.cpp:81
msgid "Wear Outfit"
msgstr "Pue asu"
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:112
msgid "Weight:"
msgstr "Paino:"
@@ -3511,7 +3598,7 @@ msgstr "Väärä käyttäjätunnus, salasana tai sähköpostiosoite."
msgid "Yes"
msgstr "Kyllä"
-#: ../src/net/manaserv/beinghandler.cpp:304
+#: ../src/net/manaserv/beinghandler.cpp:330
msgid "You Died"
msgstr "Kuolit"
@@ -3525,7 +3612,7 @@ msgid ""
"You are carrying more than half your weight. You are unable to regain health."
msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
-#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/manaserv/beinghandler.cpp:309
#: ../src/net/tmwa/playerhandler.cpp:95
msgid "You are dead."
msgstr "Olet kuollut."
@@ -3534,7 +3621,7 @@ msgstr "Olet kuollut."
msgid "You are no more."
msgstr "Olet lakannut olemasta."
-#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/manaserv/beinghandler.cpp:312
#: ../src/net/tmwa/playerhandler.cpp:98
msgid "You are not that alive anymore."
msgstr "Et ole enää erityisen elossa."
@@ -3612,7 +3699,7 @@ msgstr ""
"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet "
"musiikit"
-#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
+#: ../src/gui/setup_video.cpp:367 ../src/gui/setup_video.cpp:375
msgid "You must restart to apply changes."
msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
@@ -3631,7 +3718,7 @@ msgstr ""
"palvelimelle."
# TODO: No it can't, really - where are you going to fit the plural indicator here? Hot damn this is tough to formulate grammatically sensibly.
-#: ../src/localplayer.cpp:920
+#: ../src/localplayer.cpp:947
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -3644,7 +3731,7 @@ msgid "You picked up %s."
msgstr "%s noukittu."
# Leisure Suit Larry reference.
-#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/manaserv/beinghandler.cpp:324
#: ../src/net/tmwa/playerhandler.cpp:116
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
@@ -3705,7 +3792,7 @@ msgstr "Aineenvaihduntaprosessisi ovat historiaa."
msgid "Your name needs to be at least 4 characters."
msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
-#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/manaserv/beinghandler.cpp:317
#: ../src/net/tmwa/playerhandler.cpp:104
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
@@ -3718,19 +3805,19 @@ msgstr ""
msgid "[mana-file] : The mana file is an XML file (.mana)"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_interface.cpp:113
msgid "as particle"
msgstr "leijuvana"
-#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
+#: ../src/gui/setup_video.cpp:136 ../src/gui/setup_video.cpp:150
msgid "high"
msgstr "korkea"
-#: ../src/gui/setup_video.cpp:223
+#: ../src/gui/setup_interface.cpp:111
msgid "in chat"
msgstr "keskusteluikkunassa"
-#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
+#: ../src/gui/setup_video.cpp:135 ../src/gui/setup_video.cpp:148
msgid "low"
msgstr "matala"
@@ -3738,15 +3825,15 @@ msgstr "matala"
msgid "mana [options] [mana-file]"
msgstr "mana [parametrit] [mana-tiedosto]"
-#: ../src/gui/setup_video.cpp:189
+#: ../src/gui/setup_video.cpp:151
msgid "max"
msgstr "maksimi"
-#: ../src/gui/setup_video.cpp:187
+#: ../src/gui/setup_video.cpp:149
msgid "medium"
msgstr "keskitaso"
-#: ../src/gui/setup_video.cpp:172
+#: ../src/gui/setup_video.cpp:134
msgid "off"
msgstr "pois päältä"
@@ -3759,7 +3846,7 @@ msgstr "vaatii uudemman version"
msgid "requires v%s"
msgstr "vaatii version %s"
-#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/beinginfo.cpp:33 ../src/resources/itemdb.cpp:271
#: ../src/resources/monsterdb.cpp:77
msgid "unnamed"
msgstr "nimetön"
@@ -3798,6 +3885,9 @@ msgstr "nimetön"
#~ msgid "Access denied."
#~ msgstr "Pääsy evätty"
+#~ msgid "Ambient FX: %s"
+#~ msgstr "Taustaäänet: %s"
+
#~ msgid "Ammo"
#~ msgstr "Panokset"
@@ -3837,6 +3927,9 @@ msgstr "nimetön"
#~ msgid "Exp"
#~ msgstr "Kok"
+#~ msgid "Find Path to Mouse"
+#~ msgstr "Löydä polku hiiren kursorin luo"
+
#~ msgid "Floating '...' bubble"
#~ msgstr "Leijuva '...' -puhekupla"
@@ -3865,6 +3958,9 @@ msgstr "nimetön"
#~ msgid "Job"
#~ msgstr "Työ"
+#~ msgid "Joined party."
+#~ msgstr "Liityit ryhmään."
+
#~ msgid "Knife"
#~ msgstr "Puukko"
@@ -3895,6 +3991,9 @@ msgstr "nimetön"
#~ msgid "Pants"
#~ msgstr "Housut"
+#~ msgid "Particle detail: %s"
+#~ msgstr "Hiukkastehosteiden yksityiskohtaisuus: %s"
+
#~ msgid "Player"
#~ msgstr "Pelaaja"
@@ -3910,9 +4009,6 @@ msgstr "nimetön"
#~ msgid "Scroll laziness"
#~ msgstr "Kameran perässälaahauksen tiukkuus"
-#~ msgid "Scroll radius"
-#~ msgstr "Kameran perässälaahaus"
-
#~ msgid "Server"
#~ msgstr "Palvelin:"
@@ -3928,9 +4024,6 @@ msgstr "nimetön"
#~ msgid "Shooting"
#~ msgstr "Ammunta"
-#~ msgid "Special %d"
-#~ msgstr "Erikoisuus %d"
-
#~ msgid "Specials Set %d"
#~ msgstr "Erikoisuusjoukko %d"
diff --git a/po/fr.po b/po/fr.po
index 80596e48..7d41f865 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 16:50+0200\n"
+"POT-Creation-Date: 2011-06-24 01:55+0200\n"
"PO-Revision-Date: 2011-04-30 18:23+0100\n"
"Last-Translator: Antoine Ruck <antoinebcn@hotmail.com>\n"
"Language-Team: French <Yohann Ferreira <yohann ferreira orange efer>>\n"
@@ -27,7 +27,7 @@ msgstr ""
"X-Poedit-Language: French\n"
"X-Poedit-Country: FRANCE\n"
-#: ../src/gui/npcdialog.cpp:208
+#: ../src/gui/npcdialog.cpp:209
msgid ""
"\n"
"> Next\n"
@@ -49,7 +49,9 @@ msgstr " -C --config-dir : Répertoire de configuration a utiliser"
#: ../src/main.cpp:61
msgid " --localdata-dir : Directory to use as local data directory"
-msgstr " -L --localdata-dir : Répertoire à utiliser comme répertoire de données sur votre pc"
+msgstr ""
+" -L --localdata-dir : Répertoire à utiliser comme répertoire de données sur "
+"votre pc"
#: ../src/main.cpp:65
msgid " --no-opengl : Disable OpenGL for this session"
@@ -57,7 +59,8 @@ msgstr " --no-opengl : Désactive l'OpenGL pour cette session"
#: ../src/main.cpp:63
msgid " --screenshot-dir : Directory to store screenshots"
-msgstr " --screenshot-dir : Répertoire à utiliser pour les impressions écrans"
+msgstr ""
+" --screenshot-dir : Répertoire à utiliser pour les impressions écrans"
#: ../src/main.cpp:56
msgid " --update-host : Use this update host"
@@ -69,7 +72,9 @@ msgstr " -C --config-dir : Répertoire de configuration a utiliser"
#: ../src/main.cpp:57
msgid " -D --default : Choose default character server and character"
-msgstr " -D --default : Choisir le serveur de personnages par défaut et le personnage"
+msgstr ""
+" -D --default : Choisir le serveur de personnages par défaut et le "
+"personnage"
#: ../src/main.cpp:52
msgid " -P --password : Login with this password"
@@ -101,12 +106,18 @@ msgstr " -s --server : Nom du serveur (ou IP) pour la connexion"
#: ../src/main.cpp:59
msgid " -u --skip-update : Skip the update downloads"
-msgstr " -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
+msgstr ""
+" -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
#: ../src/main.cpp:48
msgid " -v --version : Display the version"
msgstr " -v --version : Affiche la version"
+#: ../src/net/manaserv/partyhandler.cpp:126
+#, fuzzy, c-format
+msgid " on invitation from %s"
+msgstr "Réponse d'invitation de %s inconnue."
+
#: ../src/gui/updatewindow.cpp:419
msgid "##1 It is strongly recommended that"
msgstr "##1 Il est fortement recommandé que"
@@ -120,7 +131,7 @@ msgid "##1 you try again later."
msgstr "##1 Essayez à nouveau plus tard"
#: ../src/net/tmwa/generalhandler.cpp:241
-#, no-c-format
+#, fuzzy, no-c-format
msgid "% Accuracy"
msgstr "% Précision"
@@ -134,19 +145,17 @@ msgstr "% Coup critique"
msgid "% Evade"
msgstr "% Esquive"
-#: ../src/gui/debugwindow.cpp:61
-#: ../src/gui/debugwindow.cpp:64
+#: ../src/gui/debugwindow.cpp:59
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: ../src/gui/debugwindow.cpp:56
+#: ../src/gui/debugwindow.cpp:54
#, c-format
msgid "%d FPS (OpenGL)"
msgstr "%d FPS (OpenGL)"
-#: ../src/client.cpp:1154
-#: ../src/client.cpp:1182
+#: ../src/client.cpp:1151 ../src/client.cpp:1179
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s n'existe pas et ne peut pas être créé ! Fin du programme."
@@ -191,6 +200,11 @@ msgstr "%s a activé le mode %s sur le joueur %s."
msgid "%s is already a member of a party."
msgstr "%s est déjà membre du groupe."
+#: ../src/net/manaserv/partyhandler.cpp:157
+#, fuzzy, c-format
+msgid "%s is already in a party."
+msgstr "%s est déjà membre du groupe."
+
#: ../src/net/tmwa/partyhandler.cpp:368
#, c-format
msgid "%s is not in your party!"
@@ -201,9 +215,9 @@ msgstr "%s n'est pas membre de votre groupe !"
msgid "%s is now a member of your party."
msgstr "%s est maintenant membre de votre groupe."
-#: ../src/net/manaserv/partyhandler.cpp:105
-#, c-format
-msgid "%s joined the party."
+#: ../src/net/manaserv/partyhandler.cpp:128
+#, fuzzy, c-format
+msgid "%s joined the party%s."
msgstr "%s a rejoint le groupe."
#: ../src/net/manaserv/chathandler.cpp:311
@@ -216,7 +230,7 @@ msgstr "%s a quitté le canal"
msgid "%s refused your invitation."
msgstr "%s a refusé votre invitation."
-#: ../src/net/manaserv/partyhandler.cpp:123
+#: ../src/net/manaserv/partyhandler.cpp:148
#, c-format
msgid "%s rejected your invite."
msgstr "%s a décliné votre invitation."
@@ -232,8 +246,7 @@ msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
msgid "%s whispers: %s"
msgstr "Message privé de %s : %s"
-#: ../src/gui/charselectdialog.cpp:418
-#: ../src/gui/charselectdialog.cpp:419
+#: ../src/gui/charselectdialog.cpp:418 ../src/gui/charselectdialog.cpp:419
msgid "(empty)"
msgstr "(vide)"
@@ -241,19 +254,15 @@ msgstr "(vide)"
msgid "*** only available to a GM ***"
msgstr "*** uniquement disponible pour les GM ***"
-#: ../src/gui/buy.cpp:74
-#: ../src/gui/itemamount.cpp:112
-#: ../src/gui/npcdialog.cpp:124
-#: ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:464
+#: ../src/gui/buy.cpp:75 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:466
msgid "+"
msgstr "+"
-#: ../src/gui/buy.cpp:77
-#: ../src/gui/itemamount.cpp:111
-#: ../src/gui/npcdialog.cpp:125
-#: ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:476
+#: ../src/gui/buy.cpp:78 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:126 ../src/gui/sell.cpp:76
+#: ../src/gui/statuswindow.cpp:478
msgid "-"
msgstr "-"
@@ -267,7 +276,8 @@ msgstr "/announce > Annonce globale (GM uniquement)"
#: ../src/commandhandler.cpp:181
msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr "/away > Indiquer aux autres joueurs que vous n'êtes actuellement pas actif."
+msgstr ""
+"/away > Indiquer aux autres joueurs que vous n'êtes actuellement pas actif."
#: ../src/commandhandler.cpp:172
msgid "/clear > Clears this window"
@@ -289,8 +299,7 @@ msgstr "/exp > Afficher / Modifier les préférences d'expérience du groupe"
msgid "/help > Display this help"
msgstr "/help > Montre l'aide"
-#: ../src/net/tmwa/gui/guildtab.cpp:61
-#: ../src/net/tmwa/gui/partytab.cpp:59
+#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
msgid "/help > Display this help."
msgstr "/help > Afficher cette aide."
@@ -312,7 +321,8 @@ msgstr "/invite > Inviter un joueur à rejoindre votre groupe"
#: ../src/net/tmwa/gui/partytab.cpp:63
msgid "/item > Show/change party item sharing options"
-msgstr "/item > Afficher / Modifier les préférences d'échange d'objet du groupe"
+msgstr ""
+"/item > Afficher / Modifier les préférences d'échange d'objet du groupe"
#: ../src/commandhandler.cpp:188
msgid "/join > Join or create a channel"
@@ -360,7 +370,9 @@ msgstr "/party > Inviter un utilisateur dans un groupe"
#: ../src/commandhandler.cpp:197
msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > Obtenir la liste des joueurs présents (envoyée dans l'historique du tchat s'il a été activé)"
+msgstr ""
+"/present > Obtenir la liste des joueurs présents (envoyée dans l'historique "
+"du tchat s'il a été activé)"
#: ../src/commandhandler.cpp:179
msgid "/q > Alias of query"
@@ -368,7 +380,9 @@ msgstr "/q > Alias de query"
#: ../src/commandhandler.cpp:177
msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Crée un nouvel onglet pour vos messages privés avec un autre utilisateur"
+msgstr ""
+"/query > Crée un nouvel onglet pour vos messages privés avec un autre "
+"utilisateur"
#: ../src/gui/widgets/channeltab.cpp:51
msgid "/quit > Leave a channel"
@@ -376,11 +390,13 @@ msgstr "/quit > Quitter un salon"
#: ../src/commandhandler.cpp:193
msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Commencer à enregistrer la conversation dans un fichier externe"
+msgstr ""
+"/record > Commencer à enregistrer la conversation dans un fichier externe"
#: ../src/commandhandler.cpp:195
msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Déterminer si la touche <entrée> basculera l'historique du tchat"
+msgstr ""
+"/toggle > Déterminer si la touche <entrée> basculera l'historique du tchat"
#: ../src/gui/widgets/channeltab.cpp:50
msgid "/topic > Set the topic of the current channel"
@@ -414,32 +430,41 @@ msgstr "/whisper > Alias de msg"
msgid "/who > Display number of online users"
msgstr "/who > Afficher le nombre d'utilisateurs en ligne"
-#: ../src/gui/charcreatedialog.cpp:73
-#: ../src/gui/charcreatedialog.cpp:76
+#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
#: ../src/gui/outfitwindow.cpp:66
msgid "<"
msgstr "<"
#: ../src/net/tmwa/gui/partytab.cpp:97
-msgid "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr "<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage "
+"d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
#: ../src/net/tmwa/gui/partytab.cpp:87
-msgid "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or \"0\", \"no\", \"false\" to disable item sharing."
-msgstr "<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
+"d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
#: ../src/commandhandler.cpp:308
-msgid "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0\", \"no\", \"false\" to turn the toggle off."
-msgstr "<state> peut être en position \"1\", \"yes\", \"true\" pour activer le bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+"\"0\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+"<state> peut être en position \"1\", \"yes\", \"true\" pour activer le "
+"bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
-#: ../src/gui/charcreatedialog.cpp:70
-#: ../src/gui/charcreatedialog.cpp:75
+#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
#: ../src/gui/outfitwindow.cpp:67
msgid ">"
msgstr ">"
-#: ../src/gui/setup_players.cpp:206
-#: ../src/gui/setup_video.cpp:147
+#: ../src/gui/setup_interface.cpp:78 ../src/gui/setup_players.cpp:206
msgid "???"
msgstr "???"
@@ -460,7 +485,7 @@ msgstr "Invitation de la guilde acceptée"
msgid "Accepted party invite from %s."
msgstr "Invitation dans le groupe acceptée de la part de %s."
-#: ../src/game.cpp:738
+#: ../src/game.cpp:722
msgid "Accepting incoming trade requests"
msgstr "Accepter les requêtes d'échanges entrantes"
@@ -497,14 +522,12 @@ msgstr "Compte non connecté. Identifiez-vous tout d'abord."
msgid "Account was not found. Please re-login."
msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
-#: ../src/gui/changeemaildialog.cpp:49
-#: ../src/gui/changepassworddialog.cpp:52
+#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
#, c-format
msgid "Account: %s"
msgstr "Compte : %s"
-#: ../src/gui/inventorywindow.cpp:106
-#: ../src/gui/popupmenu.cpp:369
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/popupmenu.cpp:372
msgid "Activate"
msgstr "Lancer"
@@ -512,12 +535,11 @@ msgstr "Lancer"
msgid "Add"
msgstr "Ajouter"
-#: ../src/gui/popupmenu.cpp:171
+#: ../src/gui/popupmenu.cpp:174
msgid "Add name to chat"
msgstr "Ajouter les noms dans le flux de conversation"
-#: ../src/gui/popupmenu.cpp:190
-#: ../src/gui/popupmenu.cpp:387
+#: ../src/gui/popupmenu.cpp:193 ../src/gui/popupmenu.cpp:390
msgid "Add to chat"
msgstr "Ajouter à la conversation"
@@ -569,36 +591,38 @@ msgstr "Déjà connecté."
msgid "Already recording."
msgstr "Enregistrement en cours."
-#: ../src/gui/setup_video.cpp:254
-msgid "Ambient FX"
+#: ../src/gui/setup_video.cpp:191
+#, fuzzy
+msgid "Ambient FX:"
msgstr "Effets ambiants"
-#: ../src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
-msgstr "Effets ambiants : %s"
-
#: ../src/net/tmwa/partyhandler.cpp:299
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Un membre inconnu a essayé de dire : %s"
-#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/manaserv/beinghandler.cpp:322
#: ../src/net/tmwa/playerhandler.cpp:112
msgid "Annihilated."
msgstr "Vaporisé."
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Apply"
msgstr "Appliquer"
-#: ../src/gui/setup_video.cpp:461
+#: ../src/gui/setup_video.cpp:358
msgid "Applying change to OpenGL requires restart."
-msgstr "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
+msgstr ""
+"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
-#: ../src/gui/setup_video.cpp:453
-msgid "Applying change to OpenGL requires restart. In case OpenGL messes up your game graphics, restart the game with the command line option \"--no-opengl\"."
-msgstr "Il est nécessaire de redémarrer le client pour appliquer les changements liés à OpenGL. Si OpenGL empêche un affichage correct, redémarrez le jeu avec l'option en ligne de commande : \"--no-opengl\"."
+#: ../src/gui/setup_video.cpp:350
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+"Il est nécessaire de redémarrer le client pour appliquer les changements "
+"liés à OpenGL. Si OpenGL empêche un affichage correct, redémarrez le jeu "
+"avec l'option en ligne de commande : \"--no-opengl\"."
#: ../src/gui/charselectdialog.cpp:73
msgid "Are you sure you want to delete this character?"
@@ -614,27 +638,27 @@ msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
msgid "Are you sure you want to leave party %s?"
msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
-#: ../src/gui/setup_keyboard.cpp:86
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr "Assigner"
#: ../src/net/manaserv/charhandler.cpp:165
#, c-format
msgid "At least one statis out of the permitted range: (%u - %u)."
-msgstr "Au moins une des caractéristiques est en dehors des normes autorisées : (%u - %u)."
+msgstr ""
+"Au moins une des caractéristiques est en dehors des normes autorisées : (%u "
+"- %u)."
-#: ../src/keyboardconfig.cpp:43
-#: ../src/net/tmwa/generalhandler.cpp:237
+#: ../src/keyboardconfig.cpp:43 ../src/net/tmwa/generalhandler.cpp:237
msgid "Attack"
msgstr "Attaque"
-#: ../src/resources/itemdb.cpp:310
+#: ../src/resources/itemdb.cpp:321
#, c-format
msgid "Attack %+d"
msgstr "Attaque %+d"
-#: ../src/gui/popupmenu.cpp:87
-#: ../src/gui/popupmenu.cpp:158
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:161
#, c-format
msgid "Attack %s"
msgstr "Attaque %s"
@@ -651,7 +675,7 @@ msgstr "Audio"
msgid "Authentication failed."
msgstr "Échec de l'authentification."
-#: ../src/localplayer.cpp:1030
+#: ../src/localplayer.cpp:1057
msgid "Away"
msgstr "Inactif"
@@ -664,6 +688,20 @@ msgstr "Être ami avec %s"
msgid "Being"
msgstr "Forme de vie"
+#: ../src/gui/debugwindow.cpp:136
+#, fuzzy
+msgid "Being collision radius"
+msgstr "Rayon du défilement"
+
+#: ../src/gui/debugwindow.cpp:138
+#, fuzzy
+msgid "Being path"
+msgstr "Forme de vie"
+
+#: ../src/gui/debugwindow.cpp:137
+msgid "Being positions"
+msgstr ""
+
#: ../src/net/tmwa/playerhandler.cpp:124
msgid "Bereft of life, you rest in peace."
msgstr "Privé de toute essence de vie, vous reposez en paix."
@@ -676,53 +714,47 @@ msgstr "Faire clignoter le nom"
msgid "Blue:"
msgstr "Bleu : "
-#: ../src/gui/setup_video.cpp:160
+#: ../src/gui/setup_interface.cpp:91
msgid "Bubbles with names"
msgstr "Bulles avec nom"
-#: ../src/gui/setup_video.cpp:159
+#: ../src/gui/setup_interface.cpp:90
msgid "Bubbles, no names"
msgstr "Bulles sans nom"
-#: ../src/gui/buy.cpp:49
-#: ../src/gui/buy.cpp:78
-#: ../src/gui/buysell.cpp:47
+#: ../src/gui/buy.cpp:50 ../src/gui/buy.cpp:79 ../src/gui/buysell.cpp:47
msgid "Buy"
msgstr "Acheter"
-#: ../src/gui/setup_joystick.cpp:38
-#: ../src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
msgid "Calibrate"
msgstr "Calibrer"
-#: ../src/gui/buysell.cpp:47
-#: ../src/gui/changeemaildialog.cpp:55
-#: ../src/gui/changepassworddialog.cpp:58
-#: ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44
-#: ../src/gui/itemamount.cpp:114
-#: ../src/gui/npcpostdialog.cpp:57
-#: ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194
-#: ../src/gui/popupmenu.cpp:389
-#: ../src/gui/quitdialog.cpp:47
-#: ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51
-#: ../src/gui/socialwindow.cpp:275
-#: ../src/gui/textdialog.cpp:40
-#: ../src/gui/unregisterdialog.cpp:56
+#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
+#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
+#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:178
+#: ../src/gui/popupmenu.cpp:197 ../src/gui/popupmenu.cpp:392
+#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
+#: ../src/gui/setup.cpp:52 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
#: ../src/gui/updatewindow.cpp:144
msgid "Cancel"
msgstr "Annuler"
#: ../src/commandhandler.cpp:421
#, c-format
-msgid "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is you."
-msgstr "Il ne peut être créé une fenêtre de conversation avec le nom \"%s\" ! Elle existe déjà ou il s'agit de vous même."
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"Il ne peut être créé une fenêtre de conversation avec le nom \"%s\" ! Elle "
+"existe déjà ou il s'agit de vous même."
#: ../src/gui/socialwindow.cpp:620
msgid "Cannot create party. You are already in a party"
-msgstr "Vous ne pouvez pas créer un groupe. Vous faites déjà partie d'un groupe."
+msgstr ""
+"Vous ne pouvez pas créer un groupe. Vous faites déjà partie d'un groupe."
#: ../src/net/tmwa/playerhandler.cpp:366
msgid "Cannot raise skill!"
@@ -734,7 +766,8 @@ msgstr "Impossible de créer une conversation sans contenu !"
#: ../src/commandhandler.cpp:400
msgid "Cannot send empty whispers!"
-msgstr "Vous ne pouvez pas envoyer des messages privés sans avoir écrit une phrase !"
+msgstr ""
+"Vous ne pouvez pas envoyer des messages privés sans avoir écrit une phrase !"
#: ../src/net/tmwa/specialhandler.cpp:160
msgid "Cannot shout!"
@@ -752,8 +785,7 @@ msgstr "Changer"
msgid "Change Email"
msgstr "Modifier l'adresse email"
-#: ../src/gui/changeemaildialog.cpp:45
-#: ../src/gui/changeemaildialog.cpp:54
+#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
msgid "Change Email Address"
msgstr "Modifier l'adresse mail"
@@ -762,8 +794,7 @@ msgid "Change Login"
msgstr "Changer de Login"
#: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56
-#: ../src/gui/charselectdialog.cpp:132
+#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:132
msgid "Change Password"
msgstr "Changer le mot de passe"
@@ -771,30 +802,28 @@ msgstr "Changer le mot de passe"
msgid "Change Server"
msgstr "Changer de Serveur"
-#: ../src/gui/setup_video.cpp:607
+#: ../src/gui/setup_video.cpp:466
msgid "Changes will take effect on map change."
msgstr "Les changements seront appliqués au prochain changement de carte."
-#: ../src/client.cpp:848
+#: ../src/client.cpp:845
msgid "Changing game servers"
msgstr "Changement de serveur de jeu en cours"
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:349
msgid "Changing to OpenGL"
msgstr "Passage à OpenGL"
#: ../src/gui/widgets/channeltab.cpp:84
msgid "Channel operators can kick and op other users from the channel."
-msgstr "Seuls les opérateurs du salon peuvent sortir des utilisateurs et donner les droit d'opérateur aux autres utilisateurs du salon."
-
-#: ../src/net/tmwa/chathandler.cpp:265
-#: ../src/net/tmwa/chathandler.cpp:271
-#: ../src/net/tmwa/chathandler.cpp:276
-#: ../src/net/tmwa/chathandler.cpp:281
-#: ../src/net/tmwa/chathandler.cpp:286
-#: ../src/net/tmwa/chathandler.cpp:291
-#: ../src/net/tmwa/chathandler.cpp:296
-#: ../src/net/tmwa/chathandler.cpp:301
+msgstr ""
+"Seuls les opérateurs du salon peuvent sortir des utilisateurs et donner les "
+"droit d'opérateur aux autres utilisateurs du salon."
+
+#: ../src/net/tmwa/chathandler.cpp:265 ../src/net/tmwa/chathandler.cpp:271
+#: ../src/net/tmwa/chathandler.cpp:276 ../src/net/tmwa/chathandler.cpp:281
+#: ../src/net/tmwa/chathandler.cpp:286 ../src/net/tmwa/chathandler.cpp:291
+#: ../src/net/tmwa/chathandler.cpp:296 ../src/net/tmwa/chathandler.cpp:301
msgid "Channels are not supported!"
msgstr "Les salons ne sont pas opérationnels !"
@@ -802,8 +831,7 @@ msgstr "Les salons ne sont pas opérationnels !"
msgid "Character deleted."
msgstr "Personnage supprimé."
-#: ../src/gui/statuswindow.cpp:211
-#: ../src/gui/statuswindow.cpp:248
+#: ../src/gui/statuswindow.cpp:213 ../src/gui/statuswindow.cpp:250
#, c-format
msgid "Character points: %d"
msgstr "Points de personnage : %d"
@@ -828,7 +856,7 @@ msgstr "Les caractéristiques du personnage sont trop basses."
msgid "Chat"
msgstr "Conversation"
-#: ../src/keyboardconfig.cpp:75
+#: ../src/keyboardconfig.cpp:74
msgid "Chat Window"
msgstr "Fenêtre de conversation"
@@ -856,13 +884,16 @@ msgstr "Choisissez le nom de votre guilde."
msgid "Choose your party's name."
msgstr "Choisissez le nom de votre groupe."
-#: ../src/gui/npcdialog.cpp:118
+#: ../src/gui/npcdialog.cpp:119
msgid "Clear log"
msgstr "Effacer le log"
#: ../src/net/manaserv/loginhandler.cpp:239
-msgid "Client registration is not allowed. Please contact server administration."
-msgstr "L'enregistrement de compte en utilisant le client n'est pas permis. Veuillez contacter l'administrateur du serveur."
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+"L'enregistrement de compte en utilisant le client n'est pas permis. Veuillez "
+"contacter l'administrateur du serveur."
#: ../src/net/tmwa/loginhandler.cpp:172
msgid "Client too old."
@@ -873,11 +904,14 @@ msgstr "La version de votre client est trop ancienne."
msgid "Client version is too old."
msgstr "La version de votre client est trop ancienne."
-#: ../src/gui/help.cpp:51
-#: ../src/gui/npcdialog.cpp:50
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:51
msgid "Close"
msgstr "Fermer"
+#: ../src/gui/debugwindow.cpp:135
+msgid "Collision tiles"
+msgstr ""
+
#: ../src/gui/setup_colors.cpp:51
msgid "Colors"
msgstr "Couleurs"
@@ -930,8 +964,7 @@ msgstr "Commande : /ignore"
msgid "Command: /ignore <player>"
msgstr "Commande : /ignore <joueur>"
-#: ../src/net/tmwa/gui/guildtab.cpp:73
-#: ../src/net/tmwa/gui/partytab.cpp:73
+#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
msgid "Command: /invite <nick>"
msgstr "Commande : /invite <nom du personnage>"
@@ -951,8 +984,7 @@ msgstr "Commande : /join <channel>"
msgid "Command: /kick <nick>"
msgstr "Commande : /kick <nom du personnage>"
-#: ../src/net/tmwa/gui/guildtab.cpp:80
-#: ../src/net/tmwa/gui/partytab.cpp:80
+#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
msgid "Command: /leave"
msgstr "Commande : /leave"
@@ -1012,8 +1044,7 @@ msgstr "Command: /toggle <état>"
msgid "Command: /topic <message>"
msgstr "Commande: /topic <message>"
-#: ../src/commandhandler.cpp:316
-#: ../src/gui/widgets/whispertab.cpp:95
+#: ../src/commandhandler.cpp:316 ../src/gui/widgets/whispertab.cpp:95
msgid "Command: /unignore <player>"
msgstr "Commande : /unignore <joueur>"
@@ -1064,18 +1095,22 @@ msgstr "Confirmé. En attente..."
#: ../src/keyboardconfig.cpp:183
#, c-format
-msgid "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in strange behaviour."
-msgstr "Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une des touches ou attendez-vous à un possible comportement étrange du jeu."
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
+"des touches ou attendez-vous à un possible comportement étrange du jeu."
#: ../src/gui/serverdialog.cpp:229
msgid "Connect"
msgstr "Connexion..."
-#: ../src/client.cpp:661
+#: ../src/client.cpp:658
msgid "Connecting to server"
msgstr "Connexion au serveur"
-#: ../src/client.cpp:838
+#: ../src/client.cpp:835
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
@@ -1087,16 +1122,16 @@ msgstr "Connexion..."
msgid "Connection to server terminated. "
msgstr "Connexion au serveur terminée."
-#: ../src/keyboardconfig.cpp:83
+#: ../src/keyboardconfig.cpp:82
msgid "Copy Outfit"
msgstr "Copier la tenue"
-#: ../src/gui/statuswindow.cpp:256
+#: ../src/gui/statuswindow.cpp:258
#, c-format
msgid "Correction points: %d"
msgstr "Points de correction : %d"
-#: ../src/game.cpp:966
+#: ../src/game.cpp:950
msgid "Could Not Load Map"
msgstr "La carte n'a pu être chargé"
@@ -1105,7 +1140,8 @@ msgid "Could not create party."
msgstr "Le groupe n'a pu être créé."
#: ../src/net/tmwa/guildhandler.cpp:296
-msgid "Could not inivte user to guild."
+#, fuzzy
+msgid "Could not invite user to guild."
msgstr "Vous n'avez pas pu inviter le joueur dans la guilde. "
#: ../src/net/tmwa/specialhandler.cpp:157
@@ -1116,8 +1152,7 @@ msgstr "Vous n'avez pas pu rejoindre le groupe !"
msgid "Could not steal anything..."
msgstr "Vous n'avez rien pu voler..."
-#: ../src/gui/charcreatedialog.cpp:78
-#: ../src/gui/charselectdialog.cpp:416
+#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:416
#: ../src/gui/socialwindow.cpp:330
msgid "Create"
msgstr "Créer"
@@ -1130,8 +1165,7 @@ msgstr "Créer votre personnage"
msgid "Create Guild"
msgstr "Créer une Guilde"
-#: ../src/gui/socialwindow.cpp:273
-#: ../src/gui/socialwindow.cpp:619
+#: ../src/gui/socialwindow.cpp:273 ../src/gui/socialwindow.cpp:619
msgid "Create Party"
msgstr "Créer un groupe"
@@ -1157,8 +1191,7 @@ msgstr "La création du groupe a échoué, veuillez choisir un nom plus court."
msgid "Critical Hit"
msgstr "Coup critique"
-#: ../src/gui/debugwindow.cpp:68
-#: ../src/gui/debugwindow.cpp:99
+#: ../src/gui/debugwindow.cpp:96
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Curseur : (%d, %d)"
@@ -1167,23 +1200,23 @@ msgstr "Curseur : (%d, %d)"
msgid "Custom Server"
msgstr "Personnaliserun serveur"
-#: ../src/gui/setup_video.cpp:213
+#: ../src/gui/setup_video.cpp:167
msgid "Custom cursor"
msgstr "Personnaliser le curseur"
-#: ../src/gui/setup_video.cpp:460
+#: ../src/gui/setup_video.cpp:357
msgid "Deactivating OpenGL"
msgstr "Désactiver OpenGL"
-#: ../src/gui/debugwindow.cpp:43
+#: ../src/gui/debugwindow.cpp:219
msgid "Debug"
msgstr "Infos"
-#: ../src/keyboardconfig.cpp:78
+#: ../src/keyboardconfig.cpp:77
msgid "Debug Window"
msgstr "Fenêtre d'informations"
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:96
msgid "Default"
msgstr "Par défaut"
@@ -1191,7 +1224,7 @@ msgstr "Par défaut"
msgid "Defense"
msgstr "Défense"
-#: ../src/resources/itemdb.cpp:311
+#: ../src/resources/itemdb.cpp:322
#, c-format
msgid "Defense %+d"
msgstr "Défense %+d"
@@ -1200,8 +1233,7 @@ msgstr "Défense %+d"
msgid "Delay:"
msgstr "Délai : "
-#: ../src/gui/charselectdialog.cpp:360
-#: ../src/gui/serverdialog.cpp:231
+#: ../src/gui/charselectdialog.cpp:360 ../src/gui/serverdialog.cpp:231
#: ../src/gui/setup_players.cpp:229
msgid "Delete"
msgstr "Supprimer"
@@ -1225,7 +1257,7 @@ msgstr "Dextérité %+d"
msgid "Dexterity:"
msgstr "Dextérité :"
-#: ../src/gui/setup_video.cpp:241
+#: ../src/gui/setup_video.cpp:181
msgid "Disable transparency (Low CPU mode)"
msgstr "Désactiver la transparence (Faible usage du CPU)"
@@ -1238,10 +1270,11 @@ msgstr "Négliger %s"
msgid "Disregarded"
msgstr "Négligé"
-#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/manaserv/beinghandler.cpp:320
#: ../src/net/tmwa/playerhandler.cpp:108
msgid "Do you want your possessions identified?"
-msgstr "Voulez-vous que vos biens soient identifiés et envoyés à votre famille ?"
+msgstr ""
+"Voulez-vous que vos biens soient identifiés et envoyés à votre famille ?"
#: ../src/gui/setup_audio.cpp:43
msgid "Download music"
@@ -1252,14 +1285,12 @@ msgstr "Télécharger la musique"
msgid "Downloading server list...%2.2f%%"
msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
-#: ../src/gui/inventorywindow.cpp:365
-#: ../src/gui/popupmenu.cpp:374
+#: ../src/gui/inventorywindow.cpp:373 ../src/gui/popupmenu.cpp:377
msgid "Drop"
msgstr "Jeter"
-#: ../src/gui/inventorywindow.cpp:107
-#: ../src/gui/inventorywindow.cpp:363
-#: ../src/gui/popupmenu.cpp:372
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/inventorywindow.cpp:371
+#: ../src/gui/popupmenu.cpp:375
msgid "Drop..."
msgstr "Jeter..."
@@ -1267,7 +1298,7 @@ msgstr "Jeter..."
msgid "Duplicated login."
msgstr "Authentification déjà effectuée."
-#: ../src/client.cpp:935
+#: ../src/client.cpp:932
msgid "Email Change"
msgstr "Changer d'email"
@@ -1275,7 +1306,7 @@ msgstr "Changer d'email"
msgid "Email address already exists."
msgstr "Cette adresse email existe déjà."
-#: ../src/client.cpp:936
+#: ../src/client.cpp:933
msgid "Email changed successfully!"
msgstr "L'adresse email a été changé avec succès !"
@@ -1283,23 +1314,17 @@ msgstr "L'adresse email a été changé avec succès !"
msgid "Email:"
msgstr "Email :"
-#: ../src/keyboardconfig.cpp:84
-#: ../src/keyboardconfig.cpp:85
-#: ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87
-#: ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89
-#: ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91
-#: ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93
-#: ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
#, c-format
msgid "Emote Shortcut %d"
msgstr "Raccourci d'emote %d"
-#: ../src/keyboardconfig.cpp:80
+#: ../src/keyboardconfig.cpp:79
msgid "Emote Shortcut Window"
msgstr "Fenêtre de raccourcis d'emote"
@@ -1331,14 +1356,12 @@ msgstr "Fin de la liste des salons."
msgid "Enter the old password first."
msgstr "Entrez d'abord l'ancien mot de passe."
-#: ../src/client.cpp:721
+#: ../src/client.cpp:718
msgid "Entering game world"
msgstr "Connexion au monde de jeu"
-#: ../src/gui/inventorywindow.cpp:92
-#: ../src/gui/inventorywindow.cpp:105
-#: ../src/gui/inventorywindow.cpp:354
-#: ../src/gui/popupmenu.cpp:366
+#: ../src/gui/inventorywindow.cpp:93 ../src/gui/inventorywindow.cpp:106
+#: ../src/gui/inventorywindow.cpp:362 ../src/gui/popupmenu.cpp:369
msgid "Equip"
msgstr "Équiper"
@@ -1346,23 +1369,18 @@ msgstr "Équiper"
msgid "Equip arrows first."
msgstr "Equiper en premier les flèches"
-#: ../src/gui/equipmentwindow.cpp:69
-#: ../src/gui/windowmenu.cpp:55
+#: ../src/gui/equipmentwindow.cpp:54 ../src/gui/windowmenu.cpp:55
msgid "Equipment"
msgstr "Tenues"
-#: ../src/keyboardconfig.cpp:72
+#: ../src/keyboardconfig.cpp:71
msgid "Equipment Window"
msgstr "Fenêtre d'équipements."
-#: ../src/client.cpp:1036
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149
-#: ../src/gui/charcreatedialog.cpp:183
-#: ../src/gui/register.cpp:218
-#: ../src/gui/serverdialog.cpp:323
-#: ../src/gui/unregisterdialog.cpp:133
-#: ../src/net/manaserv/charhandler.cpp:177
+#: ../src/client.cpp:1033 ../src/gui/changeemaildialog.cpp:156
+#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
+#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
+#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
#: ../src/net/manaserv/charhandler.cpp:227
#: ../src/net/tmwa/charserverhandler.cpp:134
#: ../src/net/tmwa/charserverhandler.cpp:151
@@ -1373,8 +1391,7 @@ msgstr "Erreur"
msgid "Error creating guild."
msgstr "Erreur lors de la création de la guilde."
-#: ../src/client.cpp:1336
-#: ../src/client.cpp:1342
+#: ../src/client.cpp:1333 ../src/client.cpp:1339
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
@@ -1386,7 +1403,7 @@ msgstr "Erreur lors de la tentative d'entrée dans le salon."
msgid "Error retreiving server list!"
msgstr "Erreur lors de la récupération de la liste des serveurs !"
-#: ../src/game.cpp:967
+#: ../src/game.cpp:951
#, c-format
msgid "Error while loading %s"
msgstr "Erreur durant le chargement %s"
@@ -1395,22 +1412,19 @@ msgstr "Erreur durant le chargement %s"
msgid "Exp Notification"
msgstr "Information d'expérience"
-#: ../src/gui/statuswindow.cpp:122
+#: ../src/gui/statuswindow.cpp:124
msgid "Exp:"
msgstr "Exp :"
-#: ../src/net/tmwa/gui/partytab.cpp:170
-#: ../src/net/tmwa/partyhandler.cpp:178
+#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:178
msgid "Experience sharing disabled."
msgstr "Partage d'expérience non activé."
-#: ../src/net/tmwa/gui/partytab.cpp:167
-#: ../src/net/tmwa/partyhandler.cpp:172
+#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:172
msgid "Experience sharing enabled."
msgstr "Partage d'expérience activé."
-#: ../src/net/tmwa/gui/partytab.cpp:173
-#: ../src/net/tmwa/partyhandler.cpp:184
+#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:184
msgid "Experience sharing not possible."
msgstr "Partage d'expérience impossible."
@@ -1418,7 +1432,7 @@ msgstr "Partage d'expérience impossible."
msgid "Experience sharing unknown."
msgstr "Paramètre de partage d'expérience inconnu."
-#: ../src/gui/setup_video.cpp:230
+#: ../src/gui/setup_video.cpp:171
msgid "FPS limit:"
msgstr "Limite FPS :"
@@ -1428,19 +1442,27 @@ msgstr "Impossible de rajouter un objet pour une raison inconnue."
#: ../src/net/tmwa/tradehandler.cpp:207
msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Impossible de rajouter un objet. Votre partenaire n'a plus de place libre pour faire cet échange."
+msgstr ""
+"Impossible de rajouter un objet. Votre partenaire n'a plus de place libre "
+"pour faire cet échange."
#: ../src/net/tmwa/tradehandler.cpp:202
msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Impossible de rajouter un objet. Votre partenaire porte trop de poids et ne peut faire cette transaction."
+msgstr ""
+"Impossible de rajouter un objet. Votre partenaire porte trop de poids et ne "
+"peut faire cette transaction."
#: ../src/gui/trade.cpp:262
msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet dans cette fenêtre."
+msgstr ""
+"L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
+"dans cette fenêtre."
#: ../src/net/tmwa/charserverhandler.cpp:134
msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Impossible de créer ce personnage. Il est probable que ce nom soit déjà utilisé."
+msgstr ""
+"Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
+"utilisé."
#: ../src/net/tmwa/charserverhandler.cpp:151
msgid "Failed to delete character."
@@ -1458,37 +1480,39 @@ msgstr "Echec de l'envoi comme émetteur ou caractère invalide."
msgid "Failed to start recording."
msgstr "Impossible de démarrer l'enregistrement."
-#: ../src/gui/setup_video.cpp:426
-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:323
+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:420
-msgid "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Impossible de passer en mode fenêtre, et l'ancienne résolution n'est également pas accessible !"
+#: ../src/gui/setup_video.cpp:317
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr ""
+"Impossible de passer en mode fenêtre, et l'ancienne résolution n'est "
+"également pas accessible !"
-#: ../src/net/tmwa/inventoryhandler.cpp:287
+#: ../src/net/tmwa/inventoryhandler.cpp:286
msgid "Failed to use item."
msgstr "Impossible d'utiliser l'objet."
-#: ../src/client.cpp:956
+#: ../src/client.cpp:953
msgid "Farewell, come back any time..."
msgstr "Adieu, revenez dès que vous le souhaitez..."
-#: ../src/gui/charcreatedialog.cpp:81
-#: ../src/gui/register.cpp:91
+#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
msgid "Female"
msgstr "Féminin"
-#: ../src/keyboardconfig.cpp:56
-msgid "Find Path to Mouse"
-msgstr "Trouver le chemin vers la souris"
-
#: ../src/gui/recorder.cpp:87
msgid "Finishing recording."
msgstr "Fin de l'engistrement."
-#: ../src/gui/setup_video.cpp:256
-msgid "Font size"
+#: ../src/gui/setup_interface.cpp:130
+#, fuzzy
+msgid "Font size:"
msgstr "Taille de police"
#: ../src/commandhandler.cpp:204
@@ -1499,7 +1523,7 @@ msgstr "Pour plus d'informations, taper /help <commande>"
msgid "Friend"
msgstr "Ami"
-#: ../src/gui/setup_video.cpp:211
+#: ../src/gui/setup_video.cpp:165
msgid "Full screen"
msgstr "Plein écran"
@@ -1507,16 +1531,16 @@ msgstr "Plein écran"
msgid "GM Names"
msgstr "Nom des GM"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Game"
msgstr "Jeu"
-#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/manaserv/beinghandler.cpp:314
#: ../src/net/tmwa/playerhandler.cpp:100
msgid "Game Over!"
msgstr "Fin de la partie !"
-#: ../src/game.cpp:181
+#: ../src/game.cpp:179
msgid "General"
msgstr "Général"
@@ -1537,7 +1561,11 @@ msgstr "Vous avez été déconnecté du serveur !"
msgid "Green:"
msgstr "Vert : "
-#: ../src/gui/setup_video.cpp:253
+#: ../src/gui/debugwindow.cpp:134
+msgid "Grid"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:129
msgid "Gui opacity"
msgstr "Opacité de l'interface"
@@ -1570,12 +1598,12 @@ msgstr "La création de guilde n'est pas encore possible sur le serveur."
msgid "Guild name is missing."
msgstr "Le nom de la guilde est manquant."
-#: ../src/resources/itemdb.cpp:312
+#: ../src/resources/itemdb.cpp:323
#, c-format
msgid "HP %+d"
msgstr "PV %+d"
-#: ../src/gui/statuswindow.cpp:117
+#: ../src/gui/statuswindow.cpp:119
msgid "HP:"
msgstr "Vie :"
@@ -1591,7 +1619,7 @@ msgstr "Coupe :"
msgid "Help"
msgstr "Aide"
-#: ../src/keyboardconfig.cpp:69
+#: ../src/keyboardconfig.cpp:68
msgid "Help Window"
msgstr "Fenêtre d'Aide"
@@ -1603,7 +1631,7 @@ msgstr "Cacher les fenêtres"
msgid "Huh? What's that?"
msgstr "Hé ? Qu'est-ce donc que cela ? !!!"
-#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/manaserv/beinghandler.cpp:319
#: ../src/net/tmwa/playerhandler.cpp:106
msgid "I guess this did not run too well."
msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
@@ -1612,33 +1640,35 @@ msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
msgid "If <channel> doesn't exist, it's created."
msgstr "Si <salon> n'existe pas, il sera créé."
-#: ../src/commandhandler.cpp:258
-#: ../src/commandhandler.cpp:285
-#: ../src/gui/widgets/channeltab.cpp:82
-#: ../src/gui/widgets/channeltab.cpp:91
-#: ../src/net/tmwa/gui/guildtab.cpp:75
-#: ../src/net/tmwa/gui/partytab.cpp:75
+#: ../src/commandhandler.cpp:258 ../src/commandhandler.cpp:285
+#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
+#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Si le <nom du personnage> contient des espaces, entourez le de guillemets (exemple : \"nom du personnage\")."
+msgstr ""
+"Si le <nom du personnage> contient des espaces, entourez le de guillemets "
+"(exemple : \"nom du personnage\")."
#: ../src/net/tmwa/playerhandler.cpp:125
msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Si tu n'étais pas aussi motivé, tu serais encore en train de manger les pissenlits par la racine."
+msgstr ""
+"Si tu n'étais pas aussi motivé, tu serais encore en train de manger les "
+"pissenlits par la racine."
#: ../src/gui/widgets/channeltab.cpp:75
msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Si vous étiez la dernière personne présente dans ce salon, il sera supprimé."
+msgstr ""
+"Si vous étiez la dernière personne présente dans ce salon, il sera supprimé."
#: ../src/gui/popupmenu.cpp:108
#, c-format
msgid "Ignore %s"
msgstr "Ignorer %s"
-#: ../src/keyboardconfig.cpp:103
+#: ../src/keyboardconfig.cpp:102
msgid "Ignore input 1"
msgstr "Ignorer l'entrée 1"
-#: ../src/keyboardconfig.cpp:104
+#: ../src/keyboardconfig.cpp:103
msgid "Ignore input 2"
msgstr "Ignorer l'entrée 2"
@@ -1646,7 +1676,7 @@ msgstr "Ignorer l'entrée 2"
msgid "Ignored"
msgstr "Ignoré"
-#: ../src/game.cpp:733
+#: ../src/game.cpp:717
msgid "Ignoring incoming trade requests"
msgstr "Ignorer les requêtes d'échanges entrantes"
@@ -1654,7 +1684,7 @@ msgstr "Ignorer les requêtes d'échanges entrantes"
msgid "Ignoring incoming trade requests."
msgstr "Ignorer les demandes d'échanges."
-#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/gui/debugwindow.cpp:235 ../src/net/manaserv/charhandler.cpp:210
#: ../src/net/tmwa/charserverhandler.cpp:146
msgid "Info"
msgstr "Informations"
@@ -1690,6 +1720,10 @@ msgstr "Intelligence %+d"
msgid "Intelligence:"
msgstr "Intelligence :"
+#: ../src/gui/setup_interface.cpp:120
+msgid "Interface"
+msgstr ""
+
#: ../src/net/manaserv/charhandler.cpp:267
msgid "Invalid character slot selected."
msgstr "Emplacement du caractère sélectionné invalide."
@@ -1714,21 +1748,20 @@ msgstr "Nom invalide."
msgid "Invalid slot number."
msgstr "Numéro d'emplacement invalide."
-#: ../src/client.cpp:1302
+#: ../src/client.cpp:1299
#, c-format
msgid "Invalid update host: %s"
msgstr "Hôte de mise à jour incorrect : %s"
-#: ../src/gui/inventorywindow.cpp:59
-#: ../src/gui/windowmenu.cpp:56
+#: ../src/gui/inventorywindow.cpp:60 ../src/gui/windowmenu.cpp:56
msgid "Inventory"
msgstr "Inventaire"
-#: ../src/keyboardconfig.cpp:71
+#: ../src/keyboardconfig.cpp:70
msgid "Inventory Window"
msgstr "Fenêtre de l'inventaire"
-#: ../src/localplayer.cpp:898
+#: ../src/localplayer.cpp:925
msgid "Inventory is full."
msgstr "Votre inventraire est plein."
@@ -1741,7 +1774,7 @@ msgstr "Inviter"
msgid "Invite %s to join your guild"
msgstr "Inviter %s à rejoindre votre guilde"
-#: ../src/gui/popupmenu.cpp:134
+#: ../src/gui/popupmenu.cpp:136
#, c-format
msgid "Invite %s to join your party"
msgstr "Inviter %s à se joindre à votre groupe"
@@ -1755,8 +1788,7 @@ msgstr "Invitation envoyée."
msgid "Invited user %s to guild %s."
msgstr "Le joueur %s a été invité dans la guilde %s."
-#: ../src/gui/socialwindow.cpp:207
-#: ../src/net/tmwa/partyhandler.cpp:330
+#: ../src/gui/socialwindow.cpp:207 ../src/net/tmwa/partyhandler.cpp:330
#, c-format
msgid "Invited user %s to party."
msgstr "Inviter l'utilisateur %s dans le groupe."
@@ -1766,50 +1798,41 @@ msgstr "Inviter l'utilisateur %s dans le groupe."
msgid "Inviting failed, because you can't see a player called %s."
msgstr "L'invitation a échouée, le joueur %s n'est pas à portée de vue."
-#: ../src/keyboardconfig.cpp:57
-#: ../src/keyboardconfig.cpp:58
-#: ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60
-#: ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62
-#: ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64
-#: ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66
-#: ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:56 ../src/keyboardconfig.cpp:57
+#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
+#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
+#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
+#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
+#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
#, c-format
msgid "Item Shortcut %d"
msgstr "Raccourcis Objet %d"
-#: ../src/keyboardconfig.cpp:76
+#: ../src/keyboardconfig.cpp:75
msgid "Item Shortcut Window"
msgstr "Fenêtre de raccourcis objets"
-#: ../src/localplayer.cpp:901
+#: ../src/localplayer.cpp:928
msgid "Item belongs to someone else."
msgstr "Cet objet appartient à quelqu'un d'autre."
-#: ../src/localplayer.cpp:897
+#: ../src/localplayer.cpp:924
msgid "Item is too far away"
msgstr "L'objet est trop loin de vous."
-#: ../src/localplayer.cpp:896
+#: ../src/localplayer.cpp:923
msgid "Item is too heavy."
msgstr "L'objet est trop lourd."
-#: ../src/net/tmwa/gui/partytab.cpp:135
-#: ../src/net/tmwa/partyhandler.cpp:202
+#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:202
msgid "Item sharing disabled."
msgstr "Partage d'objet desactivé."
-#: ../src/net/tmwa/gui/partytab.cpp:132
-#: ../src/net/tmwa/partyhandler.cpp:196
+#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:196
msgid "Item sharing enabled."
msgstr "Partage d'objet activé."
-#: ../src/net/tmwa/gui/partytab.cpp:138
-#: ../src/net/tmwa/partyhandler.cpp:208
+#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:208
msgid "Item sharing not possible."
msgstr "Partage d'objet impossible."
@@ -1817,33 +1840,38 @@ msgstr "Partage d'objet impossible."
msgid "Item sharing unknown."
msgstr "Paramètre de partage d'objets inconnu."
-#: ../src/client.cpp:785
+#: ../src/client.cpp:782
msgid "ItemDB: Error while loading "
msgstr "ItemDB : Erreur durant le chargement de la base de donnée d'objets"
-#: ../src/gui/statuswindow.cpp:159
+#: ../src/gui/statuswindow.cpp:161
msgid "Job:"
msgstr "Habilité :"
-#: ../src/gui/statuswindow.cpp:158
-#: ../src/gui/statuswindow.cpp:276
+#: ../src/gui/statuswindow.cpp:160 ../src/gui/statuswindow.cpp:278
#, c-format
msgid "Job: %d"
msgstr "Compétence : %d"
-#: ../src/net/manaserv/partyhandler.cpp:87
-msgid "Joined party."
-msgstr "Groupe rejoint."
+#: ../src/net/manaserv/partyhandler.cpp:98
+msgid ""
+"Joining party failed, because the invitation has timed out on the server."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:102
+#, fuzzy
+msgid "Joining party failed, because the inviter has left the game."
+msgstr "La création du groupe a échoué, veuillez choisir un nom plus court."
#: ../src/gui/setup_joystick.cpp:41
msgid "Joystick"
msgstr "Joystick"
-#: ../src/gui/setup_keyboard.cpp:125
+#: ../src/gui/setup_keyboard.cpp:127
msgid "Key Conflict(s) Detected."
msgstr "Conflit(s) de touches détecté(s)"
-#: ../src/gui/setup_keyboard.cpp:77
+#: ../src/gui/setup_keyboard.cpp:78
msgid "Keyboard"
msgstr "Clavier"
@@ -1851,11 +1879,11 @@ msgstr "Clavier"
msgid "Kick failed!"
msgstr "Impossible de sortir la personne !"
-#: ../src/gui/popupmenu.cpp:163
+#: ../src/gui/popupmenu.cpp:166
msgid "Kick monster"
msgstr "Ejecter un monstre"
-#: ../src/gui/popupmenu.cpp:141
+#: ../src/gui/popupmenu.cpp:144
msgid "Kick player"
msgstr "Ejecter un joueur"
@@ -1863,7 +1891,7 @@ msgstr "Ejecter un joueur"
msgid "Kick succeeded!"
msgstr "Sortie de la personne effectuée avec succès !"
-#: ../src/gui/setup_video.cpp:131
+#: ../src/gui/setup_interface.cpp:62
msgid "Large"
msgstr "Grand"
@@ -1879,9 +1907,8 @@ msgstr "Quitter la guilde ?"
msgid "Leave Party?"
msgstr "Quitter le groupe ?"
-#: ../src/gui/statuswindow.cpp:113
-#: ../src/gui/statuswindow.cpp:215
-#: ../src/gui/statuswindow.cpp:263
+#: ../src/gui/statuswindow.cpp:115 ../src/gui/statuswindow.cpp:217
+#: ../src/gui/statuswindow.cpp:265
#, c-format
msgid "Level: %d"
msgstr "Niveau : %d"
@@ -1902,24 +1929,25 @@ msgstr "Votre personnage touche le monstre"
msgid "Local Player Miss"
msgstr "Votre personnage manque son coup"
-#: ../src/gui/setup_video.cpp:220
+#: ../src/gui/setup_interface.cpp:108
msgid "Log NPC dialogue"
msgstr "Loguer les conversations avec les PNJ"
-#: ../src/client.cpp:688
+#: ../src/client.cpp:685
msgid "Logging in"
msgstr "Connexion en cours"
-#: ../src/gui/login.cpp:51
-#: ../src/gui/login.cpp:63
+#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
msgid "Login"
msgstr "Connexion"
#: ../src/net/manaserv/loginhandler.cpp:275
msgid "Login attempt too soon after previous attempt."
-msgstr "La tentative de connexion a été faite trop rapidement depuis la dernière tentative."
+msgstr ""
+"La tentative de connexion a été faite trop rapidement depuis la dernière "
+"tentative."
-#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/manaserv/beinghandler.cpp:323
#: ../src/net/tmwa/playerhandler.cpp:114
msgid "Looks like you got your head handed to you."
msgstr "Il semble que l'on vous ait rendu votre tête."
@@ -1937,12 +1965,12 @@ msgstr "Chance %+d"
msgid "Luck:"
msgstr "Chance :"
-#: ../src/gui/skilldialog.cpp:470
+#: ../src/gui/skilldialog.cpp:472
#, c-format
msgid "Lvl: %d"
msgstr "Niveau : %d"
-#: ../src/gui/skilldialog.cpp:459
+#: ../src/gui/skilldialog.cpp:461
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Niveau : %d (%+d)"
@@ -1955,12 +1983,12 @@ msgstr "Attaque M."
msgid "M.Defense"
msgstr "Défense M."
-#: ../src/resources/itemdb.cpp:313
+#: ../src/resources/itemdb.cpp:324
#, c-format
msgid "MP %+d"
msgstr "PM %+d"
-#: ../src/gui/statuswindow.cpp:130
+#: ../src/gui/statuswindow.cpp:132
msgid "MP:"
msgstr "PM :"
@@ -1968,31 +1996,26 @@ msgstr "PM :"
msgid "MVP player."
msgstr "Joueur MVP"
-#: ../src/gui/charcreatedialog.cpp:80
-#: ../src/gui/register.cpp:90
+#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
msgid "Male"
msgstr "Masculin"
-#: ../src/gui/minimap.cpp:45
-#: ../src/gui/minimap.cpp:86
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:87
msgid "Map"
msgstr "Carte"
-#: ../src/gui/debugwindow.cpp:66
-#: ../src/gui/debugwindow.cpp:108
+#: ../src/gui/debugwindow.cpp:103
#, c-format
msgid "Map: %s"
msgstr "Carte : %s"
-#: ../src/gui/buy.cpp:80
-#: ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:385
-#: ../src/gui/statuswindow.cpp:463
-#: ../src/gui/statuswindow.cpp:497
+#: ../src/gui/buy.cpp:81 ../src/gui/sell.cpp:79
+#: ../src/gui/statuswindow.cpp:387 ../src/gui/statuswindow.cpp:465
+#: ../src/gui/statuswindow.cpp:499
msgid "Max"
msgstr "Max."
-#: ../src/gui/setup_video.cpp:130
+#: ../src/gui/setup_interface.cpp:61
msgid "Medium"
msgstr "Medium"
@@ -2008,8 +2031,7 @@ msgstr "Inviter un joueur dans le groupe"
msgid "Member was promoted successfully."
msgstr "La promotion de ce membre a réussie."
-#: ../src/net/tmwa/playerhandler.cpp:253
-#: ../src/net/tmwa/playerhandler.cpp:293
+#: ../src/net/tmwa/playerhandler.cpp:253 ../src/net/tmwa/playerhandler.cpp:293
msgid "Message"
msgstr "Message"
@@ -2021,12 +2043,11 @@ msgstr "Ce message ferme la conversation."
msgid "Message now closes chat."
msgstr "Ce message ferme maintenant la conversation."
-#: ../src/keyboardconfig.cpp:74
+#: ../src/keyboardconfig.cpp:73
msgid "Minimap Window"
msgstr "Fenêtre de la mini carte"
-#: ../src/gui/debugwindow.cpp:67
-#: ../src/gui/debugwindow.cpp:106
+#: ../src/gui/debugwindow.cpp:101
#, c-format
msgid "Minimap: %s"
msgstr "Plan : %s"
@@ -2035,9 +2056,8 @@ msgstr "Plan : %s"
msgid "Misses"
msgstr "Raté"
-#: ../src/gui/statuswindow.cpp:114
-#: ../src/gui/statuswindow.cpp:208
-#: ../src/gui/statuswindow.cpp:240
+#: ../src/gui/statuswindow.cpp:116 ../src/gui/statuswindow.cpp:210
+#: ../src/gui/statuswindow.cpp:242
#, c-format
msgid "Money: %s"
msgstr "Argent : %s"
@@ -2050,6 +2070,10 @@ msgstr "Le monstre touche le joueur"
msgid "Monsters"
msgstr "Monstres"
+#: ../src/gui/debugwindow.cpp:139
+msgid "Mouse path"
+msgstr ""
+
#: ../src/keyboardconfig.cpp:40
msgid "Move Down"
msgstr "Descendre"
@@ -2070,14 +2094,12 @@ msgstr "Monter"
msgid "Music volume"
msgstr "Volume de la musique"
-#: ../src/gui/debugwindow.cpp:65
-#: ../src/gui/debugwindow.cpp:104
+#: ../src/gui/debugwindow.cpp:100
#, c-format
msgid "Music: %s"
msgstr "Musique : %s"
-#: ../src/gui/npcdialog.cpp:73
-#: ../src/gui/npcpostdialog.cpp:41
+#: ../src/gui/npcdialog.cpp:74 ../src/gui/npcpostdialog.cpp:41
msgid "NPC"
msgstr "NPC"
@@ -2089,8 +2111,7 @@ msgstr "NPCs"
msgid "Name"
msgstr "Nom"
-#: ../src/gui/charcreatedialog.cpp:67
-#: ../src/gui/login.cpp:54
+#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
#: ../src/gui/register.cpp:67
msgid "Name:"
msgstr "Nom :"
@@ -2100,7 +2121,7 @@ msgstr "Nom :"
msgid "Name: %s"
msgstr "Nom : %s"
-#: ../src/gui/ministatus.cpp:236
+#: ../src/gui/ministatus.cpp:234
msgid "Need"
msgstr "Restant"
@@ -2112,7 +2133,7 @@ msgstr "Indiquez quel utilisateur sortir !"
msgid "Need a user to op!"
msgstr "Indiquez à quel utilisateur donner les droit d'opérateur !"
-#: ../src/game.cpp:386
+#: ../src/game.cpp:374
msgid "Network Error"
msgstr "Erreur Réseau"
@@ -2132,11 +2153,11 @@ msgstr "Nouveau mot de passe incorrect."
msgid "New password too short."
msgstr "Le nouveau mot de passe est trop court."
-#: ../src/gui/npcdialog.cpp:49
+#: ../src/gui/npcdialog.cpp:50
msgid "Next"
msgstr "Suivant"
-#: ../src/keyboardconfig.cpp:100
+#: ../src/keyboardconfig.cpp:99
msgid "Next Chat Tab"
msgstr "Onglet de la conversation suivante"
@@ -2160,21 +2181,28 @@ msgstr "Pas de serveur de jeu disponible."
msgid "No servers available."
msgstr "Aucun serveur n'est disponible."
-#: ../src/gui/setup_video.cpp:157
+#: ../src/gui/setup_interface.cpp:88
msgid "No text"
msgstr "Pas de texte"
-#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/manaserv/beinghandler.cpp:315
#: ../src/net/tmwa/playerhandler.cpp:102
-msgid "No, kids. Your character did not really die. It... err... went to a better place."
-msgstr "Non mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,.. il... est parti dans un monde meilleur."
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Non mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
+"il... est parti dans un monde meilleur."
-#: ../src/gui/setup_video.cpp:271
-#: ../src/gui/setup_video.cpp:526
-#: ../src/gui/setup_video.cpp:656
+#: ../src/gui/setup_video.cpp:200 ../src/gui/setup_video.cpp:407
+#: ../src/gui/setup_video.cpp:487
msgid "None"
msgstr "Aucun"
+#: ../src/gui/debugwindow.cpp:142
+msgid "Normal"
+msgstr ""
+
#: ../src/gui/recorder.cpp:91
msgid "Not currently recording."
msgstr "Pas d'enregistrement en cours."
@@ -2192,12 +2220,9 @@ msgstr "Rien à vendre."
msgid "Notice"
msgstr "Message"
-#: ../src/gui/itemamount.cpp:113
-#: ../src/gui/okdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:46
-#: ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:72
-#: ../src/gui/trade.cpp:74
+#: ../src/gui/itemamount.cpp:113 ../src/gui/okdialog.cpp:42
+#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
+#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:74
msgid "OK"
msgstr "Ok"
@@ -2210,19 +2235,21 @@ msgstr "Ancienne adresse email incorrecte."
msgid "Old password incorrect."
msgstr "Ancien mot de passe incorrect."
-#: ../src/net/tmwa/gamehandler.cpp:89
+#: ../src/net/tmwa/gamehandler.cpp:83
#, c-format
msgid "Online users: %d"
msgstr "Joueurs en ligne : %d"
-#: ../src/gui/setup_video.cpp:212
+#: ../src/gui/setup_video.cpp:166
msgid "OpenGL"
msgstr "OpenGL"
#: ../src/commandhandler.h:31
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
+"\", \"false\", \"1\", \"0\"."
#: ../src/main.cpp:47
msgid "Options:"
@@ -2236,31 +2263,30 @@ msgstr "Un autre joueur touche le monstre"
msgid "Other Players' Names"
msgstr "Nom des autres joueurs"
-#: ../src/gui/outfitwindow.cpp:68
-#: ../src/gui/outfitwindow.cpp:141
+#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
#: ../src/gui/outfitwindow.cpp:154
#, c-format
msgid "Outfit: %d"
msgstr "Tenue : %d"
-#: ../src/gui/inventorywindow.cpp:109
-#: ../src/gui/outfitwindow.cpp:51
+#: ../src/gui/inventorywindow.cpp:110 ../src/gui/outfitwindow.cpp:51
msgid "Outfits"
msgstr "Tenues"
-#: ../src/keyboardconfig.cpp:81
+#: ../src/keyboardconfig.cpp:80
msgid "Outfits Window"
msgstr "Fenêtre des tenues"
-#: ../src/gui/setup_video.cpp:252
-msgid "Overhead text"
+#: ../src/gui/setup_interface.cpp:128
+#, fuzzy
+msgid "Overhead text:"
msgstr "Texte aérien"
#: ../src/resources/userpalette.cpp:93
msgid "Own Name"
msgstr "Mon nom"
-#: ../src/gui/setup_video.cpp:606
+#: ../src/gui/setup_video.cpp:465
msgid "Particle Effect Settings Changed."
msgstr "Paramètres d'effet de particules modifiés."
@@ -2268,22 +2294,17 @@ msgstr "Paramètres d'effet de particules modifiés."
msgid "Particle Effects"
msgstr "Effets de particules"
-#: ../src/gui/debugwindow.cpp:69
-#: ../src/gui/debugwindow.cpp:111
+#: ../src/gui/debugwindow.cpp:107
#, c-format
msgid "Particle count: %d"
msgstr "Effets de particules : %d"
-#: ../src/gui/setup_video.cpp:255
-msgid "Particle detail"
+#: ../src/gui/setup_video.cpp:192
+#, fuzzy
+msgid "Particle detail:"
msgstr "Détail des particules"
-#: ../src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Détail des particules : %s"
-
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:169
msgid "Particle effects"
msgstr "Effets de particules"
@@ -2304,8 +2325,19 @@ msgstr "Membres du groupe"
msgid "Party Name"
msgstr "Nom du groupe"
-#: ../src/commandhandler.cpp:448
-#: ../src/net/tmwa/gui/partytab.cpp:109
+#: ../src/net/manaserv/partyhandler.cpp:152
+msgid ""
+"Party invitation rejected by server, because of too many invitations in a "
+"short time."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:75
+#, c-format
+msgid ""
+"Party invite failed, because no player called %s is within the visual range."
+msgstr ""
+
+#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
msgid "Party name is missing."
msgstr "Indiquez un nom de groupe."
@@ -2318,18 +2350,16 @@ msgstr "Création du groupe réussie."
msgid "Party: %s"
msgstr "Groupe : %s"
-#: ../src/client.cpp:916
+#: ../src/client.cpp:913
msgid "Password Change"
msgstr "Changement de mot de passe"
-#: ../src/client.cpp:917
+#: ../src/client.cpp:914
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
-#: ../src/gui/changepassworddialog.cpp:61
-#: ../src/gui/login.cpp:55
-#: ../src/gui/register.cpp:68
-#: ../src/gui/unregisterdialog.cpp:53
+#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
+#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
msgid "Password:"
msgstr "Mot de passe :"
@@ -2337,7 +2367,7 @@ msgstr "Mot de passe :"
msgid "Passwords do not match."
msgstr "Les deux mots de passe sont différents"
-#: ../src/gui/popupmenu.cpp:188
+#: ../src/gui/popupmenu.cpp:191
#, c-format
msgid "Pick up %s"
msgstr "Ramassage : %s"
@@ -2391,8 +2421,7 @@ msgstr "Joueurs"
msgid "Players in this channel:"
msgstr "Joueurs dans ce salon :"
-#: ../src/gui/charcreatedialog.cpp:99
-#: ../src/gui/charcreatedialog.cpp:257
+#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:257
#, c-format
msgid "Please distribute %d points"
msgstr "Veuillez distribuer %d points"
@@ -2402,8 +2431,7 @@ msgstr "Veuillez distribuer %d points"
msgid "Please remove %d points"
msgstr "Veuillez retirer %d points"
-#: ../src/commandhandler.cpp:461
-#: ../src/commandhandler.cpp:538
+#: ../src/commandhandler.cpp:461 ../src/commandhandler.cpp:538
#: ../src/commandhandler.cpp:560
msgid "Please specify a name."
msgstr "Veuillez indiquer un nom."
@@ -2429,23 +2457,20 @@ msgstr "Préparation du téléchargement"
msgid "Present: %s; %d players are present."
msgstr "Présents : %s ; %d joueurs sont présents."
-#: ../src/net/manaserv/beinghandler.cpp:303
+#: ../src/net/manaserv/beinghandler.cpp:329
msgid "Press OK to respawn."
msgstr "Cliquer sur OK pour ressusciter."
-#: ../src/gui/setup_joystick.cpp:37
-#: ../src/gui/setup_joystick.cpp:78
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Presser le bouton pour démarrer la calibration"
-#: ../src/keyboardconfig.cpp:99
+#: ../src/keyboardconfig.cpp:98
msgid "Previous Chat Tab"
msgstr "Onglet de la conversation précédente"
-#: ../src/gui/buy.cpp:69
-#: ../src/gui/buy.cpp:267
-#: ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:288
+#: ../src/gui/buy.cpp:70 ../src/gui/buy.cpp:277 ../src/gui/sell.cpp:72
+#: ../src/gui/sell.cpp:298
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prix : %s / Total : %s"
@@ -2458,8 +2483,7 @@ msgstr "Affiche '...'"
msgid "Propose trade"
msgstr "Proposer un troc"
-#: ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:86
+#: ../src/gui/setup_colors.cpp:85 ../src/gui/setup_colors.cpp:86
#: ../src/gui/setup_colors.cpp:332
msgid "Pulse"
msgstr "Impulsion"
@@ -2468,29 +2492,28 @@ msgstr "Impulsion"
msgid "Put all whispers in tabs"
msgstr "Placer tous les messages privés dans des onglets"
-#: ../src/gui/buy.cpp:79
-#: ../src/gui/quitdialog.cpp:40
-#: ../src/gui/quitdialog.cpp:42
-#: ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77
-#: ../src/gui/serverdialog.cpp:228
-#: ../src/keyboardconfig.cpp:102
+#: ../src/gui/buy.cpp:80 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
+#: ../src/gui/sell.cpp:78 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:101
msgid "Quit"
msgstr "Quitter"
-#: ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:88
+#: ../src/gui/setup_colors.cpp:87 ../src/gui/setup_colors.cpp:88
#: ../src/gui/setup_colors.cpp:333
msgid "Rainbow"
msgstr "Arc-en-ciel"
#: ../src/gui/socialwindow.cpp:553
msgid "Received guild request, but one already exists."
-msgstr "Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà une."
+msgstr ""
+"Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
+"une."
#: ../src/gui/socialwindow.cpp:575
msgid "Received party request, but one already exists."
-msgstr "Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
+msgstr ""
+"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
#: ../src/gui/recorder.h:38
msgid "Recording..."
@@ -2500,8 +2523,7 @@ msgstr "En cours d'enregistrement..."
msgid "Red:"
msgstr "Rouge : "
-#: ../src/gui/login.cpp:61
-#: ../src/gui/register.cpp:58
+#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
#: ../src/gui/register.cpp:73
msgid "Register"
msgstr "S'inscrire"
@@ -2536,15 +2558,15 @@ msgstr "Se souvenir du nom d'utilisateur"
msgid "Request for Trade"
msgstr "Demande d'échange"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Request to quit denied!"
msgstr "Requête de départ refusée !"
-#: ../src/client.cpp:809
+#: ../src/client.cpp:806
msgid "Requesting characters"
msgstr "Téléchargement des personnnages"
-#: ../src/client.cpp:889
+#: ../src/client.cpp:886
msgid "Requesting registration details"
msgstr "Demande des paramètres d'enregistrement"
@@ -2553,25 +2575,24 @@ msgstr "Demande des paramètres d'enregistrement"
msgid "Requesting to join channel %s."
msgstr "Il vous est demandé de rejoindre le salon %s."
-#: ../src/gui/npcdialog.cpp:134
+#: ../src/gui/npcdialog.cpp:135
msgid "Reset"
msgstr "Réinitialiser"
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Reset Windows"
msgstr "Rétablir les fenêtres"
-#: ../src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:335
msgid "Restart needed for changes to take effect."
-msgstr "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
+msgstr ""
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
-#: ../src/gui/setup_video.cpp:571
-#: ../src/gui/setup_video.cpp:576
+#: ../src/gui/setup_video.cpp:442 ../src/gui/setup_video.cpp:447
msgid "Restart your client for the change to take effect."
msgstr "Redémarrez le jeu pour que les changements soient appliqués."
-#: ../src/gui/inventorywindow.cpp:132
-#: ../src/gui/popupmenu.cpp:385
+#: ../src/gui/inventorywindow.cpp:133 ../src/gui/popupmenu.cpp:388
msgid "Retrieve"
msgstr "Récupérer"
@@ -2587,17 +2608,16 @@ msgstr "La touche Entrée ferme maintenant la ligne d'entrée du chat."
msgid "Rotate the stick"
msgstr "Tourner le joystick"
-#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/manaserv/beinghandler.cpp:321
#: ../src/net/tmwa/playerhandler.cpp:110
msgid "Sadly, no trace of you was ever found..."
msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
-#: ../src/game.cpp:354
+#: ../src/game.cpp:342
msgid "Saving screenshot failed!"
msgstr "Impossible de sauvegarder la capture d'écran !"
-#: ../src/gui/setup_video.cpp:570
-#: ../src/gui/setup_video.cpp:575
+#: ../src/gui/setup_video.cpp:441 ../src/gui/setup_video.cpp:446
msgid "Screen Resolution Changed"
msgstr "Résolution de l'écran modifiée"
@@ -2605,19 +2625,19 @@ msgstr "Résolution de l'écran modifiée"
msgid "Screenshot"
msgstr "Capture d'écran"
-#: ../src/game.cpp:349
+#: ../src/game.cpp:337
msgid "Screenshot saved as "
msgstr "Capture d'écran sauvegardée en tant que"
-#: ../src/keyboardconfig.cpp:98
+#: ../src/keyboardconfig.cpp:97
msgid "Scroll Chat Down"
msgstr "Défiler la conversation (bas)"
-#: ../src/keyboardconfig.cpp:97
+#: ../src/keyboardconfig.cpp:96
msgid "Scroll Chat Up"
msgstr "Défiler la conversation (haut)"
-#: ../src/gui/inventorywindow.cpp:87
+#: ../src/gui/inventorywindow.cpp:88
msgid "Search:"
msgstr "Recherche :"
@@ -2625,7 +2645,7 @@ msgstr "Recherche :"
msgid "Seems you need more money... ;-)"
msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
-#: ../src/keyboardconfig.cpp:101
+#: ../src/keyboardconfig.cpp:100
msgid "Select OK"
msgstr "Sélectionner OK"
@@ -2657,9 +2677,7 @@ msgstr "Choisissez le nombre d'objets à échanger."
msgid "Selection out of range."
msgstr "La sélection est invalide."
-#: ../src/gui/buysell.cpp:47
-#: ../src/gui/sell.cpp:49
-#: ../src/gui/sell.cpp:76
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:50 ../src/gui/sell.cpp:77
msgid "Sell"
msgstr "Vendre"
@@ -2679,18 +2697,15 @@ msgstr "Protocole de server non supporté."
msgid "Server type:"
msgstr "Type de Serveur :"
-#: ../src/gui/serverdialog.cpp:206
-#: ../src/gui/widgets/chattab.cpp:142
+#: ../src/gui/serverdialog.cpp:206 ../src/gui/widgets/chattab.cpp:142
msgid "Server:"
msgstr "Serveur :"
-#: ../src/client.cpp:580
-#: ../src/gui/setup.cpp:43
-#: ../src/gui/windowmenu.cpp:66
+#: ../src/client.cpp:577 ../src/gui/setup.cpp:44 ../src/gui/windowmenu.cpp:66
msgid "Setup"
msgstr "Configuration"
-#: ../src/keyboardconfig.cpp:77
+#: ../src/keyboardconfig.cpp:76
msgid "Setup Window"
msgstr "Fenêtre de configuration"
@@ -2706,17 +2721,15 @@ msgstr "Magasin"
msgid "Shortcut"
msgstr "Raccourcis"
-#: ../src/commandhandler.cpp:505
-#: ../src/commandhandler.cpp:514
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:514
msgid "Show IP: Off"
msgstr "Afficher l'IP : Désactivé"
-#: ../src/commandhandler.cpp:505
-#: ../src/commandhandler.cpp:518
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:518
msgid "Show IP: On"
msgstr "Afficher l'IP : Activé"
-#: ../src/gui/setup_video.cpp:246
+#: ../src/gui/setup_interface.cpp:125
msgid "Show damage"
msgstr "Afficher les dommages"
@@ -2724,14 +2737,20 @@ msgstr "Afficher les dommages"
msgid "Show gender"
msgstr "Afficher le sexe"
-#: ../src/gui/setup_video.cpp:219
+#: ../src/gui/setup_interface.cpp:107
msgid "Show own name"
msgstr "Afficher son propre nom"
-#: ../src/gui/setup_video.cpp:221
-msgid "Show pickup notification"
+#: ../src/gui/setup_interface.cpp:109
+#, fuzzy
+msgid "Show pickup notification:"
msgstr "Afficher les messages de ramassage"
+#: ../src/gui/debugwindow.cpp:133
+#, fuzzy
+msgid "Show:"
+msgstr "Afficher l'IP : Activé"
+
#: ../src/keyboardconfig.cpp:53
msgid "Sit"
msgstr "S'assoir"
@@ -2740,35 +2759,34 @@ msgstr "S'assoir"
msgid "Sit failed!"
msgstr "Vous n'avez pas pu vous assoir !"
-#: ../src/gui/skilldialog.cpp:377
+#: ../src/gui/skilldialog.cpp:379
#, c-format
msgid "Skill %d"
msgstr "Compétence %d"
-#: ../src/gui/skilldialog.cpp:368
+#: ../src/gui/skilldialog.cpp:370
#, c-format
msgid "Skill Set %d"
msgstr "Compétences : %d"
-#: ../src/keyboardconfig.cpp:73
+#: ../src/keyboardconfig.cpp:72
msgid "Skill Window"
msgstr "Fenêtre de compétences"
-#: ../src/gui/skilldialog.cpp:273
+#: ../src/gui/skilldialog.cpp:275
#, c-format
msgid "Skill points available: %d"
msgstr "Points de compétences : %d"
-#: ../src/gui/skilldialog.cpp:215
-#: ../src/gui/windowmenu.cpp:59
+#: ../src/gui/skilldialog.cpp:215 ../src/gui/windowmenu.cpp:59
msgid "Skills"
msgstr "Compétences"
-#: ../src/gui/inventorywindow.cpp:86
+#: ../src/gui/inventorywindow.cpp:87
msgid "Slots:"
msgstr "Cases :"
-#: ../src/gui/setup_video.cpp:129
+#: ../src/gui/setup_interface.cpp:60
msgid "Small"
msgstr "Petit"
@@ -2776,18 +2794,19 @@ msgstr "Petit"
msgid "Smilie"
msgstr "emote"
-#: ../src/gui/socialwindow.cpp:312
-#: ../src/gui/windowmenu.cpp:64
+#: ../src/gui/socialwindow.cpp:312 ../src/gui/windowmenu.cpp:64
msgid "Social"
msgstr "Social"
-#: ../src/keyboardconfig.cpp:79
+#: ../src/keyboardconfig.cpp:78
msgid "Social Window"
msgstr "Fenêtre de Groupes et Guildes"
-#: ../src/gui/setup_video.cpp:573
+#: ../src/gui/setup_video.cpp:444
msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Certaines fenêtres pourraient être déplacées pour correspondre à la nouvelle résolution."
+msgstr ""
+"Certaines fenêtres pourraient être déplacées pour correspondre à la nouvelle "
+"résolution."
#: ../src/net/tmwa/generalhandler.cpp:139
msgid "Someone else is trying to use this account."
@@ -2801,13 +2820,31 @@ msgstr "Son"
msgid "Sound Engine"
msgstr "Moteur de son"
-#: ../src/gui/specialswindow.cpp:79
-#: ../src/gui/windowmenu.cpp:62
+#: ../src/gui/debugwindow.cpp:143
+#, fuzzy
+msgid "Special 1"
+msgstr "Cpt. spéciale %d"
+
+#: ../src/gui/debugwindow.cpp:144
+#, fuzzy
+msgid "Special 2"
+msgstr "Cpt. spéciale %d"
+
+#: ../src/gui/debugwindow.cpp:145
+#, fuzzy
+msgid "Special 3"
+msgstr "Cpt. spéciale %d"
+
+#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
msgid "Specials"
msgstr "Cpt. spéciales"
-#: ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:90
+#: ../src/gui/debugwindow.cpp:141
+#, fuzzy
+msgid "Specials:"
+msgstr "Cpt. spéciales"
+
+#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
#: ../src/gui/setup_colors.cpp:333
msgid "Spectrum"
msgstr "Spectre"
@@ -2816,12 +2853,11 @@ msgstr "Spectre"
msgid "Speed hack detected."
msgstr "Speed hack detecté."
-#: ../src/gui/inventorywindow.cpp:108
-#: ../src/gui/popupmenu.cpp:378
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/popupmenu.cpp:381
msgid "Split"
msgstr "Partager"
-#: ../src/localplayer.cpp:899
+#: ../src/localplayer.cpp:926
msgid "Stack is too big."
msgstr "Le groupe est trop grand."
@@ -2829,8 +2865,7 @@ msgstr "Le groupe est trop grand."
msgid "Starting to record..."
msgstr "Début de l'enregistrement..."
-#: ../src/gui/setup_colors.cpp:83
-#: ../src/gui/setup_colors.cpp:331
+#: ../src/gui/setup_colors.cpp:83 ../src/gui/setup_colors.cpp:331
msgid "Static"
msgstr "Statique"
@@ -2838,7 +2873,7 @@ msgstr "Statique"
msgid "Status"
msgstr "Statut"
-#: ../src/keyboardconfig.cpp:70
+#: ../src/keyboardconfig.cpp:69
msgid "Status Window"
msgstr "Fenêtre d'état"
@@ -2854,12 +2889,11 @@ msgstr "Arrêter d'attaquer"
msgid "Stop recording"
msgstr "Arrêter l'enregistrement"
-#: ../src/gui/inventorywindow.cpp:59
+#: ../src/gui/inventorywindow.cpp:60
msgid "Storage"
msgstr "Stockage"
-#: ../src/gui/inventorywindow.cpp:131
-#: ../src/gui/popupmenu.cpp:358
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:361
msgid "Store"
msgstr "Entreposer"
@@ -2882,7 +2916,7 @@ msgstr "Force %+d"
msgid "Strength:"
msgstr "Force :"
-#: ../src/gui/npcdialog.cpp:51
+#: ../src/gui/npcdialog.cpp:52
msgid "Submit"
msgstr "Soumettre"
@@ -2898,7 +2932,12 @@ msgstr "Changer de personnage"
msgid "Switch server"
msgstr "Changer de serveur"
-#: ../src/gui/setup_video.cpp:437
+#: ../src/gui/debugwindow.cpp:239
+#, fuzzy
+msgid "Switches"
+msgstr "Changer de serveur"
+
+#: ../src/gui/setup_video.cpp:334
msgid "Switching to Full Screen"
msgstr "Passage en plein écran"
@@ -2906,7 +2945,7 @@ msgstr "Passage en plein écran"
msgid "Talk"
msgstr "Parler"
-#: ../src/gui/popupmenu.cpp:150
+#: ../src/gui/popupmenu.cpp:153
#, c-format
msgid "Talk to %s"
msgstr "Parler à %s"
@@ -2927,7 +2966,7 @@ msgstr "Cibler le NPC"
msgid "Target Player"
msgstr "Cibler le Joueur"
-#: ../src/gui/setup_video.cpp:158
+#: ../src/gui/setup_interface.cpp:89
msgid "Text"
msgstr "Texte"
@@ -2939,12 +2978,12 @@ msgstr "Merci pour votre achat."
msgid "Thanks for selling."
msgstr "Merci pour votre vente."
-#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/manaserv/beinghandler.cpp:313
#: ../src/net/tmwa/playerhandler.cpp:99
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
-#: ../src/game.cpp:385
+#: ../src/game.cpp:373
msgid "The connection to the server was lost."
msgstr "La connexion au serveur a été perdue."
@@ -2980,14 +3019,12 @@ msgstr "Le mot de passe doit être long d'au moins %d caractères."
msgid "The new password needs to be less than %d characters long."
msgstr "Le mot de passe ne doit pas être plus long que %d caractères."
-#: ../src/gui/register.cpp:182
-#: ../src/gui/unregisterdialog.cpp:117
+#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Le mot de passe doit faire au moins %d caractères."
-#: ../src/gui/register.cpp:190
-#: ../src/gui/unregisterdialog.cpp:124
+#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Le mot de passe doit faire moins de %d caractères."
@@ -3008,7 +3045,8 @@ msgstr "Ce compte est déjà connecté."
#: ../src/net/tmwa/gui/guildtab.cpp:81
msgid "This command causes the player to leave the guild."
-msgstr "Cette commande vous fait quitter la guilde dans laquelle vous vous trouvez."
+msgstr ""
+"Cette commande vous fait quitter la guilde dans laquelle vous vous trouvez."
#: ../src/net/tmwa/gui/partytab.cpp:81
msgid "This command causes the player to leave the party."
@@ -3016,11 +3054,14 @@ msgstr "Cette commande vous fait quitter votre groupe actuel."
#: ../src/net/tmwa/gui/partytab.cpp:96
msgid "This command changes the party's experience sharing policy."
-msgstr "Cette commande change les préférences du groupe sur le partage d'expérience."
+msgstr ""
+"Cette commande change les préférences du groupe sur le partage d'expérience."
#: ../src/net/tmwa/gui/partytab.cpp:86
msgid "This command changes the party's item sharing policy."
-msgstr "Cette commande change les préférences de partage de rammassage d'objet du groupe."
+msgstr ""
+"Cette commande change les préférences de partage de rammassage d'objet du "
+"groupe."
#: ../src/commandhandler.cpp:274
msgid "This command clears the away status and message."
@@ -3028,7 +3069,9 @@ msgstr "Cette commande retire le statut absent."
#: ../src/commandhandler.cpp:228
msgid "This command clears the chat log of previous chat."
-msgstr "Cette commande vide l'historique de conversation de la conversation précédente."
+msgstr ""
+"Cette commande vide l'historique de conversation de la conversation "
+"précédente."
#: ../src/gui/widgets/whispertab.cpp:85
msgid "This command closes the current whisper tab."
@@ -3048,7 +3091,9 @@ msgstr "Cette commande affiche une aide sur la commande <commande>."
#: ../src/commandhandler.cpp:323
msgid "This command displays the name of the current map."
-msgstr "Cette commande affiche le nom de la carte où vous vous trouvez ainsi que votre emplacement sur la carte."
+msgstr ""
+"Cette commande affiche le nom de la carte où vous vous trouvez ainsi que "
+"votre emplacement sur la carte."
#: ../src/commandhandler.cpp:328
msgid "This command displays the number of players currently online."
@@ -3056,11 +3101,15 @@ msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
#: ../src/net/tmwa/gui/partytab.cpp:101
msgid "This command displays the party's current experience sharing policy."
-msgstr "Cette commande affiche les préférences actuelles du groupe sur le partage d'expérience."
+msgstr ""
+"Cette commande affiche les préférences actuelles du groupe sur le partage "
+"d'expérience."
#: ../src/net/tmwa/gui/partytab.cpp:91
msgid "This command displays the party's current item sharing policy."
-msgstr "Cette commande affiche les préférences actuelles du groupe sur le partage de ramassage d'objets."
+msgstr ""
+"Cette commande affiche les préférences actuelles du groupe sur le partage de "
+"ramassage d'objets."
#: ../src/commandhandler.cpp:312
msgid "This command displays the return toggle status."
@@ -3071,8 +3120,13 @@ msgid "This command finishes a recording session."
msgstr "Cette commande termine une session d'enregistrement."
#: ../src/commandhandler.cpp:291
-msgid "This command gets a list of players within hearing and sends it to either the record log if recording, or the chat log otherwise."
-msgstr "Cette commande récupère une liste de tous les joueurs présents et l'envoie dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement de la conversation."
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+"Cette commande récupère une liste de tous les joueurs présents et l'envoie "
+"dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement "
+"de la conversation."
#: ../src/commandhandler.cpp:233
msgid "This command ignores the given player regardless of current relations."
@@ -3080,10 +3134,11 @@ msgstr "Cette commande ignore le joueur qu'il soit indiqué comme ami ou non."
#: ../src/gui/widgets/whispertab.cpp:90
msgid "This command ignores the other player regardless of current relations."
-msgstr "Cette commande permet d'ignorer un joueur qu'il soit indiqué comme ami ou non."
+msgstr ""
+"Cette commande permet d'ignorer un joueur qu'il soit indiqué comme ami ou "
+"non."
-#: ../src/commandhandler.cpp:284
-#: ../src/net/tmwa/gui/partytab.cpp:74
+#: ../src/commandhandler.cpp:284 ../src/net/tmwa/gui/partytab.cpp:74
msgid "This command invites <nick> to party with you."
msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
@@ -3109,7 +3164,8 @@ msgstr "Cette commande vous fait rentrer dans le salon <salon>."
#: ../src/commandhandler.cpp:222
msgid "This command sends the message <msg> to all players currently online."
-msgstr "Cette commande envoie le message <message> à tous les joueurs en ligne."
+msgstr ""
+"Cette commande envoie le message <message> à tous les joueurs en ligne."
#: ../src/commandhandler.cpp:257
msgid "This command sends the text <message> to <nick>."
@@ -3120,8 +3176,13 @@ msgid "This command sets the topic to <message>."
msgstr "Cette commande change le sujet du salon en <message>"
#: ../src/commandhandler.cpp:306
-msgid "This command sets whether the return key should toggle the chat log, or whether the chat log turns off automatically."
-msgstr "Cette commande définit si la touche entrée doit fermer le fichier d'enregistrement de la conversation ou si celui-ci se fermera automatiquement."
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+"Cette commande définit si la touche entrée doit fermer le fichier "
+"d'enregistrement de la conversation ou si celui-ci se fermera "
+"automatiquement."
#: ../src/commandhandler.cpp:245
msgid "This command shows a list of all channels."
@@ -3133,11 +3194,15 @@ msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
#: ../src/commandhandler.cpp:298
msgid "This command starts recording the chat log to the file <filename>."
-msgstr "Cette commande active l'enregistrement de la conversation dans le fichier <nom du fichier>."
+msgstr ""
+"Cette commande active l'enregistrement de la conversation dans le fichier "
+"<nom du fichier>."
#: ../src/commandhandler.cpp:317
msgid "This command stops ignoring the given player if they are being ignored"
-msgstr "Cette commande fait cesser d'ignorer le joueur donné s'il l'était précédemment."
+msgstr ""
+"Cette commande fait cesser d'ignorer le joueur donné s'il l'était "
+"précédemment."
#: ../src/gui/widgets/whispertab.cpp:96
msgid "This command stops ignoring the other player if they are being ignored."
@@ -3149,25 +3214,32 @@ msgstr "Cette commande informe les autres joueurs que vous faites <message>."
#: ../src/commandhandler.cpp:271
msgid "This command tells you're away from keyboard with the given reason."
-msgstr "Cette commande indique que vous n'êtes pas actif en indiquant la raison."
+msgstr ""
+"Cette commande indique que vous n'êtes pas actif en indiquant la raison."
#: ../src/commandhandler.cpp:265
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr "Cette commande essaye de créer une fenêtre de dialogue entre vous et <nom du personnage>"
+msgstr ""
+"Cette commande essaye de créer une fenêtre de dialogue entre vous et <nom du "
+"personnage>"
#: ../src/gui/setup_colors.cpp:46
msgid "This is what the color looks like"
msgstr "Voilà à quoi ressemble cette couleur"
-#: ../src/client.cpp:783
-msgid "This server is missing needed world data. Please contact the administrator(s)."
-msgstr "Le serveur manque de données sur le monde de jeu. Veuillez contacter l'administrateur du serveur."
+#: ../src/client.cpp:780
+msgid ""
+"This server is missing needed world data. Please contact the administrator"
+"(s)."
+msgstr ""
+"Le serveur manque de données sur le monde de jeu. Veuillez contacter "
+"l'administrateur du serveur."
#: ../src/net/tmwa/loginhandler.cpp:185
msgid "This user name is already taken."
msgstr "Ce nom d'utilisateur est déjà utilisé."
-#: ../src/gui/setup_video.cpp:128
+#: ../src/gui/setup_interface.cpp:59
msgid "Tiny"
msgstr "Fine"
@@ -3175,7 +3247,7 @@ msgstr "Fine"
msgid "To:"
msgstr "A :"
-#: ../src/keyboardconfig.cpp:96
+#: ../src/keyboardconfig.cpp:95
msgid "Toggle Chat"
msgstr "Activer / Désactiver la conversation"
@@ -3186,8 +3258,7 @@ msgstr "Activer / Désactiver la conversation"
msgid "Topic: %s"
msgstr "Sujet : %s"
-#: ../src/gui/trade.cpp:73
-#: ../src/gui/trade.cpp:74
+#: ../src/gui/trade.cpp:73 ../src/gui/trade.cpp:74
msgid "Trade"
msgstr "Échange"
@@ -3241,15 +3312,15 @@ msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
msgid "Trading with %s"
msgstr "Echange avec %s"
-#: ../src/gui/setup_video.cpp:469
+#: ../src/gui/setup_video.cpp:366
msgid "Transparency disabled"
msgstr "Transparence désactivée"
-#: ../src/gui/setup_video.cpp:477
+#: ../src/gui/setup_video.cpp:374
msgid "Transparency enabled"
msgstr "Transparence activée."
-#: ../src/localplayer.cpp:895
+#: ../src/localplayer.cpp:922
msgid "Tried to pick up nonexistent item."
msgstr "Vous avez essayé de ramasser un objet inexistant."
@@ -3273,7 +3344,7 @@ msgstr "Type : "
msgid "Unable to buy."
msgstr "Impossible d'acheter."
-#: ../src/net/tmwa/inventoryhandler.cpp:401
+#: ../src/net/tmwa/inventoryhandler.cpp:400
msgid "Unable to equip."
msgstr "Impossible d'équiper cet objet."
@@ -3285,18 +3356,16 @@ msgstr "Impossible de résoudre le nom \""
msgid "Unable to sell."
msgstr "Impossible de vendre."
-#: ../src/net/tmwa/inventoryhandler.cpp:413
+#: ../src/net/tmwa/inventoryhandler.cpp:412
msgid "Unable to unequip."
msgstr "Impossible de deséquiper cet objet."
-#: ../src/gui/setup_keyboard.cpp:90
+#: ../src/gui/setup_keyboard.cpp:92
msgid "Unassign"
msgstr "Désassigner"
-#: ../src/gui/equipmentwindow.cpp:88
-#: ../src/gui/inventorywindow.cpp:94
-#: ../src/gui/inventorywindow.cpp:352
-#: ../src/gui/popupmenu.cpp:364
+#: ../src/gui/equipmentwindow.cpp:73 ../src/gui/inventorywindow.cpp:95
+#: ../src/gui/inventorywindow.cpp:360 ../src/gui/popupmenu.cpp:367
msgid "Unequip"
msgstr "Retirer"
@@ -3313,8 +3382,7 @@ msgstr "Message d'erreur de caractère non géré %i."
msgid "Unhandled trade cancel packet."
msgstr "Echange non pris en compte."
-#: ../src/gui/popupmenu.cpp:114
-#: ../src/gui/popupmenu.cpp:123
+#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
#, c-format
msgid "Unignore %s"
msgstr "Cesser d'ignorer %s"
@@ -3331,8 +3399,7 @@ msgstr "Événement inconnu dans le canal."
msgid "Unknown char-server failure."
msgstr "Erreur inconnue provenant du serveur de personnages."
-#: ../src/commandhandler.cpp:136
-#: ../src/commandhandler.cpp:333
+#: ../src/commandhandler.cpp:136 ../src/commandhandler.cpp:333
msgid "Unknown command."
msgstr "Commande inconnue."
@@ -3351,8 +3418,7 @@ msgstr "Erreur inconnue (%d)."
#: ../src/net/manaserv/loginhandler.cpp:161
#: ../src/net/manaserv/loginhandler.cpp:279
#: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95
-#: ../src/net/tmwa/loginhandler.cpp:191
+#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:191
msgid "Unknown error."
msgstr "Erreur inconnue."
@@ -3365,22 +3431,20 @@ msgstr "Réponse d'invitation à la guilde inconnue."
msgid "Unknown invite response for %s."
msgstr "Réponse d'invitation de %s inconnue."
-#: ../src/resources/itemdb.cpp:324
-#: ../src/resources/itemdb.cpp:425
+#: ../src/resources/itemdb.cpp:69
msgid "Unknown item"
msgstr "Objet inconnu"
-#: ../src/localplayer.cpp:902
+#: ../src/localplayer.cpp:929
msgid "Unknown problem picking up item."
msgstr "Problème inconnu pour rammasser l'objet."
-#: ../src/gui/charselectdialog.cpp:145
-#: ../src/gui/unregisterdialog.cpp:47
+#: ../src/gui/charselectdialog.cpp:145 ../src/gui/unregisterdialog.cpp:47
#: ../src/gui/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "Se désinscrire"
-#: ../src/client.cpp:955
+#: ../src/client.cpp:952
msgid "Unregister Successful"
msgstr "Désincription réussie"
@@ -3388,7 +3452,7 @@ msgstr "Désincription réussie"
msgid "Unregistered ID."
msgstr "Id non enregistrée."
-#: ../src/gui/skilldialog.cpp:228
+#: ../src/gui/skilldialog.cpp:230
msgid "Up"
msgstr "Augmenter"
@@ -3396,7 +3460,7 @@ msgstr "Augmenter"
msgid "Updating..."
msgstr "Mise à jour en cours..."
-#: ../src/gui/inventorywindow.cpp:93
+#: ../src/gui/inventorywindow.cpp:94
msgid "Use"
msgstr "Utiliser"
@@ -3416,11 +3480,11 @@ msgstr "Ce nom d'utilisateur existe déjà."
msgid "Username permanently erased."
msgstr "Le nom du personnage a été éliminé de façon permanente."
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Vidéo"
-#: ../src/gui/setup_video.cpp:215
+#: ../src/gui/setup_interface.cpp:105
msgid "Visible names"
msgstr "Afficher les noms"
@@ -3443,7 +3507,7 @@ msgstr "Vitalité %+d"
msgid "Vitality:"
msgstr "Vitalité :"
-#: ../src/gui/npcdialog.cpp:48
+#: ../src/gui/npcdialog.cpp:49
msgid "Waiting for server"
msgstr "Attente du serveur"
@@ -3455,16 +3519,18 @@ msgstr "En attente du serveur..."
msgid "Warp failed..."
msgstr "Enchainement échoué..."
-#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/manaserv/beinghandler.cpp:310
#: ../src/net/tmwa/playerhandler.cpp:96
msgid "We regret to inform you that your character was killed in battle."
-msgstr "Nous avons le regret de vous informer que votre personnage est mort sur le champ de bataille."
+msgstr ""
+"Nous avons le regret de vous informer que votre personnage est mort sur le "
+"champ de bataille."
-#: ../src/keyboardconfig.cpp:82
+#: ../src/keyboardconfig.cpp:81
msgid "Wear Outfit"
msgstr "Mettre la tenue"
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:112
msgid "Weight:"
msgstr "Poids :"
@@ -3536,7 +3602,7 @@ msgstr "Mauvais nom d'utilisateur, mot de passe ou adresse email."
msgid "Yes"
msgstr "Oui"
-#: ../src/net/manaserv/beinghandler.cpp:304
+#: ../src/net/manaserv/beinghandler.cpp:330
msgid "You Died"
msgstr "Vous êtes mort"
@@ -3545,10 +3611,13 @@ msgid "You are an ex-player."
msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
#: ../src/net/tmwa/playerhandler.cpp:254
-msgid "You are carrying more than half your weight. You are unable to regain health."
-msgstr "Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus en mesure de regagner vos points de vie."
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
+"en mesure de regagner vos points de vie."
-#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/manaserv/beinghandler.cpp:309
#: ../src/net/tmwa/playerhandler.cpp:95
msgid "You are dead."
msgstr "Vous êtes mort."
@@ -3557,7 +3626,7 @@ msgstr "Vous êtes mort."
msgid "You are no more."
msgstr "Vous n'existez plus."
-#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/manaserv/beinghandler.cpp:312
#: ../src/net/tmwa/playerhandler.cpp:98
msgid "You are not that alive anymore."
msgstr "Vous n'êtes plus vraiment en vie."
@@ -3578,8 +3647,7 @@ msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !"
msgid "You don't have enough money."
msgstr "Vous n'avez pas assez d'argent."
-#: ../src/gui/trade.cpp:98
-#: ../src/gui/trade.cpp:134
+#: ../src/gui/trade.cpp:98 ../src/gui/trade.cpp:134
#, c-format
msgid "You get %s"
msgstr "Vous recevez %s"
@@ -3598,8 +3666,11 @@ msgid "You have been invited you to join a party."
msgstr "Vous avez été invité à rejoindre un groupe."
#: ../src/net/tmwa/loginhandler.cpp:168
-msgid "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Vous avez été banni de façon permanente du jeu. Merci de vous mettre en contact avec l'équipe des GM."
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
+"contact avec l'équipe des GM."
#: ../src/net/tmwa/loginhandler.cpp:175
#, c-format
@@ -3628,10 +3699,11 @@ msgstr "Vous n'avez pas encore atteint le niveau requis !"
#: ../src/gui/setup_audio.cpp:94
msgid "You may have to restart your client if you want to download new music"
-msgstr "Le client devra être redémarré afin de vous permettre de télécharger la musique."
+msgstr ""
+"Le client devra être redémarré afin de vous permettre de télécharger la "
+"musique."
-#: ../src/gui/setup_video.cpp:470
-#: ../src/gui/setup_video.cpp:478
+#: ../src/gui/setup_video.cpp:367 ../src/gui/setup_video.cpp:375
msgid "You must restart to apply changes."
msgstr "Vous devez redémarrer pour appliquer les changements."
@@ -3645,9 +3717,10 @@ msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
#: ../src/gui/login.cpp:129
msgid "You need to use the website to register an account for this server."
-msgstr "Veuillez enregistrer votre compte sur la page du site prévue à cet effet."
+msgstr ""
+"Veuillez enregistrer votre compte sur la page du site prévue à cet effet."
-#: ../src/localplayer.cpp:920
+#: ../src/localplayer.cpp:947
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -3659,14 +3732,19 @@ msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
msgid "You picked up %s."
msgstr "Vous avez ramassé %s."
-#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/manaserv/beinghandler.cpp:324
#: ../src/net/tmwa/playerhandler.cpp:116
-msgid "You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un autre."
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un "
+"autre."
#: ../src/net/manaserv/loginhandler.cpp:312
msgid "You took too long with the captcha or your response was incorrect."
-msgstr "Vous avez mis trop de temps pour répondre au Captcha ou votre réponse est incorrecte."
+msgstr ""
+"Vous avez mis trop de temps pour répondre au Captcha ou votre réponse est "
+"incorrecte."
#: ../src/net/tmwa/playerhandler.cpp:123
msgid "You're a stiff."
@@ -3697,8 +3775,12 @@ msgid "You've kicked the bucket."
msgstr "Tu viens de toucher le fond."
#: ../src/net/tmwa/playerhandler.cpp:129
-msgid "You've shuffled off your mortal coil, run down the curtain and joined the bleedin' choir invisibile."
-msgstr "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint l'armée de l'ombre."
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
+"l'armée de l'ombre."
#: ../src/net/tmwa/guildhandler.cpp:311
msgid "Your guild is full."
@@ -3712,30 +3794,32 @@ msgstr "Vos processus métaboliques appartiennent au passé maintenant."
msgid "Your name needs to be at least 4 characters."
msgstr "Votre nom doit comporter un minimum de 4 caractères."
-#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/manaserv/beinghandler.cpp:317
#: ../src/net/tmwa/playerhandler.cpp:104
-msgid "Your plan of breaking your enemies weapon by bashing it with your throat failed."
-msgstr "Votre tentative de casser l'arme de votre ennemi en la frappant avec votre gorge a échoué."
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
+"gorge a échoué."
#: ../src/main.cpp:43
msgid "[mana-file] : The mana file is an XML file (.mana)"
msgstr "[mana-file] : le fichier mana est un fichier XML (.mana)"
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_interface.cpp:113
msgid "as particle"
msgstr "avec des particules"
-#: ../src/gui/setup_video.cpp:174
-#: ../src/gui/setup_video.cpp:188
+#: ../src/gui/setup_video.cpp:136 ../src/gui/setup_video.cpp:150
msgid "high"
msgstr "élevé"
-#: ../src/gui/setup_video.cpp:223
+#: ../src/gui/setup_interface.cpp:111
msgid "in chat"
msgstr "dans la conversation"
-#: ../src/gui/setup_video.cpp:173
-#: ../src/gui/setup_video.cpp:186
+#: ../src/gui/setup_video.cpp:135 ../src/gui/setup_video.cpp:148
msgid "low"
msgstr "léger"
@@ -3743,15 +3827,15 @@ msgstr "léger"
msgid "mana [options] [mana-file]"
msgstr "mana [options] [fichier-mana]"
-#: ../src/gui/setup_video.cpp:189
+#: ../src/gui/setup_video.cpp:151
msgid "max"
msgstr "max"
-#: ../src/gui/setup_video.cpp:187
+#: ../src/gui/setup_video.cpp:149
msgid "medium"
msgstr "moyen"
-#: ../src/gui/setup_video.cpp:172
+#: ../src/gui/setup_video.cpp:134
msgid "off"
msgstr "aucun"
@@ -3764,8 +3848,7 @@ msgstr "requiert une nouvelle version"
msgid "requires v%s"
msgstr "requiert la v%s"
-#: ../src/resources/beinginfo.cpp:32
-#: ../src/resources/itemdb.cpp:260
+#: ../src/resources/beinginfo.cpp:33 ../src/resources/itemdb.cpp:271
#: ../src/resources/monsterdb.cpp:77
msgid "unnamed"
msgstr "anonyme"
@@ -3875,6 +3958,9 @@ msgstr "anonyme"
#~ msgid "Access denied."
#~ msgstr "Accès refusé"
+#~ msgid "Ambient FX: %s"
+#~ msgstr "Effets ambiants : %s"
+
#~ msgid "Ammo"
#~ msgstr "Munitions"
@@ -3950,6 +4036,9 @@ msgstr "anonyme"
#~ msgid "Failed to switch to "
#~ msgstr "Impossible de passer à "
+#~ msgid "Find Path to Mouse"
+#~ msgstr "Trouver le chemin vers la souris"
+
#~ msgid "Floating '...' bubble"
#~ msgstr "Bulle flottante '...'"
@@ -4000,6 +4089,9 @@ msgstr "anonyme"
#~ msgid "Job Level: %d"
#~ msgstr "Niveau de Compétences : %d"
+#~ msgid "Joined party."
+#~ msgstr "Groupe rejoint."
+
#~ msgid "Knife"
#~ msgstr "Couteau"
@@ -4052,6 +4144,9 @@ msgstr "anonyme"
#~ msgid "Pants"
#~ msgstr "Pantalon"
+#~ msgid "Particle detail: %s"
+#~ msgstr "Détail des particules : %s"
+
#~ msgid "Party Window"
#~ msgstr "Fenêtre de groupe"
@@ -4088,9 +4183,6 @@ msgstr "anonyme"
#~ msgid "Scroll laziness"
#~ msgstr "Lenteur du défilement"
-#~ msgid "Scroll radius"
-#~ msgstr "Rayon du défilement"
-
#~ msgid "Select Server"
#~ msgstr "Sélectionner un serveur"
@@ -4116,9 +4208,6 @@ msgstr "anonyme"
#~ msgid "Slots: "
#~ msgstr "Cases : "
-#~ msgid "Special %d"
-#~ msgstr "Cpt. spéciale %d"
-
#~ msgid "Specials Set %d"
#~ msgstr "Set de Cpt. spéciales %d"
diff --git a/po/mana.pot b/po/mana.pot
index d71f242c..deff2953 100644
--- a/po/mana.pot
+++ b/po/mana.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 16:50+0200\n"
+"POT-Creation-Date: 2011-06-24 01:55+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,73 +18,73 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+#: ../src/client.cpp:577 ../src/gui/setup.cpp:44 ../src/gui/windowmenu.cpp:66
msgid "Setup"
msgstr ""
-#: ../src/client.cpp:661
+#: ../src/client.cpp:658
msgid "Connecting to server"
msgstr ""
-#: ../src/client.cpp:688
+#: ../src/client.cpp:685
msgid "Logging in"
msgstr ""
-#: ../src/client.cpp:721
+#: ../src/client.cpp:718
msgid "Entering game world"
msgstr ""
-#: ../src/client.cpp:783
+#: ../src/client.cpp:780
msgid ""
"This server is missing needed world data. Please contact the administrator"
"(s)."
msgstr ""
-#: ../src/client.cpp:785
+#: ../src/client.cpp:782
msgid "ItemDB: Error while loading "
msgstr ""
-#: ../src/client.cpp:809
+#: ../src/client.cpp:806
msgid "Requesting characters"
msgstr ""
-#: ../src/client.cpp:838
+#: ../src/client.cpp:835
msgid "Connecting to the game server"
msgstr ""
-#: ../src/client.cpp:848
+#: ../src/client.cpp:845
msgid "Changing game servers"
msgstr ""
-#: ../src/client.cpp:889
+#: ../src/client.cpp:886
msgid "Requesting registration details"
msgstr ""
-#: ../src/client.cpp:916
+#: ../src/client.cpp:913
msgid "Password Change"
msgstr ""
-#: ../src/client.cpp:917
+#: ../src/client.cpp:914
msgid "Password changed successfully!"
msgstr ""
-#: ../src/client.cpp:935
+#: ../src/client.cpp:932
msgid "Email Change"
msgstr ""
-#: ../src/client.cpp:936
+#: ../src/client.cpp:933
msgid "Email changed successfully!"
msgstr ""
-#: ../src/client.cpp:955
+#: ../src/client.cpp:952
msgid "Unregister Successful"
msgstr ""
-#: ../src/client.cpp:956
+#: ../src/client.cpp:953
msgid "Farewell, come back any time..."
msgstr ""
-#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/client.cpp:1033 ../src/gui/changeemaildialog.cpp:156
#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
@@ -94,17 +94,17 @@ msgstr ""
msgid "Error"
msgstr ""
-#: ../src/client.cpp:1154 ../src/client.cpp:1182
+#: ../src/client.cpp:1151 ../src/client.cpp:1179
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: ../src/client.cpp:1302
+#: ../src/client.cpp:1299
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: ../src/client.cpp:1336 ../src/client.cpp:1342
+#: ../src/client.cpp:1333 ../src/client.cpp:1339
msgid "Error creating updates directory!"
msgstr ""
@@ -502,39 +502,39 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: ../src/game.cpp:181
+#: ../src/game.cpp:179
msgid "General"
msgstr ""
-#: ../src/game.cpp:349
+#: ../src/game.cpp:337
msgid "Screenshot saved as "
msgstr ""
-#: ../src/game.cpp:354
+#: ../src/game.cpp:342
msgid "Saving screenshot failed!"
msgstr ""
-#: ../src/game.cpp:385
+#: ../src/game.cpp:373
msgid "The connection to the server was lost."
msgstr ""
-#: ../src/game.cpp:386
+#: ../src/game.cpp:374
msgid "Network Error"
msgstr ""
-#: ../src/game.cpp:733
+#: ../src/game.cpp:717
msgid "Ignoring incoming trade requests"
msgstr ""
-#: ../src/game.cpp:738
+#: ../src/game.cpp:722
msgid "Accepting incoming trade requests"
msgstr ""
-#: ../src/game.cpp:966
+#: ../src/game.cpp:950
msgid "Could Not Load Map"
msgstr ""
-#: ../src/game.cpp:967
+#: ../src/game.cpp:951
#, c-format
msgid "Error while loading %s"
msgstr ""
@@ -544,38 +544,38 @@ msgstr ""
msgid "Party: %s"
msgstr ""
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+#: ../src/gui/buy.cpp:50 ../src/gui/buy.cpp:79 ../src/gui/buysell.cpp:47
msgid "Buy"
msgstr ""
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:288
+#: ../src/gui/buy.cpp:70 ../src/gui/buy.cpp:277 ../src/gui/sell.cpp:72
+#: ../src/gui/sell.cpp:298
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
-#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:464
+#: ../src/gui/buy.cpp:75 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:466
msgid "+"
msgstr ""
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
-#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:476
+#: ../src/gui/buy.cpp:78 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:126 ../src/gui/sell.cpp:76
+#: ../src/gui/statuswindow.cpp:478
msgid "-"
msgstr ""
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/buy.cpp:80 ../src/gui/quitdialog.cpp:40
#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
-#: ../src/keyboardconfig.cpp:102
+#: ../src/gui/sell.cpp:78 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:101
msgid "Quit"
msgstr ""
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
-#: ../src/gui/statuswindow.cpp:497
+#: ../src/gui/buy.cpp:81 ../src/gui/sell.cpp:79
+#: ../src/gui/statuswindow.cpp:387 ../src/gui/statuswindow.cpp:465
+#: ../src/gui/statuswindow.cpp:499
msgid "Max"
msgstr ""
@@ -583,17 +583,17 @@ msgstr ""
msgid "Shop"
msgstr ""
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:50 ../src/gui/sell.cpp:77
msgid "Sell"
msgstr ""
#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:178
+#: ../src/gui/popupmenu.cpp:197 ../src/gui/popupmenu.cpp:392
#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/setup.cpp:52 ../src/gui/socialwindow.cpp:275
#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
#: ../src/gui/updatewindow.cpp:144
msgid "Cancel"
@@ -780,61 +780,108 @@ msgstr ""
msgid "No"
msgstr ""
-#: ../src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
-
-#: ../src/gui/debugwindow.cpp:56
+#: ../src/gui/debugwindow.cpp:54
#, c-format
msgid "%d FPS (OpenGL)"
msgstr ""
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
+#: ../src/gui/debugwindow.cpp:59
#, c-format
msgid "%d FPS"
msgstr ""
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#: ../src/gui/debugwindow.cpp:96
#, c-format
-msgid "Music: %s"
+msgid "Cursor: (%d, %d)"
msgstr ""
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: ../src/gui/debugwindow.cpp:100
#, c-format
-msgid "Map: %s"
+msgid "Music: %s"
msgstr ""
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
+#: ../src/gui/debugwindow.cpp:101
#, c-format
msgid "Minimap: %s"
msgstr ""
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: ../src/gui/debugwindow.cpp:103
#, c-format
-msgid "Cursor: (%d, %d)"
+msgid "Map: %s"
msgstr ""
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#: ../src/gui/debugwindow.cpp:107
#, c-format
msgid "Particle count: %d"
msgstr ""
-#: ../src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
+#: ../src/gui/debugwindow.cpp:133
+msgid "Show:"
msgstr ""
-#: ../src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
+#: ../src/gui/debugwindow.cpp:134
+msgid "Grid"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:135
+msgid "Collision tiles"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:136
+msgid "Being collision radius"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:137
+msgid "Being positions"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:138
+msgid "Being path"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:139
+msgid "Mouse path"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:141
+msgid "Specials:"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:142
+msgid "Normal"
msgstr ""
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+#: ../src/gui/debugwindow.cpp:143
+msgid "Special 1"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:144
+msgid "Special 2"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:145
+msgid "Special 3"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:219
+msgid "Debug"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:235 ../src/net/manaserv/charhandler.cpp:210
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:239
+msgid "Switches"
+msgstr ""
+
+#: ../src/gui/equipmentwindow.cpp:54 ../src/gui/windowmenu.cpp:55
msgid "Equipment"
msgstr ""
-#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
-#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
+#: ../src/gui/equipmentwindow.cpp:73 ../src/gui/inventorywindow.cpp:95
+#: ../src/gui/inventorywindow.cpp:360 ../src/gui/popupmenu.cpp:367
msgid "Unequip"
msgstr ""
@@ -842,65 +889,65 @@ msgstr ""
msgid "Help"
msgstr ""
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:51
msgid "Close"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+#: ../src/gui/inventorywindow.cpp:60 ../src/gui/windowmenu.cpp:56
msgid "Inventory"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:59
+#: ../src/gui/inventorywindow.cpp:60
msgid "Storage"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:86
+#: ../src/gui/inventorywindow.cpp:87
msgid "Slots:"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:87
+#: ../src/gui/inventorywindow.cpp:88
msgid "Search:"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
-#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
+#: ../src/gui/inventorywindow.cpp:93 ../src/gui/inventorywindow.cpp:106
+#: ../src/gui/inventorywindow.cpp:362 ../src/gui/popupmenu.cpp:369
msgid "Equip"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:93
+#: ../src/gui/inventorywindow.cpp:94
msgid "Use"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/popupmenu.cpp:372
msgid "Activate"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
-#: ../src/gui/popupmenu.cpp:372
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/inventorywindow.cpp:371
+#: ../src/gui/popupmenu.cpp:375
msgid "Drop..."
msgstr ""
-#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/popupmenu.cpp:381
msgid "Split"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
+#: ../src/gui/inventorywindow.cpp:110 ../src/gui/outfitwindow.cpp:51
msgid "Outfits"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:112
msgid "Weight:"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:361
msgid "Store"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
+#: ../src/gui/inventorywindow.cpp:133 ../src/gui/popupmenu.cpp:388
msgid "Retrieve"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
+#: ../src/gui/inventorywindow.cpp:373 ../src/gui/popupmenu.cpp:377
msgid "Drop"
msgstr ""
@@ -964,39 +1011,39 @@ msgstr ""
msgid "You need to use the website to register an account for this server."
msgstr ""
-#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:87
msgid "Map"
msgstr ""
-#: ../src/gui/ministatus.cpp:236
+#: ../src/gui/ministatus.cpp:234
msgid "Need"
msgstr ""
-#: ../src/gui/npcdialog.cpp:48
+#: ../src/gui/npcdialog.cpp:49
msgid "Waiting for server"
msgstr ""
-#: ../src/gui/npcdialog.cpp:49
+#: ../src/gui/npcdialog.cpp:50
msgid "Next"
msgstr ""
-#: ../src/gui/npcdialog.cpp:51
+#: ../src/gui/npcdialog.cpp:52
msgid "Submit"
msgstr ""
-#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
+#: ../src/gui/npcdialog.cpp:74 ../src/gui/npcpostdialog.cpp:41
msgid "NPC"
msgstr ""
-#: ../src/gui/npcdialog.cpp:118
+#: ../src/gui/npcdialog.cpp:119
msgid "Clear log"
msgstr ""
-#: ../src/gui/npcdialog.cpp:134
+#: ../src/gui/npcdialog.cpp:135
msgid "Reset"
msgstr ""
-#: ../src/gui/npcdialog.cpp:208
+#: ../src/gui/npcdialog.cpp:209
msgid ""
"\n"
"> Next\n"
@@ -1029,7 +1076,7 @@ msgstr ""
msgid "Trade with %s..."
msgstr ""
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:161
#, c-format
msgid "Attack %s"
msgstr ""
@@ -1069,34 +1116,34 @@ msgstr ""
msgid "Invite %s to join your guild"
msgstr ""
-#: ../src/gui/popupmenu.cpp:134
+#: ../src/gui/popupmenu.cpp:136
#, c-format
msgid "Invite %s to join your party"
msgstr ""
-#: ../src/gui/popupmenu.cpp:141
+#: ../src/gui/popupmenu.cpp:144
msgid "Kick player"
msgstr ""
-#: ../src/gui/popupmenu.cpp:150
+#: ../src/gui/popupmenu.cpp:153
#, c-format
msgid "Talk to %s"
msgstr ""
-#: ../src/gui/popupmenu.cpp:163
+#: ../src/gui/popupmenu.cpp:166
msgid "Kick monster"
msgstr ""
-#: ../src/gui/popupmenu.cpp:171
+#: ../src/gui/popupmenu.cpp:174
msgid "Add name to chat"
msgstr ""
-#: ../src/gui/popupmenu.cpp:188
+#: ../src/gui/popupmenu.cpp:191
#, c-format
msgid "Pick up %s"
msgstr ""
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
+#: ../src/gui/popupmenu.cpp:193 ../src/gui/popupmenu.cpp:390
msgid "Add to chat"
msgstr ""
@@ -1301,14 +1348,94 @@ msgstr ""
msgid "Blue:"
msgstr ""
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Apply"
msgstr ""
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Reset Windows"
msgstr ""
+#: ../src/gui/setup_interface.cpp:59
+msgid "Tiny"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:60
+msgid "Small"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:61
+msgid "Medium"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:62
+msgid "Large"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:78 ../src/gui/setup_players.cpp:206
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:88
+msgid "No text"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:89
+msgid "Text"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:90
+msgid "Bubbles, no names"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:91
+msgid "Bubbles with names"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:105
+msgid "Visible names"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:107
+msgid "Show own name"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:108
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:109
+msgid "Show pickup notification:"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:111
+msgid "in chat"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:113
+msgid "as particle"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:120
+msgid "Interface"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:125
+msgid "Show damage"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:128
+msgid "Overhead text:"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:129
+msgid "Gui opacity"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:130
+msgid "Font size:"
+msgstr ""
+
#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr ""
@@ -1333,23 +1460,23 @@ msgstr ""
msgid "Rotate the stick"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:77
+#: ../src/gui/setup_keyboard.cpp:78
msgid "Keyboard"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:86
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:90
+#: ../src/gui/setup_keyboard.cpp:92
msgid "Unassign"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:96
msgid "Default"
msgstr ""
-#: ../src/gui/setup_keyboard.cpp:125
+#: ../src/gui/setup_keyboard.cpp:127
msgid "Key Conflict(s) Detected."
msgstr ""
@@ -1377,10 +1504,6 @@ msgstr ""
msgid "Ignored"
msgstr ""
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
-msgid "???"
-msgstr ""
-
#: ../src/gui/setup_players.cpp:225
msgid "Allow trading"
msgstr ""
@@ -1409,204 +1532,132 @@ msgstr ""
msgid "When ignoring:"
msgstr ""
-#: ../src/gui/setup_video.cpp:128
-msgid "Tiny"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:129
-msgid "Small"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:130
-msgid "Medium"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:131
-msgid "Large"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:157
-msgid "No text"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:158
-msgid "Text"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:159
-msgid "Bubbles, no names"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:160
-msgid "Bubbles with names"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:172
+#: ../src/gui/setup_video.cpp:134
msgid "off"
msgstr ""
-#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
+#: ../src/gui/setup_video.cpp:135 ../src/gui/setup_video.cpp:148
msgid "low"
msgstr ""
-#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
+#: ../src/gui/setup_video.cpp:136 ../src/gui/setup_video.cpp:150
msgid "high"
msgstr ""
-#: ../src/gui/setup_video.cpp:187
+#: ../src/gui/setup_video.cpp:149
msgid "medium"
msgstr ""
-#: ../src/gui/setup_video.cpp:189
+#: ../src/gui/setup_video.cpp:151
msgid "max"
msgstr ""
-#: ../src/gui/setup_video.cpp:211
+#: ../src/gui/setup_video.cpp:165
msgid "Full screen"
msgstr ""
-#: ../src/gui/setup_video.cpp:212
+#: ../src/gui/setup_video.cpp:166
msgid "OpenGL"
msgstr ""
-#: ../src/gui/setup_video.cpp:213
+#: ../src/gui/setup_video.cpp:167
msgid "Custom cursor"
msgstr ""
-#: ../src/gui/setup_video.cpp:215
-msgid "Visible names"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:169
msgid "Particle effects"
msgstr ""
-#: ../src/gui/setup_video.cpp:219
-msgid "Show own name"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:220
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:221
-msgid "Show pickup notification"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:223
-msgid "in chat"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:225
-msgid "as particle"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:230
+#: ../src/gui/setup_video.cpp:171
msgid "FPS limit:"
msgstr ""
-#: ../src/gui/setup_video.cpp:241
+#: ../src/gui/setup_video.cpp:181
msgid "Disable transparency (Low CPU mode)"
msgstr ""
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:184
msgid "Video"
msgstr ""
-#: ../src/gui/setup_video.cpp:246
-msgid "Show damage"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:252
-msgid "Overhead text"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:253
-msgid "Gui opacity"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:254
-msgid "Ambient FX"
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:255
-msgid "Particle detail"
+#: ../src/gui/setup_video.cpp:191
+msgid "Ambient FX:"
msgstr ""
-#: ../src/gui/setup_video.cpp:256
-msgid "Font size"
+#: ../src/gui/setup_video.cpp:192
+msgid "Particle detail:"
msgstr ""
-#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
-#: ../src/gui/setup_video.cpp:656
+#: ../src/gui/setup_video.cpp:200 ../src/gui/setup_video.cpp:407
+#: ../src/gui/setup_video.cpp:487
msgid "None"
msgstr ""
-#: ../src/gui/setup_video.cpp:420
+#: ../src/gui/setup_video.cpp:317
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:426
+#: ../src/gui/setup_video.cpp:323
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
-#: ../src/gui/setup_video.cpp:437
+#: ../src/gui/setup_video.cpp:334
msgid "Switching to Full Screen"
msgstr ""
-#: ../src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:335
msgid "Restart needed for changes to take effect."
msgstr ""
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:349
msgid "Changing to OpenGL"
msgstr ""
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:350
msgid ""
"Applying change to OpenGL requires restart. In case OpenGL messes up your "
"game graphics, restart the game with the command line option \"--no-opengl\"."
msgstr ""
-#: ../src/gui/setup_video.cpp:460
+#: ../src/gui/setup_video.cpp:357
msgid "Deactivating OpenGL"
msgstr ""
-#: ../src/gui/setup_video.cpp:461
+#: ../src/gui/setup_video.cpp:358
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: ../src/gui/setup_video.cpp:469
+#: ../src/gui/setup_video.cpp:366
msgid "Transparency disabled"
msgstr ""
-#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
+#: ../src/gui/setup_video.cpp:367 ../src/gui/setup_video.cpp:375
msgid "You must restart to apply changes."
msgstr ""
-#: ../src/gui/setup_video.cpp:477
+#: ../src/gui/setup_video.cpp:374
msgid "Transparency enabled"
msgstr ""
-#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
+#: ../src/gui/setup_video.cpp:441 ../src/gui/setup_video.cpp:446
msgid "Screen Resolution Changed"
msgstr ""
-#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
+#: ../src/gui/setup_video.cpp:442 ../src/gui/setup_video.cpp:447
msgid "Restart your client for the change to take effect."
msgstr ""
-#: ../src/gui/setup_video.cpp:573
+#: ../src/gui/setup_video.cpp:444
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
-#: ../src/gui/setup_video.cpp:606
+#: ../src/gui/setup_video.cpp:465
msgid "Particle Effect Settings Changed."
msgstr ""
-#: ../src/gui/setup_video.cpp:607
+#: ../src/gui/setup_video.cpp:466
msgid "Changes will take effect on map change."
msgstr ""
@@ -1614,31 +1665,31 @@ msgstr ""
msgid "Skills"
msgstr ""
-#: ../src/gui/skilldialog.cpp:228
+#: ../src/gui/skilldialog.cpp:230
msgid "Up"
msgstr ""
-#: ../src/gui/skilldialog.cpp:273
+#: ../src/gui/skilldialog.cpp:275
#, c-format
msgid "Skill points available: %d"
msgstr ""
-#: ../src/gui/skilldialog.cpp:368
+#: ../src/gui/skilldialog.cpp:370
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: ../src/gui/skilldialog.cpp:377
+#: ../src/gui/skilldialog.cpp:379
#, c-format
msgid "Skill %d"
msgstr ""
-#: ../src/gui/skilldialog.cpp:459
+#: ../src/gui/skilldialog.cpp:461
#, c-format
msgid "Lvl: %d (%+d)"
msgstr ""
-#: ../src/gui/skilldialog.cpp:470
+#: ../src/gui/skilldialog.cpp:472
#, c-format
msgid "Lvl: %d"
msgstr ""
@@ -1819,45 +1870,45 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
-#: ../src/gui/statuswindow.cpp:263
+#: ../src/gui/statuswindow.cpp:115 ../src/gui/statuswindow.cpp:217
+#: ../src/gui/statuswindow.cpp:265
#, c-format
msgid "Level: %d"
msgstr ""
-#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
-#: ../src/gui/statuswindow.cpp:240
+#: ../src/gui/statuswindow.cpp:116 ../src/gui/statuswindow.cpp:210
+#: ../src/gui/statuswindow.cpp:242
#, c-format
msgid "Money: %s"
msgstr ""
-#: ../src/gui/statuswindow.cpp:117
+#: ../src/gui/statuswindow.cpp:119
msgid "HP:"
msgstr ""
-#: ../src/gui/statuswindow.cpp:122
+#: ../src/gui/statuswindow.cpp:124
msgid "Exp:"
msgstr ""
-#: ../src/gui/statuswindow.cpp:130
+#: ../src/gui/statuswindow.cpp:132
msgid "MP:"
msgstr ""
-#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
+#: ../src/gui/statuswindow.cpp:160 ../src/gui/statuswindow.cpp:278
#, c-format
msgid "Job: %d"
msgstr ""
-#: ../src/gui/statuswindow.cpp:159
+#: ../src/gui/statuswindow.cpp:161
msgid "Job:"
msgstr ""
-#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
+#: ../src/gui/statuswindow.cpp:213 ../src/gui/statuswindow.cpp:250
#, c-format
msgid "Character points: %d"
msgstr ""
-#: ../src/gui/statuswindow.cpp:256
+#: ../src/gui/statuswindow.cpp:258
#, c-format
msgid "Correction points: %d"
msgstr ""
@@ -2158,119 +2209,115 @@ msgstr ""
msgid "Enable/Disable Trading"
msgstr ""
-#: ../src/keyboardconfig.cpp:56
-msgid "Find Path to Mouse"
-msgstr ""
-
-#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
-#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
-#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
-#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
-#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
-#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:56 ../src/keyboardconfig.cpp:57
+#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
+#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
+#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
+#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
+#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
#, c-format
msgid "Item Shortcut %d"
msgstr ""
-#: ../src/keyboardconfig.cpp:69
+#: ../src/keyboardconfig.cpp:68
msgid "Help Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:70
+#: ../src/keyboardconfig.cpp:69
msgid "Status Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:71
+#: ../src/keyboardconfig.cpp:70
msgid "Inventory Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:72
+#: ../src/keyboardconfig.cpp:71
msgid "Equipment Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:73
+#: ../src/keyboardconfig.cpp:72
msgid "Skill Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:74
+#: ../src/keyboardconfig.cpp:73
msgid "Minimap Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:75
+#: ../src/keyboardconfig.cpp:74
msgid "Chat Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:76
+#: ../src/keyboardconfig.cpp:75
msgid "Item Shortcut Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:77
+#: ../src/keyboardconfig.cpp:76
msgid "Setup Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:78
+#: ../src/keyboardconfig.cpp:77
msgid "Debug Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:79
+#: ../src/keyboardconfig.cpp:78
msgid "Social Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:80
+#: ../src/keyboardconfig.cpp:79
msgid "Emote Shortcut Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:81
+#: ../src/keyboardconfig.cpp:80
msgid "Outfits Window"
msgstr ""
-#: ../src/keyboardconfig.cpp:82
+#: ../src/keyboardconfig.cpp:81
msgid "Wear Outfit"
msgstr ""
-#: ../src/keyboardconfig.cpp:83
+#: ../src/keyboardconfig.cpp:82
msgid "Copy Outfit"
msgstr ""
-#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
-#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
-#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
-#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
-#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
-#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
#, c-format
msgid "Emote Shortcut %d"
msgstr ""
-#: ../src/keyboardconfig.cpp:96
+#: ../src/keyboardconfig.cpp:95
msgid "Toggle Chat"
msgstr ""
-#: ../src/keyboardconfig.cpp:97
+#: ../src/keyboardconfig.cpp:96
msgid "Scroll Chat Up"
msgstr ""
-#: ../src/keyboardconfig.cpp:98
+#: ../src/keyboardconfig.cpp:97
msgid "Scroll Chat Down"
msgstr ""
-#: ../src/keyboardconfig.cpp:99
+#: ../src/keyboardconfig.cpp:98
msgid "Previous Chat Tab"
msgstr ""
-#: ../src/keyboardconfig.cpp:100
+#: ../src/keyboardconfig.cpp:99
msgid "Next Chat Tab"
msgstr ""
-#: ../src/keyboardconfig.cpp:101
+#: ../src/keyboardconfig.cpp:100
msgid "Select OK"
msgstr ""
-#: ../src/keyboardconfig.cpp:103
+#: ../src/keyboardconfig.cpp:102
msgid "Ignore input 1"
msgstr ""
-#: ../src/keyboardconfig.cpp:104
+#: ../src/keyboardconfig.cpp:103
msgid "Ignore input 2"
msgstr ""
@@ -2281,42 +2328,42 @@ msgid ""
"strange behaviour."
msgstr ""
-#: ../src/localplayer.cpp:895
+#: ../src/localplayer.cpp:922
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: ../src/localplayer.cpp:896
+#: ../src/localplayer.cpp:923
msgid "Item is too heavy."
msgstr ""
-#: ../src/localplayer.cpp:897
+#: ../src/localplayer.cpp:924
msgid "Item is too far away"
msgstr ""
-#: ../src/localplayer.cpp:898
+#: ../src/localplayer.cpp:925
msgid "Inventory is full."
msgstr ""
-#: ../src/localplayer.cpp:899
+#: ../src/localplayer.cpp:926
msgid "Stack is too big."
msgstr ""
-#: ../src/localplayer.cpp:901
+#: ../src/localplayer.cpp:928
msgid "Item belongs to someone else."
msgstr ""
-#: ../src/localplayer.cpp:902
+#: ../src/localplayer.cpp:929
msgid "Unknown problem picking up item."
msgstr ""
-#: ../src/localplayer.cpp:920
+#: ../src/localplayer.cpp:947
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: ../src/localplayer.cpp:1030
+#: ../src/localplayer.cpp:1057
msgid "Away"
msgstr ""
@@ -2463,81 +2510,81 @@ msgstr ""
msgid "Willpower %+.1f"
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/manaserv/beinghandler.cpp:309
#: ../src/net/tmwa/playerhandler.cpp:95
msgid "You are dead."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/manaserv/beinghandler.cpp:310
#: ../src/net/tmwa/playerhandler.cpp:96
msgid "We regret to inform you that your character was killed in battle."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/manaserv/beinghandler.cpp:312
#: ../src/net/tmwa/playerhandler.cpp:98
msgid "You are not that alive anymore."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/manaserv/beinghandler.cpp:313
#: ../src/net/tmwa/playerhandler.cpp:99
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/manaserv/beinghandler.cpp:314
#: ../src/net/tmwa/playerhandler.cpp:100
msgid "Game Over!"
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/manaserv/beinghandler.cpp:315
#: ../src/net/tmwa/playerhandler.cpp:102
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/manaserv/beinghandler.cpp:317
#: ../src/net/tmwa/playerhandler.cpp:104
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/manaserv/beinghandler.cpp:319
#: ../src/net/tmwa/playerhandler.cpp:106
msgid "I guess this did not run too well."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/manaserv/beinghandler.cpp:320
#: ../src/net/tmwa/playerhandler.cpp:108
msgid "Do you want your possessions identified?"
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/manaserv/beinghandler.cpp:321
#: ../src/net/tmwa/playerhandler.cpp:110
msgid "Sadly, no trace of you was ever found..."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/manaserv/beinghandler.cpp:322
#: ../src/net/tmwa/playerhandler.cpp:112
msgid "Annihilated."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/manaserv/beinghandler.cpp:323
#: ../src/net/tmwa/playerhandler.cpp:114
msgid "Looks like you got your head handed to you."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/manaserv/beinghandler.cpp:324
#: ../src/net/tmwa/playerhandler.cpp:116
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:303
+#: ../src/net/manaserv/beinghandler.cpp:329
msgid "Press OK to respawn."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:304
+#: ../src/net/manaserv/beinghandler.cpp:330
msgid "You Died"
msgstr ""
@@ -2598,11 +2645,6 @@ msgid "Unknown error."
msgstr ""
#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:146
-msgid "Info"
-msgstr ""
-
-#: ../src/net/manaserv/charhandler.cpp:210
msgid "Player deleted."
msgstr ""
@@ -2773,20 +2815,47 @@ msgstr ""
msgid "You took too long with the captcha or your response was incorrect."
msgstr ""
-#: ../src/net/manaserv/partyhandler.cpp:87
-msgid "Joined party."
+#: ../src/net/manaserv/partyhandler.cpp:75
+#, c-format
+msgid ""
+"Party invite failed, because no player called %s is within the visual range."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:98
+msgid ""
+"Joining party failed, because the invitation has timed out on the server."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:102
+msgid "Joining party failed, because the inviter has left the game."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid " on invitation from %s"
msgstr ""
-#: ../src/net/manaserv/partyhandler.cpp:105
+#: ../src/net/manaserv/partyhandler.cpp:128
#, c-format
-msgid "%s joined the party."
+msgid "%s joined the party%s."
msgstr ""
-#: ../src/net/manaserv/partyhandler.cpp:123
+#: ../src/net/manaserv/partyhandler.cpp:148
#, c-format
msgid "%s rejected your invite."
msgstr ""
+#: ../src/net/manaserv/partyhandler.cpp:152
+msgid ""
+"Party invitation rejected by server, because of too many invitations in a "
+"short time."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:157
+#, c-format
+msgid "%s is already in a party."
+msgstr ""
+
#: ../src/net/manaserv/tradehandler.cpp:95
msgid "Accepting incoming trade requests."
msgstr ""
@@ -2926,16 +2995,16 @@ msgstr ""
msgid "Channels are not supported!"
msgstr ""
-#: ../src/net/tmwa/gamehandler.cpp:89
+#: ../src/net/tmwa/gamehandler.cpp:83
#, c-format
msgid "Online users: %d"
msgstr ""
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Game"
msgstr ""
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Request to quit denied!"
msgstr ""
@@ -3073,7 +3142,7 @@ msgid "Guild name is missing."
msgstr ""
#: ../src/net/tmwa/guildhandler.cpp:296
-msgid "Could not inivte user to guild."
+msgid "Could not invite user to guild."
msgstr ""
#: ../src/net/tmwa/guildhandler.cpp:301
@@ -3200,15 +3269,15 @@ msgstr ""
msgid "Experience sharing unknown."
msgstr ""
-#: ../src/net/tmwa/inventoryhandler.cpp:287
+#: ../src/net/tmwa/inventoryhandler.cpp:286
msgid "Failed to use item."
msgstr ""
-#: ../src/net/tmwa/inventoryhandler.cpp:401
+#: ../src/net/tmwa/inventoryhandler.cpp:400
msgid "Unable to equip."
msgstr ""
-#: ../src/net/tmwa/inventoryhandler.cpp:413
+#: ../src/net/tmwa/inventoryhandler.cpp:412
msgid "Unable to unequip."
msgstr ""
@@ -3542,35 +3611,35 @@ msgstr ""
msgid "Blink name"
msgstr ""
-#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/beinginfo.cpp:33 ../src/resources/itemdb.cpp:271
#: ../src/resources/monsterdb.cpp:77
msgid "unnamed"
msgstr ""
-#: ../src/resources/itemdb.cpp:310
+#: ../src/resources/itemdb.cpp:69
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:321
#, c-format
msgid "Attack %+d"
msgstr ""
-#: ../src/resources/itemdb.cpp:311
+#: ../src/resources/itemdb.cpp:322
#, c-format
msgid "Defense %+d"
msgstr ""
-#: ../src/resources/itemdb.cpp:312
+#: ../src/resources/itemdb.cpp:323
#, c-format
msgid "HP %+d"
msgstr ""
-#: ../src/resources/itemdb.cpp:313
+#: ../src/resources/itemdb.cpp:324
#, c-format
msgid "MP %+d"
msgstr ""
-#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
-msgid "Unknown item"
-msgstr ""
-
#: ../src/resources/userpalette.cpp:91
msgid "Being"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 42ee532d..ce5138e4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mana\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 16:50+0200\n"
+"POT-Creation-Date: 2011-06-24 01:55+0200\n"
"PO-Revision-Date: 2011-02-26 19:45-0300\n"
"Last-Translator: alastrim <alasmirt@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: ../src/gui/npcdialog.cpp:208
+#: ../src/gui/npcdialog.cpp:209
msgid ""
"\n"
"> Next\n"
@@ -105,6 +105,11 @@ msgstr " -u --skip-update : Não faz downloads de atualização"
msgid " -v --version : Display the version"
msgstr " -v --version : Exibe a versão"
+#: ../src/net/manaserv/partyhandler.cpp:126
+#, fuzzy, c-format
+msgid " on invitation from %s"
+msgstr "Resposta de convite desconhecida para %s."
+
#: ../src/gui/updatewindow.cpp:419
msgid "##1 It is strongly recommended that"
msgstr "##1 É altamente recomendado que"
@@ -132,17 +137,17 @@ msgstr "% Críticos"
msgid "% Evade"
msgstr "% Evasão"
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, no-c-format
+#: ../src/gui/debugwindow.cpp:59
+#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: ../src/gui/debugwindow.cpp:56
+#: ../src/gui/debugwindow.cpp:54
#, c-format
msgid "%d FPS (OpenGL)"
msgstr "%d FPS (OpenGL)"
-#: ../src/client.cpp:1154 ../src/client.cpp:1182
+#: ../src/client.cpp:1151 ../src/client.cpp:1179
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
@@ -187,6 +192,11 @@ msgstr "%s colocou o modo %s no usuário %s."
msgid "%s is already a member of a party."
msgstr "%s já é membro de um grupo."
+#: ../src/net/manaserv/partyhandler.cpp:157
+#, fuzzy, c-format
+msgid "%s is already in a party."
+msgstr "%s já é membro de um grupo."
+
#: ../src/net/tmwa/partyhandler.cpp:368
#, c-format
msgid "%s is not in your party!"
@@ -197,9 +207,9 @@ msgstr "%s não está em seu grupo!"
msgid "%s is now a member of your party."
msgstr "%s agora é um membro do seu grupo."
-#: ../src/net/manaserv/partyhandler.cpp:105
-#, c-format
-msgid "%s joined the party."
+#: ../src/net/manaserv/partyhandler.cpp:128
+#, fuzzy, c-format
+msgid "%s joined the party%s."
msgstr "%s entrou para o grupo."
#: ../src/net/manaserv/chathandler.cpp:311
@@ -212,7 +222,7 @@ msgstr "%s saiu do canal."
msgid "%s refused your invitation."
msgstr "%s recusou seu convite."
-#: ../src/net/manaserv/partyhandler.cpp:123
+#: ../src/net/manaserv/partyhandler.cpp:148
#, c-format
msgid "%s rejected your invite."
msgstr "%s recusou seu convite."
@@ -236,15 +246,15 @@ msgstr "(vazio)"
msgid "*** only available to a GM ***"
msgstr "*** Disponivel apenas para GM's ***"
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
-#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:464
+#: ../src/gui/buy.cpp:75 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:466
msgid "+"
msgstr "+"
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
-#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:476
+#: ../src/gui/buy.cpp:78 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:126 ../src/gui/sell.cpp:76
+#: ../src/gui/statuswindow.cpp:478
msgid "-"
msgstr "-"
@@ -443,7 +453,7 @@ msgstr ""
msgid ">"
msgstr ">"
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
+#: ../src/gui/setup_interface.cpp:78 ../src/gui/setup_players.cpp:206
msgid "???"
msgstr "???"
@@ -465,7 +475,7 @@ msgstr "Aceitar convite para a guilda"
msgid "Accepted party invite from %s."
msgstr "Aceitou convite para o grupo de %s."
-#: ../src/game.cpp:738
+#: ../src/game.cpp:722
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
@@ -507,7 +517,7 @@ msgstr "Conta não encontrada. Por favor, tente novamente."
msgid "Account: %s"
msgstr "Conta: %s"
-#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/popupmenu.cpp:372
msgid "Activate"
msgstr ""
@@ -515,11 +525,11 @@ msgstr ""
msgid "Add"
msgstr "Adicionar"
-#: ../src/gui/popupmenu.cpp:171
+#: ../src/gui/popupmenu.cpp:174
msgid "Add name to chat"
msgstr "Adicionar nome ao chat"
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
+#: ../src/gui/popupmenu.cpp:193 ../src/gui/popupmenu.cpp:390
msgid "Add to chat"
msgstr "Adicionar ao chat"
@@ -571,34 +581,30 @@ msgstr "Já está conectado."
msgid "Already recording."
msgstr "Já está gravando."
-#: ../src/gui/setup_video.cpp:254
-msgid "Ambient FX"
+#: ../src/gui/setup_video.cpp:191
+#, fuzzy
+msgid "Ambient FX:"
msgstr "Ambiente FX"
-#: ../src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
-msgstr "Ambiente FX: %s"
-
#: ../src/net/tmwa/partyhandler.cpp:299
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Um membro desconhecido tentou dizer: %s"
-#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/manaserv/beinghandler.cpp:322
#: ../src/net/tmwa/playerhandler.cpp:112
msgid "Annihilated."
msgstr "Aniquilado."
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Apply"
msgstr "Aplicar"
-#: ../src/gui/setup_video.cpp:461
+#: ../src/gui/setup_video.cpp:358
msgid "Applying change to OpenGL requires restart."
msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:350
msgid ""
"Applying change to OpenGL requires restart. In case OpenGL messes up your "
"game graphics, restart the game with the command line option \"--no-opengl\"."
@@ -621,7 +627,7 @@ msgstr "Tem certeza que deseja sair da guilda %s?"
msgid "Are you sure you want to leave party %s?"
msgstr "Tem certeza que deseja sair do grupo %s?"
-#: ../src/gui/setup_keyboard.cpp:86
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr "Atribuir"
@@ -634,12 +640,12 @@ msgstr ""
msgid "Attack"
msgstr "Ataque"
-#: ../src/resources/itemdb.cpp:310
+#: ../src/resources/itemdb.cpp:321
#, c-format
msgid "Attack %+d"
msgstr "Ataque %+d"
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:161
#, c-format
msgid "Attack %s"
msgstr "Ataque %s"
@@ -656,7 +662,7 @@ msgstr "Áudio"
msgid "Authentication failed."
msgstr "Falha de autenticação."
-#: ../src/localplayer.cpp:1030
+#: ../src/localplayer.cpp:1057
msgid "Away"
msgstr "Fora do Teclado"
@@ -669,6 +675,20 @@ msgstr "Amizade %s"
msgid "Being"
msgstr "Personagem"
+#: ../src/gui/debugwindow.cpp:136
+#, fuzzy
+msgid "Being collision radius"
+msgstr "Rolar radius"
+
+#: ../src/gui/debugwindow.cpp:138
+#, fuzzy
+msgid "Being path"
+msgstr "Personagem"
+
+#: ../src/gui/debugwindow.cpp:137
+msgid "Being positions"
+msgstr ""
+
#: ../src/net/tmwa/playerhandler.cpp:124
msgid "Bereft of life, you rest in peace."
msgstr "Sem vida, você descansa em paz."
@@ -681,15 +701,15 @@ msgstr "Piscar nome"
msgid "Blue:"
msgstr "Azul:"
-#: ../src/gui/setup_video.cpp:160
+#: ../src/gui/setup_interface.cpp:91
msgid "Bubbles with names"
msgstr "Bolhas com nomes"
-#: ../src/gui/setup_video.cpp:159
+#: ../src/gui/setup_interface.cpp:90
msgid "Bubbles, no names"
msgstr "Bolhas, sem nomes"
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+#: ../src/gui/buy.cpp:50 ../src/gui/buy.cpp:79 ../src/gui/buysell.cpp:47
msgid "Buy"
msgstr "Comprar"
@@ -700,10 +720,10 @@ msgstr "Calibrar"
#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:178
+#: ../src/gui/popupmenu.cpp:197 ../src/gui/popupmenu.cpp:392
#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/setup.cpp:52 ../src/gui/socialwindow.cpp:275
#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
#: ../src/gui/updatewindow.cpp:144
msgid "Cancel"
@@ -767,15 +787,15 @@ msgstr "Alterar senha"
msgid "Change Server"
msgstr "Trocar servidor"
-#: ../src/gui/setup_video.cpp:607
+#: ../src/gui/setup_video.cpp:466
msgid "Changes will take effect on map change."
msgstr "As mudanças terão efeito ao mudar de mapa."
-#: ../src/client.cpp:848
+#: ../src/client.cpp:845
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:349
msgid "Changing to OpenGL"
msgstr "Mudando para OpenGL"
@@ -795,7 +815,7 @@ msgstr "Não há suporte para canais!"
msgid "Character deleted."
msgstr "Personagem deletado."
-#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
+#: ../src/gui/statuswindow.cpp:213 ../src/gui/statuswindow.cpp:250
#, c-format
msgid "Character points: %d"
msgstr "Pontos do personagem: %d"
@@ -820,7 +840,7 @@ msgstr "Atributos do personagem estão muito baixos."
msgid "Chat"
msgstr "Chat"
-#: ../src/keyboardconfig.cpp:75
+#: ../src/keyboardconfig.cpp:74
msgid "Chat Window"
msgstr "Janela de chat"
@@ -848,7 +868,7 @@ msgstr "Escolha o nome da sua guilda."
msgid "Choose your party's name."
msgstr "Escolha o nome do seu grupo."
-#: ../src/gui/npcdialog.cpp:118
+#: ../src/gui/npcdialog.cpp:119
msgid "Clear log"
msgstr "Limpar log"
@@ -869,10 +889,14 @@ msgstr "Versão do cliente é muito antiga."
msgid "Client version is too old."
msgstr "Versão do cliente é muito antiga."
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:51
msgid "Close"
msgstr "Fechar"
+#: ../src/gui/debugwindow.cpp:135
+msgid "Collision tiles"
+msgstr ""
+
#: ../src/gui/setup_colors.cpp:51
msgid "Colors"
msgstr "Cores"
@@ -1067,11 +1091,11 @@ msgstr ""
msgid "Connect"
msgstr "Conectar"
-#: ../src/client.cpp:661
+#: ../src/client.cpp:658
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: ../src/client.cpp:838
+#: ../src/client.cpp:835
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
@@ -1083,16 +1107,16 @@ msgstr "Conectando..."
msgid "Connection to server terminated. "
msgstr "Conexão com o servidor interrompida."
-#: ../src/keyboardconfig.cpp:83
+#: ../src/keyboardconfig.cpp:82
msgid "Copy Outfit"
msgstr "Copiar roupas"
-#: ../src/gui/statuswindow.cpp:256
+#: ../src/gui/statuswindow.cpp:258
#, c-format
msgid "Correction points: %d"
msgstr "Pontos de correção: %d"
-#: ../src/game.cpp:966
+#: ../src/game.cpp:950
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
@@ -1101,7 +1125,8 @@ msgid "Could not create party."
msgstr "Não foi possível criar o grupo."
#: ../src/net/tmwa/guildhandler.cpp:296
-msgid "Could not inivte user to guild."
+#, fuzzy
+msgid "Could not invite user to guild."
msgstr "Não foi possível convidar jogador para a guilda."
#: ../src/net/tmwa/specialhandler.cpp:157
@@ -1151,7 +1176,7 @@ msgstr "Falha ao criar grupo, escolha um nome mais curto."
msgid "Critical Hit"
msgstr "Golpe crítico"
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: ../src/gui/debugwindow.cpp:96
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Cursor: (%d, %d)"
@@ -1160,23 +1185,23 @@ msgstr "Cursor: (%d, %d)"
msgid "Custom Server"
msgstr "Servidor customizado"
-#: ../src/gui/setup_video.cpp:213
+#: ../src/gui/setup_video.cpp:167
msgid "Custom cursor"
msgstr "Cursor customizado"
-#: ../src/gui/setup_video.cpp:460
+#: ../src/gui/setup_video.cpp:357
msgid "Deactivating OpenGL"
msgstr "Desativando OpenGL"
-#: ../src/gui/debugwindow.cpp:43
+#: ../src/gui/debugwindow.cpp:219
msgid "Debug"
msgstr "Depurador"
-#: ../src/keyboardconfig.cpp:78
+#: ../src/keyboardconfig.cpp:77
msgid "Debug Window"
msgstr "Janela de depuração"
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:96
msgid "Default"
msgstr "Padrão"
@@ -1184,7 +1209,7 @@ msgstr "Padrão"
msgid "Defense"
msgstr "Defesa"
-#: ../src/resources/itemdb.cpp:311
+#: ../src/resources/itemdb.cpp:322
#, c-format
msgid "Defense %+d"
msgstr "Defesa %+d"
@@ -1217,7 +1242,7 @@ msgstr "Destreza %+d"
msgid "Dexterity:"
msgstr "Destreza:"
-#: ../src/gui/setup_video.cpp:241
+#: ../src/gui/setup_video.cpp:181
msgid "Disable transparency (Low CPU mode)"
msgstr "Desabilitar transparência (CPU Modo Econômico)"
@@ -1230,7 +1255,7 @@ msgstr "Desprezar %s"
msgid "Disregarded"
msgstr "Desconsiderado"
-#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/manaserv/beinghandler.cpp:320
#: ../src/net/tmwa/playerhandler.cpp:108
msgid "Do you want your possessions identified?"
msgstr "Você quer uma identificação de suas posses?"
@@ -1244,12 +1269,12 @@ msgstr "Baixar música"
msgid "Downloading server list...%2.2f%%"
msgstr "Baixando lista de servidores...%2.2f%%"
-#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
+#: ../src/gui/inventorywindow.cpp:373 ../src/gui/popupmenu.cpp:377
msgid "Drop"
msgstr "Descartar"
-#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
-#: ../src/gui/popupmenu.cpp:372
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/inventorywindow.cpp:371
+#: ../src/gui/popupmenu.cpp:375
msgid "Drop..."
msgstr "Descartar..."
@@ -1257,7 +1282,7 @@ msgstr "Descartar..."
msgid "Duplicated login."
msgstr "Login duplicado."
-#: ../src/client.cpp:935
+#: ../src/client.cpp:932
msgid "Email Change"
msgstr "Mudar email"
@@ -1265,7 +1290,7 @@ msgstr "Mudar email"
msgid "Email address already exists."
msgstr "Endereço de email já existe."
-#: ../src/client.cpp:936
+#: ../src/client.cpp:933
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
@@ -1273,17 +1298,17 @@ msgstr "Email modificado com sucesso!"
msgid "Email:"
msgstr "Email:"
-#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
-#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
-#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
-#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
-#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
-#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
#, c-format
msgid "Emote Shortcut %d"
msgstr "Atalho para Emoticon %d"
-#: ../src/keyboardconfig.cpp:80
+#: ../src/keyboardconfig.cpp:79
msgid "Emote Shortcut Window"
msgstr "Janela de atalho para Emoticons"
@@ -1316,12 +1341,12 @@ msgstr "Fim da lista de canais."
msgid "Enter the old password first."
msgstr "Primeiro entre com a antiga senha."
-#: ../src/client.cpp:721
+#: ../src/client.cpp:718
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
-#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
+#: ../src/gui/inventorywindow.cpp:93 ../src/gui/inventorywindow.cpp:106
+#: ../src/gui/inventorywindow.cpp:362 ../src/gui/popupmenu.cpp:369
msgid "Equip"
msgstr "Equipar"
@@ -1329,15 +1354,15 @@ msgstr "Equipar"
msgid "Equip arrows first."
msgstr "Equipe as flechas primeiro."
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+#: ../src/gui/equipmentwindow.cpp:54 ../src/gui/windowmenu.cpp:55
msgid "Equipment"
msgstr "Equipamento"
-#: ../src/keyboardconfig.cpp:72
+#: ../src/keyboardconfig.cpp:71
msgid "Equipment Window"
msgstr "Janela de equipamento"
-#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/client.cpp:1033 ../src/gui/changeemaildialog.cpp:156
#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
@@ -1351,7 +1376,7 @@ msgstr "Erro"
msgid "Error creating guild."
msgstr "Erro ao criar Guilda."
-#: ../src/client.cpp:1336 ../src/client.cpp:1342
+#: ../src/client.cpp:1333 ../src/client.cpp:1339
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
@@ -1363,7 +1388,7 @@ msgstr "Erro ao entrar no canal."
msgid "Error retreiving server list!"
msgstr "Erro ao recuperar lista!"
-#: ../src/game.cpp:967
+#: ../src/game.cpp:951
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -1372,7 +1397,7 @@ msgstr "Erro ao carregar %s"
msgid "Exp Notification"
msgstr "Aviso de experiência"
-#: ../src/gui/statuswindow.cpp:122
+#: ../src/gui/statuswindow.cpp:124
msgid "Exp:"
msgstr "Exp:"
@@ -1392,7 +1417,7 @@ msgstr "Não é possível compartilhar experiência."
msgid "Experience sharing unknown."
msgstr "Compartilhamento de experiência desconhecido."
-#: ../src/gui/setup_video.cpp:230
+#: ../src/gui/setup_video.cpp:171
msgid "FPS limit:"
msgstr "Limite FPS:"
@@ -1433,24 +1458,24 @@ msgstr "Falha ao enviar como remetente ou a carta é inválida."
msgid "Failed to start recording."
msgstr "Falha ao iniciar gravação."
-#: ../src/gui/setup_video.cpp:426
+#: ../src/gui/setup_video.cpp:323
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:420
+#: ../src/gui/setup_video.cpp:317
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/net/tmwa/inventoryhandler.cpp:287
+#: ../src/net/tmwa/inventoryhandler.cpp:286
msgid "Failed to use item."
msgstr "Falha ao usar item."
-#: ../src/client.cpp:956
+#: ../src/client.cpp:953
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
@@ -1458,16 +1483,13 @@ msgstr "Tchau, volte sempre..."
msgid "Female"
msgstr "Mulher"
-#: ../src/keyboardconfig.cpp:56
-msgid "Find Path to Mouse"
-msgstr "Encontrar rota para o mouse"
-
#: ../src/gui/recorder.cpp:87
msgid "Finishing recording."
msgstr "Finalizando gravação."
-#: ../src/gui/setup_video.cpp:256
-msgid "Font size"
+#: ../src/gui/setup_interface.cpp:130
+#, fuzzy
+msgid "Font size:"
msgstr "Tamanho da fonte"
#: ../src/commandhandler.cpp:204
@@ -1478,7 +1500,7 @@ msgstr "Para mais informações, digite /help <comando>."
msgid "Friend"
msgstr "Amigo"
-#: ../src/gui/setup_video.cpp:211
+#: ../src/gui/setup_video.cpp:165
msgid "Full screen"
msgstr "Tela cheia"
@@ -1486,16 +1508,16 @@ msgstr "Tela cheia"
msgid "GM Names"
msgstr "Nomes dos GMs"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Game"
msgstr "Jogo"
-#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/manaserv/beinghandler.cpp:314
#: ../src/net/tmwa/playerhandler.cpp:100
msgid "Game Over!"
msgstr "Fim de jogo!"
-#: ../src/game.cpp:181
+#: ../src/game.cpp:179
msgid "General"
msgstr "Geral"
@@ -1516,7 +1538,11 @@ msgstr "Você foi desconectado do servidor!"
msgid "Green:"
msgstr "Verde:"
-#: ../src/gui/setup_video.cpp:253
+#: ../src/gui/debugwindow.cpp:134
+msgid "Grid"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:129
msgid "Gui opacity"
msgstr "Opacidade"
@@ -1549,12 +1575,12 @@ msgstr "A criação de guildas ainda não é suportada."
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: ../src/resources/itemdb.cpp:312
+#: ../src/resources/itemdb.cpp:323
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: ../src/gui/statuswindow.cpp:117
+#: ../src/gui/statuswindow.cpp:119
msgid "HP:"
msgstr "HP:"
@@ -1570,7 +1596,7 @@ msgstr "Estilo do Cabelo:"
msgid "Help"
msgstr "Ajuda"
-#: ../src/keyboardconfig.cpp:69
+#: ../src/keyboardconfig.cpp:68
msgid "Help Window"
msgstr "Janela de Ajuda"
@@ -1582,7 +1608,7 @@ msgstr "Esconder janelas"
msgid "Huh? What's that?"
msgstr "Hã? O que é isso?"
-#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/manaserv/beinghandler.cpp:319
#: ../src/net/tmwa/playerhandler.cpp:106
msgid "I guess this did not run too well."
msgstr "Eu acho que as coisas não correram tão bem."
@@ -1610,11 +1636,11 @@ msgstr "Se você for a última pessoa no canal, ele será deletado."
msgid "Ignore %s"
msgstr "Ignorar %s"
-#: ../src/keyboardconfig.cpp:103
+#: ../src/keyboardconfig.cpp:102
msgid "Ignore input 1"
msgstr "Ignorar input 1"
-#: ../src/keyboardconfig.cpp:104
+#: ../src/keyboardconfig.cpp:103
msgid "Ignore input 2"
msgstr "Ignorar input 2"
@@ -1622,7 +1648,7 @@ msgstr "Ignorar input 2"
msgid "Ignored"
msgstr "Ignorado"
-#: ../src/game.cpp:733
+#: ../src/game.cpp:717
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
@@ -1630,7 +1656,7 @@ msgstr "Ignorando propostas de negócios"
msgid "Ignoring incoming trade requests."
msgstr "Ignorando propostas de negócios."
-#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/gui/debugwindow.cpp:235 ../src/net/manaserv/charhandler.cpp:210
#: ../src/net/tmwa/charserverhandler.cpp:146
msgid "Info"
msgstr "Informações"
@@ -1666,6 +1692,10 @@ msgstr "Inteligência %+d"
msgid "Intelligence:"
msgstr "Inteligência:"
+#: ../src/gui/setup_interface.cpp:120
+msgid "Interface"
+msgstr ""
+
#: ../src/net/manaserv/charhandler.cpp:267
#, fuzzy
msgid "Invalid character slot selected."
@@ -1692,20 +1722,20 @@ msgstr "Nome inválido."
msgid "Invalid slot number."
msgstr "Nome inválido."
-#: ../src/client.cpp:1302
+#: ../src/client.cpp:1299
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+#: ../src/gui/inventorywindow.cpp:60 ../src/gui/windowmenu.cpp:56
msgid "Inventory"
msgstr "Inventário"
-#: ../src/keyboardconfig.cpp:71
+#: ../src/keyboardconfig.cpp:70
msgid "Inventory Window"
msgstr "Janela de inventário"
-#: ../src/localplayer.cpp:898
+#: ../src/localplayer.cpp:925
msgid "Inventory is full."
msgstr "O inventário está cheio."
@@ -1718,7 +1748,7 @@ msgstr "Convidar"
msgid "Invite %s to join your guild"
msgstr "Convidar %s para a sua guilda"
-#: ../src/gui/popupmenu.cpp:134
+#: ../src/gui/popupmenu.cpp:136
#, c-format
msgid "Invite %s to join your party"
msgstr "Convidar %s para o seu grupo"
@@ -1743,29 +1773,29 @@ msgid "Inviting failed, because you can't see a player called %s."
msgstr ""
"Não foi possível fazer o convite, pois você não vê um jogador chamado %s."
-#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
-#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
-#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
-#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
-#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
-#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:56 ../src/keyboardconfig.cpp:57
+#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
+#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
+#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
+#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
+#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
#, c-format
msgid "Item Shortcut %d"
msgstr "Atalho para item %d"
-#: ../src/keyboardconfig.cpp:76
+#: ../src/keyboardconfig.cpp:75
msgid "Item Shortcut Window"
msgstr "Janela de atalhos para itens"
-#: ../src/localplayer.cpp:901
+#: ../src/localplayer.cpp:928
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
-#: ../src/localplayer.cpp:897
+#: ../src/localplayer.cpp:924
msgid "Item is too far away"
msgstr "Este item está muito longe."
-#: ../src/localplayer.cpp:896
+#: ../src/localplayer.cpp:923
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
@@ -1785,33 +1815,39 @@ msgstr "Não é possível compartilhar itens."
msgid "Item sharing unknown."
msgstr "Compartilhamento de itens desconhecido."
-#: ../src/client.cpp:785
+#: ../src/client.cpp:782
#, fuzzy
msgid "ItemDB: Error while loading "
msgstr "Erro ao carregar %s"
-#: ../src/gui/statuswindow.cpp:159
+#: ../src/gui/statuswindow.cpp:161
msgid "Job:"
msgstr "Trabalho:"
-#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
+#: ../src/gui/statuswindow.cpp:160 ../src/gui/statuswindow.cpp:278
#, c-format
msgid "Job: %d"
msgstr "Trabalho: %d"
-#: ../src/net/manaserv/partyhandler.cpp:87
-msgid "Joined party."
-msgstr "Entrou para o grupo."
+#: ../src/net/manaserv/partyhandler.cpp:98
+msgid ""
+"Joining party failed, because the invitation has timed out on the server."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:102
+#, fuzzy
+msgid "Joining party failed, because the inviter has left the game."
+msgstr "Falha ao criar grupo, escolha um nome mais curto."
#: ../src/gui/setup_joystick.cpp:41
msgid "Joystick"
msgstr "Joystick"
-#: ../src/gui/setup_keyboard.cpp:125
+#: ../src/gui/setup_keyboard.cpp:127
msgid "Key Conflict(s) Detected."
msgstr "Conflitos de teclas detectado."
-#: ../src/gui/setup_keyboard.cpp:77
+#: ../src/gui/setup_keyboard.cpp:78
msgid "Keyboard"
msgstr "Teclado"
@@ -1819,11 +1855,11 @@ msgstr "Teclado"
msgid "Kick failed!"
msgstr "Erro na expulsão!"
-#: ../src/gui/popupmenu.cpp:163
+#: ../src/gui/popupmenu.cpp:166
msgid "Kick monster"
msgstr "Expulsar monstro"
-#: ../src/gui/popupmenu.cpp:141
+#: ../src/gui/popupmenu.cpp:144
msgid "Kick player"
msgstr "Expulsar jogador"
@@ -1831,7 +1867,7 @@ msgstr "Expulsar jogador"
msgid "Kick succeeded!"
msgstr "Expulsão bem sucedida!"
-#: ../src/gui/setup_video.cpp:131
+#: ../src/gui/setup_interface.cpp:62
msgid "Large"
msgstr "Grande"
@@ -1847,8 +1883,8 @@ msgstr "Sair da guilda?"
msgid "Leave Party?"
msgstr "Sair do grupo?"
-#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
-#: ../src/gui/statuswindow.cpp:263
+#: ../src/gui/statuswindow.cpp:115 ../src/gui/statuswindow.cpp:217
+#: ../src/gui/statuswindow.cpp:265
#, c-format
msgid "Level: %d"
msgstr "Nível: %d"
@@ -1869,11 +1905,11 @@ msgstr "Jogador Acerta Monstro"
msgid "Local Player Miss"
msgstr "Jogador Erra o Golpe"
-#: ../src/gui/setup_video.cpp:220
+#: ../src/gui/setup_interface.cpp:108
msgid "Log NPC dialogue"
msgstr "Log diálogos com NPC"
-#: ../src/client.cpp:688
+#: ../src/client.cpp:685
msgid "Logging in"
msgstr "Efetuando login"
@@ -1885,7 +1921,7 @@ msgstr "Login"
msgid "Login attempt too soon after previous attempt."
msgstr "Tentativa de login muito próxima da última tentativa."
-#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/manaserv/beinghandler.cpp:323
#: ../src/net/tmwa/playerhandler.cpp:114
msgid "Looks like you got your head handed to you."
msgstr "Parece que te ofereceram sua própria cabeça."
@@ -1903,12 +1939,12 @@ msgstr "Sorte %+d"
msgid "Luck:"
msgstr "Sorte:"
-#: ../src/gui/skilldialog.cpp:470
+#: ../src/gui/skilldialog.cpp:472
#, c-format
msgid "Lvl: %d"
msgstr "Nível: %d"
-#: ../src/gui/skilldialog.cpp:459
+#: ../src/gui/skilldialog.cpp:461
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nível: %d (%+d)"
@@ -1921,12 +1957,12 @@ msgstr "Ataque Mágico"
msgid "M.Defense"
msgstr "Defesa Mágica"
-#: ../src/resources/itemdb.cpp:313
+#: ../src/resources/itemdb.cpp:324
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: ../src/gui/statuswindow.cpp:130
+#: ../src/gui/statuswindow.cpp:132
msgid "MP:"
msgstr "MP:"
@@ -1938,22 +1974,22 @@ msgstr "Jogador VIP."
msgid "Male"
msgstr "Homem"
-#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:87
msgid "Map"
msgstr "Mapa"
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: ../src/gui/debugwindow.cpp:103
#, c-format
msgid "Map: %s"
msgstr "Mapa: %s"
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
-#: ../src/gui/statuswindow.cpp:497
+#: ../src/gui/buy.cpp:81 ../src/gui/sell.cpp:79
+#: ../src/gui/statuswindow.cpp:387 ../src/gui/statuswindow.cpp:465
+#: ../src/gui/statuswindow.cpp:499
msgid "Max"
msgstr "Máximo"
-#: ../src/gui/setup_video.cpp:130
+#: ../src/gui/setup_interface.cpp:61
msgid "Medium"
msgstr "Média"
@@ -1981,11 +2017,11 @@ msgstr "A mensagem fecha o chat."
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: ../src/keyboardconfig.cpp:74
+#: ../src/keyboardconfig.cpp:73
msgid "Minimap Window"
msgstr "Janela de Minimapa"
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
+#: ../src/gui/debugwindow.cpp:101
#, c-format
msgid "Minimap: %s"
msgstr "Minimapa: %s"
@@ -1994,8 +2030,8 @@ msgstr "Minimapa: %s"
msgid "Misses"
msgstr "Golpes errados"
-#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
-#: ../src/gui/statuswindow.cpp:240
+#: ../src/gui/statuswindow.cpp:116 ../src/gui/statuswindow.cpp:210
+#: ../src/gui/statuswindow.cpp:242
#, c-format
msgid "Money: %s"
msgstr "Dinheiro: %s"
@@ -2008,6 +2044,10 @@ msgstr "Monstro Acerta Jogador"
msgid "Monsters"
msgstr "Monstros"
+#: ../src/gui/debugwindow.cpp:139
+msgid "Mouse path"
+msgstr ""
+
#: ../src/keyboardconfig.cpp:40
msgid "Move Down"
msgstr "Mover para Baixo"
@@ -2028,12 +2068,12 @@ msgstr "Mover para Cima"
msgid "Music volume"
msgstr "Volume da Música"
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#: ../src/gui/debugwindow.cpp:100
#, c-format
msgid "Music: %s"
msgstr "Música: %s"
-#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
+#: ../src/gui/npcdialog.cpp:74 ../src/gui/npcpostdialog.cpp:41
msgid "NPC"
msgstr "NPC"
@@ -2055,7 +2095,7 @@ msgstr "Nome:"
msgid "Name: %s"
msgstr "Nome: %s"
-#: ../src/gui/ministatus.cpp:236
+#: ../src/gui/ministatus.cpp:234
msgid "Need"
msgstr "Precisa"
@@ -2067,7 +2107,7 @@ msgstr "É preciso um usuário para expulsar!"
msgid "Need a user to op!"
msgstr "É preciso um usuário para dar op!"
-#: ../src/game.cpp:386
+#: ../src/game.cpp:374
msgid "Network Error"
msgstr "Erro de conexão"
@@ -2087,11 +2127,11 @@ msgstr "Nova senha incorreta."
msgid "New password too short."
msgstr "Nova senha é muito curta."
-#: ../src/gui/npcdialog.cpp:49
+#: ../src/gui/npcdialog.cpp:50
msgid "Next"
msgstr "Próximo"
-#: ../src/keyboardconfig.cpp:100
+#: ../src/keyboardconfig.cpp:99
msgid "Next Chat Tab"
msgstr "Próxima aba de chat"
@@ -2115,11 +2155,11 @@ msgstr "Não há servidores disponíveis."
msgid "No servers available."
msgstr "Servidores indisponíveis."
-#: ../src/gui/setup_video.cpp:157
+#: ../src/gui/setup_interface.cpp:88
msgid "No text"
msgstr "Sem texto"
-#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/manaserv/beinghandler.cpp:315
#: ../src/net/tmwa/playerhandler.cpp:102
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
@@ -2128,11 +2168,15 @@ msgstr ""
"Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para "
"um lugar melhor."
-#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
-#: ../src/gui/setup_video.cpp:656
+#: ../src/gui/setup_video.cpp:200 ../src/gui/setup_video.cpp:407
+#: ../src/gui/setup_video.cpp:487
msgid "None"
msgstr "Nenhum"
+#: ../src/gui/debugwindow.cpp:142
+msgid "Normal"
+msgstr ""
+
#: ../src/gui/recorder.cpp:91
msgid "Not currently recording."
msgstr "Não está gravando no momento."
@@ -2165,12 +2209,12 @@ msgstr "Antigo endereço de email incorreto."
msgid "Old password incorrect."
msgstr "Senha antiga incorreta."
-#: ../src/net/tmwa/gamehandler.cpp:89
+#: ../src/net/tmwa/gamehandler.cpp:83
#, c-format
msgid "Online users: %d"
msgstr "Jogadores online: %d"
-#: ../src/gui/setup_video.cpp:212
+#: ../src/gui/setup_video.cpp:166
msgid "OpenGL"
msgstr "OpenGL"
@@ -2198,23 +2242,24 @@ msgstr "Nomes de outros jogadores"
msgid "Outfit: %d"
msgstr "Roupas: %d"
-#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
+#: ../src/gui/inventorywindow.cpp:110 ../src/gui/outfitwindow.cpp:51
msgid "Outfits"
msgstr "Roupas"
-#: ../src/keyboardconfig.cpp:81
+#: ../src/keyboardconfig.cpp:80
msgid "Outfits Window"
msgstr "Janela de roupas"
-#: ../src/gui/setup_video.cpp:252
-msgid "Overhead text"
+#: ../src/gui/setup_interface.cpp:128
+#, fuzzy
+msgid "Overhead text:"
msgstr "Texto sobrescrito"
#: ../src/resources/userpalette.cpp:93
msgid "Own Name"
msgstr "Próprio nome"
-#: ../src/gui/setup_video.cpp:606
+#: ../src/gui/setup_video.cpp:465
msgid "Particle Effect Settings Changed."
msgstr "Configurações de efeito de partícula modificadas."
@@ -2222,21 +2267,17 @@ msgstr "Configurações de efeito de partícula modificadas."
msgid "Particle Effects"
msgstr "Efeitos de partícula"
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#: ../src/gui/debugwindow.cpp:107
#, c-format
msgid "Particle count: %d"
msgstr "Contagem de partículas: %d"
-#: ../src/gui/setup_video.cpp:255
-msgid "Particle detail"
+#: ../src/gui/setup_video.cpp:192
+#, fuzzy
+msgid "Particle detail:"
msgstr "Detalhe de partículas"
-#: ../src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Detalhe de partículas: %s"
-
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:169
msgid "Particle effects"
msgstr "Efeitos de partícula"
@@ -2257,6 +2298,18 @@ msgstr "Membros do grupo"
msgid "Party Name"
msgstr "Nome do grupo"
+#: ../src/net/manaserv/partyhandler.cpp:152
+msgid ""
+"Party invitation rejected by server, because of too many invitations in a "
+"short time."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:75
+#, c-format
+msgid ""
+"Party invite failed, because no player called %s is within the visual range."
+msgstr ""
+
#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
@@ -2270,11 +2323,11 @@ msgstr "Grupo criado."
msgid "Party: %s"
msgstr "Grupo: %s"
-#: ../src/client.cpp:916
+#: ../src/client.cpp:913
msgid "Password Change"
msgstr "Mudar senha"
-#: ../src/client.cpp:917
+#: ../src/client.cpp:914
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
@@ -2287,7 +2340,7 @@ msgstr "Senha:"
msgid "Passwords do not match."
msgstr "Senhas não conferem."
-#: ../src/gui/popupmenu.cpp:188
+#: ../src/gui/popupmenu.cpp:191
#, c-format
msgid "Pick up %s"
msgstr "Pegar %s"
@@ -2377,7 +2430,7 @@ msgstr "Preparando download"
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: ../src/net/manaserv/beinghandler.cpp:303
+#: ../src/net/manaserv/beinghandler.cpp:329
msgid "Press OK to respawn."
msgstr "Clique em OK para repopular."
@@ -2385,12 +2438,12 @@ msgstr "Clique em OK para repopular."
msgid "Press the button to start calibration"
msgstr "Aperte o botão para começar a calibrar"
-#: ../src/keyboardconfig.cpp:99
+#: ../src/keyboardconfig.cpp:98
msgid "Previous Chat Tab"
msgstr "Aba de chat anterior"
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:288
+#: ../src/gui/buy.cpp:70 ../src/gui/buy.cpp:277 ../src/gui/sell.cpp:72
+#: ../src/gui/sell.cpp:298
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preço: %s / Total: %s"
@@ -2412,10 +2465,10 @@ msgstr "Pulso"
msgid "Put all whispers in tabs"
msgstr "Deixar as mensagens particulares em abas"
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/buy.cpp:80 ../src/gui/quitdialog.cpp:40
#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
-#: ../src/keyboardconfig.cpp:102
+#: ../src/gui/sell.cpp:78 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:101
msgid "Quit"
msgstr "Sair"
@@ -2476,15 +2529,15 @@ msgstr "Lembrar usuário"
msgid "Request for Trade"
msgstr "Proposta de negociação"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Request to quit denied!"
msgstr "Requisição de saída negada!"
-#: ../src/client.cpp:809
+#: ../src/client.cpp:806
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: ../src/client.cpp:889
+#: ../src/client.cpp:886
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
@@ -2493,23 +2546,23 @@ msgstr "Requisitando detalhes do registro"
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: ../src/gui/npcdialog.cpp:134
+#: ../src/gui/npcdialog.cpp:135
msgid "Reset"
msgstr "Resetar"
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Reset Windows"
msgstr "Restaurar janelas"
-#: ../src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:335
msgid "Restart needed for changes to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
-#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
+#: ../src/gui/setup_video.cpp:442 ../src/gui/setup_video.cpp:447
msgid "Restart your client for the change to take effect."
msgstr "Reincie o jogo para que as mudanças surtam efeito."
-#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
+#: ../src/gui/inventorywindow.cpp:133 ../src/gui/popupmenu.cpp:388
msgid "Retrieve"
msgstr "Retirar"
@@ -2525,16 +2578,16 @@ msgstr "Enter alterna para o chat."
msgid "Rotate the stick"
msgstr "Gire o bastão"
-#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/manaserv/beinghandler.cpp:321
#: ../src/net/tmwa/playerhandler.cpp:110
msgid "Sadly, no trace of you was ever found..."
msgstr "Infelizmente, seus traços nunca foram encontrados..."
-#: ../src/game.cpp:354
+#: ../src/game.cpp:342
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
-#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
+#: ../src/gui/setup_video.cpp:441 ../src/gui/setup_video.cpp:446
msgid "Screen Resolution Changed"
msgstr "Resolução de tela alterada"
@@ -2542,19 +2595,19 @@ msgstr "Resolução de tela alterada"
msgid "Screenshot"
msgstr "Screenshot"
-#: ../src/game.cpp:349
+#: ../src/game.cpp:337
msgid "Screenshot saved as "
msgstr "Screenshot salva como "
-#: ../src/keyboardconfig.cpp:98
+#: ../src/keyboardconfig.cpp:97
msgid "Scroll Chat Down"
msgstr "Rolar chat para baixo"
-#: ../src/keyboardconfig.cpp:97
+#: ../src/keyboardconfig.cpp:96
msgid "Scroll Chat Up"
msgstr "Rolar chat para cima"
-#: ../src/gui/inventorywindow.cpp:87
+#: ../src/gui/inventorywindow.cpp:88
msgid "Search:"
msgstr ""
@@ -2562,7 +2615,7 @@ msgstr ""
msgid "Seems you need more money... ;-)"
msgstr "Parece que você precisa de mais dinheiro... ;-)"
-#: ../src/keyboardconfig.cpp:101
+#: ../src/keyboardconfig.cpp:100
msgid "Select OK"
msgstr "Selecionar OK"
@@ -2594,7 +2647,7 @@ msgstr "Selecionar quantidade de itens para negociar."
msgid "Selection out of range."
msgstr "Seleção fora de alcançe."
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:50 ../src/gui/sell.cpp:77
msgid "Sell"
msgstr "Vender"
@@ -2618,11 +2671,11 @@ msgstr "Tipo de servidor:"
msgid "Server:"
msgstr "Servidor:"
-#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+#: ../src/client.cpp:577 ../src/gui/setup.cpp:44 ../src/gui/windowmenu.cpp:66
msgid "Setup"
msgstr "Configurar"
-#: ../src/keyboardconfig.cpp:77
+#: ../src/keyboardconfig.cpp:76
msgid "Setup Window"
msgstr "Janela de Configurações"
@@ -2646,7 +2699,7 @@ msgstr "Mostrar IP: Desligado"
msgid "Show IP: On"
msgstr "Mostrar IP: Ligado"
-#: ../src/gui/setup_video.cpp:246
+#: ../src/gui/setup_interface.cpp:125
msgid "Show damage"
msgstr "Mostrar dano"
@@ -2654,14 +2707,20 @@ msgstr "Mostrar dano"
msgid "Show gender"
msgstr "Mostrar gênero"
-#: ../src/gui/setup_video.cpp:219
+#: ../src/gui/setup_interface.cpp:107
msgid "Show own name"
msgstr "Mostrar o próprio nome"
-#: ../src/gui/setup_video.cpp:221
-msgid "Show pickup notification"
+#: ../src/gui/setup_interface.cpp:109
+#, fuzzy
+msgid "Show pickup notification:"
msgstr "Mostrar aviso ao pegar algo"
+#: ../src/gui/debugwindow.cpp:133
+#, fuzzy
+msgid "Show:"
+msgstr "Mostrar IP: Ligado"
+
#: ../src/keyboardconfig.cpp:53
msgid "Sit"
msgstr "Sentar"
@@ -2670,21 +2729,21 @@ msgstr "Sentar"
msgid "Sit failed!"
msgstr "Falha ao sentar!"
-#: ../src/gui/skilldialog.cpp:377
+#: ../src/gui/skilldialog.cpp:379
#, c-format
msgid "Skill %d"
msgstr "Habilidade %d"
-#: ../src/gui/skilldialog.cpp:368
+#: ../src/gui/skilldialog.cpp:370
#, c-format
msgid "Skill Set %d"
msgstr "Habilidade %d"
-#: ../src/keyboardconfig.cpp:73
+#: ../src/keyboardconfig.cpp:72
msgid "Skill Window"
msgstr "Janela de Habilidade"
-#: ../src/gui/skilldialog.cpp:273
+#: ../src/gui/skilldialog.cpp:275
#, c-format
msgid "Skill points available: %d"
msgstr "Pontos de habilidade disponíveis: %d"
@@ -2693,11 +2752,11 @@ msgstr "Pontos de habilidade disponíveis: %d"
msgid "Skills"
msgstr "Habilidades"
-#: ../src/gui/inventorywindow.cpp:86
+#: ../src/gui/inventorywindow.cpp:87
msgid "Slots:"
msgstr "Espaços:"
-#: ../src/gui/setup_video.cpp:129
+#: ../src/gui/setup_interface.cpp:60
msgid "Small"
msgstr "Pequena"
@@ -2709,11 +2768,11 @@ msgstr "Emoticon"
msgid "Social"
msgstr "Social"
-#: ../src/keyboardconfig.cpp:79
+#: ../src/keyboardconfig.cpp:78
msgid "Social Window"
msgstr "Janela social"
-#: ../src/gui/setup_video.cpp:573
+#: ../src/gui/setup_video.cpp:444
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -2730,10 +2789,30 @@ msgstr "Som"
msgid "Sound Engine"
msgstr "Mecanismo de som"
+#: ../src/gui/debugwindow.cpp:143
+#, fuzzy
+msgid "Special 1"
+msgstr "Especial %d"
+
+#: ../src/gui/debugwindow.cpp:144
+#, fuzzy
+msgid "Special 2"
+msgstr "Especial %d"
+
+#: ../src/gui/debugwindow.cpp:145
+#, fuzzy
+msgid "Special 3"
+msgstr "Especial %d"
+
#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
msgid "Specials"
msgstr "Especiais"
+#: ../src/gui/debugwindow.cpp:141
+#, fuzzy
+msgid "Specials:"
+msgstr "Especiais"
+
#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
#: ../src/gui/setup_colors.cpp:333
msgid "Spectrum"
@@ -2743,11 +2822,11 @@ msgstr "Espectro"
msgid "Speed hack detected."
msgstr "Hack de velocidade detectado."
-#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/popupmenu.cpp:381
msgid "Split"
msgstr "Dividir"
-#: ../src/localplayer.cpp:899
+#: ../src/localplayer.cpp:926
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
@@ -2763,7 +2842,7 @@ msgstr "Estático"
msgid "Status"
msgstr "Status"
-#: ../src/keyboardconfig.cpp:70
+#: ../src/keyboardconfig.cpp:69
msgid "Status Window"
msgstr "Janela de Status"
@@ -2779,11 +2858,11 @@ msgstr "Parar ataque"
msgid "Stop recording"
msgstr "Parar gravação"
-#: ../src/gui/inventorywindow.cpp:59
+#: ../src/gui/inventorywindow.cpp:60
msgid "Storage"
msgstr "Armazenamento"
-#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:361
msgid "Store"
msgstr "Armazenar"
@@ -2806,7 +2885,7 @@ msgstr "Força %+d"
msgid "Strength:"
msgstr "Força:"
-#: ../src/gui/npcdialog.cpp:51
+#: ../src/gui/npcdialog.cpp:52
msgid "Submit"
msgstr "Enviar"
@@ -2822,7 +2901,12 @@ msgstr "Trocar de Personagem"
msgid "Switch server"
msgstr "Trocar servidor"
-#: ../src/gui/setup_video.cpp:437
+#: ../src/gui/debugwindow.cpp:239
+#, fuzzy
+msgid "Switches"
+msgstr "Trocar servidor"
+
+#: ../src/gui/setup_video.cpp:334
msgid "Switching to Full Screen"
msgstr "Mudando para tela cheia"
@@ -2830,7 +2914,7 @@ msgstr "Mudando para tela cheia"
msgid "Talk"
msgstr "Falar"
-#: ../src/gui/popupmenu.cpp:150
+#: ../src/gui/popupmenu.cpp:153
#, c-format
msgid "Talk to %s"
msgstr "Falar com %s"
@@ -2851,7 +2935,7 @@ msgstr "Selecionar NPC"
msgid "Target Player"
msgstr "Selecionar Jogador"
-#: ../src/gui/setup_video.cpp:158
+#: ../src/gui/setup_interface.cpp:89
msgid "Text"
msgstr "Texto"
@@ -2863,12 +2947,12 @@ msgstr "Obrigado pela compra."
msgid "Thanks for selling."
msgstr "Obrigado pela venda."
-#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/manaserv/beinghandler.cpp:313
#: ../src/net/tmwa/playerhandler.cpp:99
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "As mãos frias da morte estão levando sua alma."
-#: ../src/game.cpp:385
+#: ../src/game.cpp:373
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
@@ -3098,7 +3182,7 @@ msgstr "Este comando cria uma aba para mensagens privadas entre você e <nick>."
msgid "This is what the color looks like"
msgstr "A cor se parece com isso"
-#: ../src/client.cpp:783
+#: ../src/client.cpp:780
#, fuzzy
msgid ""
"This server is missing needed world data. Please contact the administrator"
@@ -3111,7 +3195,7 @@ msgstr ""
msgid "This user name is already taken."
msgstr "Este nome de usuário já está em uso."
-#: ../src/gui/setup_video.cpp:128
+#: ../src/gui/setup_interface.cpp:59
msgid "Tiny"
msgstr "Minúsculo"
@@ -3119,7 +3203,7 @@ msgstr "Minúsculo"
msgid "To:"
msgstr "Para:"
-#: ../src/keyboardconfig.cpp:96
+#: ../src/keyboardconfig.cpp:95
msgid "Toggle Chat"
msgstr "Alternar para chat"
@@ -3184,15 +3268,15 @@ msgstr "Negociação impossível. O parceiro de negócios está muito longe."
msgid "Trading with %s"
msgstr "Negociando com %s"
-#: ../src/gui/setup_video.cpp:469
+#: ../src/gui/setup_video.cpp:366
msgid "Transparency disabled"
msgstr "Transparência desabilitada"
-#: ../src/gui/setup_video.cpp:477
+#: ../src/gui/setup_video.cpp:374
msgid "Transparency enabled"
msgstr "Transparência habilitada."
-#: ../src/localplayer.cpp:895
+#: ../src/localplayer.cpp:922
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
@@ -3216,7 +3300,7 @@ msgstr "Tipo:"
msgid "Unable to buy."
msgstr "Impossível comprar."
-#: ../src/net/tmwa/inventoryhandler.cpp:401
+#: ../src/net/tmwa/inventoryhandler.cpp:400
msgid "Unable to equip."
msgstr "Impossível equipar."
@@ -3228,16 +3312,16 @@ msgstr "Não foi possível determinar o host \""
msgid "Unable to sell."
msgstr "Impossibilitado de vender."
-#: ../src/net/tmwa/inventoryhandler.cpp:413
+#: ../src/net/tmwa/inventoryhandler.cpp:412
msgid "Unable to unequip."
msgstr "Impossível desequipar."
-#: ../src/gui/setup_keyboard.cpp:90
+#: ../src/gui/setup_keyboard.cpp:92
msgid "Unassign"
msgstr "Retirar"
-#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
-#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
+#: ../src/gui/equipmentwindow.cpp:73 ../src/gui/inventorywindow.cpp:95
+#: ../src/gui/inventorywindow.cpp:360 ../src/gui/popupmenu.cpp:367
msgid "Unequip"
msgstr "Desequipar"
@@ -3303,11 +3387,11 @@ msgstr "Resposta desconhecida de convite para guilda."
msgid "Unknown invite response for %s."
msgstr "Resposta de convite desconhecida para %s."
-#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
+#: ../src/resources/itemdb.cpp:69
msgid "Unknown item"
msgstr "Item desconhecido"
-#: ../src/localplayer.cpp:902
+#: ../src/localplayer.cpp:929
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
@@ -3316,7 +3400,7 @@ msgstr "Problema desconhecido ao tentar pegar item."
msgid "Unregister"
msgstr "Cancelar Registro"
-#: ../src/client.cpp:955
+#: ../src/client.cpp:952
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
@@ -3324,7 +3408,7 @@ msgstr "Registro cancelado com sucesso"
msgid "Unregistered ID."
msgstr "ID não registrado."
-#: ../src/gui/skilldialog.cpp:228
+#: ../src/gui/skilldialog.cpp:230
msgid "Up"
msgstr "+"
@@ -3332,7 +3416,7 @@ msgstr "+"
msgid "Updating..."
msgstr "Atualizando..."
-#: ../src/gui/inventorywindow.cpp:93
+#: ../src/gui/inventorywindow.cpp:94
msgid "Use"
msgstr "Usar"
@@ -3353,11 +3437,11 @@ msgstr "Nome de usuário já existe."
msgid "Username permanently erased."
msgstr "Nome de usuário já existe."
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Vídeo"
-#: ../src/gui/setup_video.cpp:215
+#: ../src/gui/setup_interface.cpp:105
msgid "Visible names"
msgstr "Nomes visíveis"
@@ -3380,7 +3464,7 @@ msgstr "Vitalidade %+d"
msgid "Vitality:"
msgstr "Vitalidade:"
-#: ../src/gui/npcdialog.cpp:48
+#: ../src/gui/npcdialog.cpp:49
msgid "Waiting for server"
msgstr "Aguardando servidor"
@@ -3392,16 +3476,16 @@ msgstr "Aguardando servidor..."
msgid "Warp failed..."
msgstr "Falha ao transportar..."
-#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/manaserv/beinghandler.cpp:310
#: ../src/net/tmwa/playerhandler.cpp:96
msgid "We regret to inform you that your character was killed in battle."
msgstr "Lamentamos informar que seu personagem foi morto em combate."
-#: ../src/keyboardconfig.cpp:82
+#: ../src/keyboardconfig.cpp:81
msgid "Wear Outfit"
msgstr "Vestir roupas"
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:112
msgid "Weight:"
msgstr "Peso:"
@@ -3473,7 +3557,7 @@ msgstr "Nome de usuário, senha ou email inválidos."
msgid "Yes"
msgstr "Sim"
-#: ../src/net/manaserv/beinghandler.cpp:304
+#: ../src/net/manaserv/beinghandler.cpp:330
msgid "You Died"
msgstr "Você morreu"
@@ -3488,7 +3572,7 @@ msgstr ""
"Você está carregando mais que a metade de seu peso. Você não poderá mais "
"recuperar HP."
-#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/manaserv/beinghandler.cpp:309
#: ../src/net/tmwa/playerhandler.cpp:95
msgid "You are dead."
msgstr "Você está morto."
@@ -3497,7 +3581,7 @@ msgstr "Você está morto."
msgid "You are no more."
msgstr "Você não é mais."
-#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/manaserv/beinghandler.cpp:312
#: ../src/net/tmwa/playerhandler.cpp:98
msgid "You are not that alive anymore."
msgstr "Você não me parece assim tão vivo."
@@ -3573,7 +3657,7 @@ msgid "You may have to restart your client if you want to download new music"
msgstr ""
"Talvez você precise reiniciar o cliente se você quiser baixar novas músicas"
-#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
+#: ../src/gui/setup_video.cpp:367 ../src/gui/setup_video.cpp:375
msgid "You must restart to apply changes."
msgstr "Você deve reiniciar o cliente para aplicar as mudanças."
@@ -3590,7 +3674,7 @@ msgid "You need to use the website to register an account for this server."
msgstr ""
"Você precisa usar o website para registrar uma nova conta neste servidor."
-#: ../src/localplayer.cpp:920
+#: ../src/localplayer.cpp:947
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -3602,7 +3686,7 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
msgid "You picked up %s."
msgstr "Você pegou %s."
-#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/manaserv/beinghandler.cpp:324
#: ../src/net/tmwa/playerhandler.cpp:116
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
@@ -3660,7 +3744,7 @@ msgstr "Seus processos metabólicos agora são história."
msgid "Your name needs to be at least 4 characters."
msgstr "Seu nome deve ter pelo menos 4 caracteres."
-#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/manaserv/beinghandler.cpp:317
#: ../src/net/tmwa/playerhandler.cpp:104
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
@@ -3672,19 +3756,19 @@ msgstr ""
msgid "[mana-file] : The mana file is an XML file (.mana)"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_interface.cpp:113
msgid "as particle"
msgstr "como partícula"
-#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
+#: ../src/gui/setup_video.cpp:136 ../src/gui/setup_video.cpp:150
msgid "high"
msgstr "alto"
-#: ../src/gui/setup_video.cpp:223
+#: ../src/gui/setup_interface.cpp:111
msgid "in chat"
msgstr "em chat"
-#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
+#: ../src/gui/setup_video.cpp:135 ../src/gui/setup_video.cpp:148
msgid "low"
msgstr "baixo"
@@ -3692,15 +3776,15 @@ msgstr "baixo"
msgid "mana [options] [mana-file]"
msgstr "mana [opções] [arquivo-mana]"
-#: ../src/gui/setup_video.cpp:189
+#: ../src/gui/setup_video.cpp:151
msgid "max"
msgstr "máximo"
-#: ../src/gui/setup_video.cpp:187
+#: ../src/gui/setup_video.cpp:149
msgid "medium"
msgstr "médio"
-#: ../src/gui/setup_video.cpp:172
+#: ../src/gui/setup_video.cpp:134
msgid "off"
msgstr "desligado"
@@ -3713,7 +3797,7 @@ msgstr "requer uma versão mais nova"
msgid "requires v%s"
msgstr "requer v%s"
-#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/beinginfo.cpp:33 ../src/resources/itemdb.cpp:271
#: ../src/resources/monsterdb.cpp:77
msgid "unnamed"
msgstr "sem nome"
@@ -3799,6 +3883,9 @@ msgstr "sem nome"
#~ msgid "Access denied."
#~ msgstr "Acesso negado."
+#~ msgid "Ambient FX: %s"
+#~ msgstr "Ambiente FX: %s"
+
#~ msgid "Ammo"
#~ msgstr "Munição"
@@ -3868,6 +3955,9 @@ msgstr "sem nome"
#~ msgid "Failed to switch to "
#~ msgstr "Falha ao mudar para "
+#~ msgid "Find Path to Mouse"
+#~ msgstr "Encontrar rota para o mouse"
+
#~ msgid "Floating '...' bubble"
#~ msgstr "Bolha '...' flutuante"
@@ -3921,6 +4011,9 @@ msgstr "sem nome"
#~ msgid "Job Level: %d"
#~ msgstr "Nível de Trabalho: %d"
+#~ msgid "Joined party."
+#~ msgstr "Entrou para o grupo."
+
#~ msgid "Knife"
#~ msgstr "Faca"
@@ -3967,6 +4060,9 @@ msgstr "sem nome"
#~ msgid "Pants"
#~ msgstr "Calças"
+#~ msgid "Particle detail: %s"
+#~ msgstr "Detalhe de partículas: %s"
+
#~ msgid "Party Window"
#~ msgstr "Janela de Grupo"
@@ -4003,9 +4099,6 @@ msgstr "sem nome"
#~ msgid "Scroll laziness"
#~ msgstr "Rolar Laziness"
-#~ msgid "Scroll radius"
-#~ msgstr "Rolar radius"
-
#~ msgid "Select Server"
#~ msgstr "Selecionar Servidor"
@@ -4024,9 +4117,6 @@ msgstr "sem nome"
#~ msgid "Shooting"
#~ msgstr "Tiro"
-#~ msgid "Special %d"
-#~ msgstr "Especial %d"
-
#~ msgid "Specials Set %d"
#~ msgstr "Especiais %d"
diff --git a/po/ru.po b/po/ru.po
index e2900416..fbdbd63e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mana\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 16:41+0200\n"
+"POT-Creation-Date: 2011-06-24 01:55+0200\n"
"PO-Revision-Date: 2011-02-23 01:02+0500\n"
"Last-Translator: Mpa4Hu <ymen9@pisem.net>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: ../src/gui/npcdialog.cpp:208
+#: ../src/gui/npcdialog.cpp:209
msgid ""
"\n"
"> Next\n"
@@ -102,6 +102,11 @@ msgstr " -u --skip-update : пропустить скачивание обн
msgid " -v --version : Display the version"
msgstr " -v --version : показать версию"
+#: ../src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid " on invitation from %s"
+msgstr ""
+
#: ../src/gui/updatewindow.cpp:419
msgid "##1 It is strongly recommended that"
msgstr "##1 Настоятельно рекомендуется"
@@ -115,31 +120,31 @@ msgid "##1 you try again later."
msgstr "##1 попробуйте позднее."
#: ../src/net/tmwa/generalhandler.cpp:241
-#, fuzzy, no-c-format
+#, fuzzy, c-format
msgid "% Accuracy"
msgstr "% Точность"
#: ../src/net/tmwa/generalhandler.cpp:243
-#, fuzzy, no-c-format
+#, fuzzy, c-format
msgid "% Critical"
msgstr "% Критический"
#: ../src/net/tmwa/generalhandler.cpp:242
-#, fuzzy, no-c-format
+#, fuzzy, c-format
msgid "% Evade"
msgstr "% Уварот"
-#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
+#: ../src/gui/debugwindow.cpp:59
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: ../src/gui/debugwindow.cpp:56
+#: ../src/gui/debugwindow.cpp:54
#, c-format
msgid "%d FPS (OpenGL)"
msgstr "%d FPS (OpenGL)"
-#: ../src/client.cpp:1154 ../src/client.cpp:1182
+#: ../src/client.cpp:1151 ../src/client.cpp:1179
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -184,6 +189,11 @@ msgstr ""
msgid "%s is already a member of a party."
msgstr "%s уже является членом группы"
+#: ../src/net/manaserv/partyhandler.cpp:157
+#, fuzzy, c-format
+msgid "%s is already in a party."
+msgstr "%s уже является членом группы"
+
#: ../src/net/tmwa/partyhandler.cpp:368
#, c-format
msgid "%s is not in your party!"
@@ -194,9 +204,9 @@ msgstr "%s не находится в вашей группе!"
msgid "%s is now a member of your party."
msgstr "%s теперь является членом вашей группы."
-#: ../src/net/manaserv/partyhandler.cpp:105
-#, c-format
-msgid "%s joined the party."
+#: ../src/net/manaserv/partyhandler.cpp:128
+#, fuzzy, c-format
+msgid "%s joined the party%s."
msgstr "%s теперь в группе."
#: ../src/net/manaserv/chathandler.cpp:311
@@ -209,7 +219,7 @@ msgstr ""
msgid "%s refused your invitation."
msgstr "%s отклонил ваше приглашение."
-#: ../src/net/manaserv/partyhandler.cpp:123
+#: ../src/net/manaserv/partyhandler.cpp:148
#, c-format
msgid "%s rejected your invite."
msgstr "%s отклонил ваше приглашение."
@@ -233,15 +243,15 @@ msgstr "(пусто)"
msgid "*** only available to a GM ***"
msgstr "*** доступно только для GM ***"
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
-#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:464
+#: ../src/gui/buy.cpp:75 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:466
msgid "+"
msgstr "+"
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
-#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:476
+#: ../src/gui/buy.cpp:78 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:126 ../src/gui/sell.cpp:76
+#: ../src/gui/statuswindow.cpp:478
msgid "-"
msgstr "-"
@@ -434,7 +444,7 @@ msgstr ""
msgid ">"
msgstr ">"
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
+#: ../src/gui/setup_interface.cpp:78 ../src/gui/setup_players.cpp:206
msgid "???"
msgstr "???"
@@ -456,7 +466,7 @@ msgstr "Принять приглашение в гильдию"
msgid "Accepted party invite from %s."
msgstr "Принято приглашение от %s."
-#: ../src/game.cpp:738
+#: ../src/game.cpp:722
msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
@@ -499,7 +509,7 @@ msgstr ""
msgid "Account: %s"
msgstr "Учётная запись: %s"
-#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/popupmenu.cpp:372
msgid "Activate"
msgstr "Активировать"
@@ -507,11 +517,11 @@ msgstr "Активировать"
msgid "Add"
msgstr "Добавить"
-#: ../src/gui/popupmenu.cpp:171
+#: ../src/gui/popupmenu.cpp:174
msgid "Add name to chat"
msgstr "Добавить в чат"
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
+#: ../src/gui/popupmenu.cpp:193 ../src/gui/popupmenu.cpp:390
msgid "Add to chat"
msgstr "Добавить в чат"
@@ -563,13 +573,9 @@ msgstr "Уже в сети."
msgid "Already recording."
msgstr "Запись уже ведётся."
-#: ../src/gui/setup_video.cpp:254
-msgid "Ambient FX"
-msgstr "Эффекты окружающей среды"
-
-#: ../src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
+#: ../src/gui/setup_video.cpp:191
+#, fuzzy
+msgid "Ambient FX:"
msgstr "Эффекты окружающей среды"
#: ../src/net/tmwa/partyhandler.cpp:299
@@ -577,20 +583,20 @@ msgstr "Эффекты окружающей среды"
msgid "An unknown member tried to say: %s"
msgstr "Неизвестный член хотел сказать: %s"
-#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/manaserv/beinghandler.cpp:322
#: ../src/net/tmwa/playerhandler.cpp:112
msgid "Annihilated."
msgstr "Уничтожены."
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Apply"
msgstr "Применить"
-#: ../src/gui/setup_video.cpp:461
+#: ../src/gui/setup_video.cpp:358
msgid "Applying change to OpenGL requires restart."
msgstr "Переход к OpenGL требует перезагрузки игры."
-#: ../src/gui/setup_video.cpp:453
+#: ../src/gui/setup_video.cpp:350
msgid ""
"Applying change to OpenGL requires restart. In case OpenGL messes up your "
"game graphics, restart the game with the command line option \"--no-opengl\"."
@@ -613,7 +619,7 @@ msgstr "Вы действительно хотите покинуть %s?"
msgid "Are you sure you want to leave party %s?"
msgstr "Вы действительно хотите покинуть группу %s? "
-#: ../src/gui/setup_keyboard.cpp:86
+#: ../src/gui/setup_keyboard.cpp:88
msgid "Assign"
msgstr "Назначить"
@@ -626,12 +632,12 @@ msgstr ""
msgid "Attack"
msgstr "Атаковать"
-#: ../src/resources/itemdb.cpp:310
+#: ../src/resources/itemdb.cpp:321
#, c-format
msgid "Attack %+d"
msgstr "Атака %+d"
-#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:161
#, c-format
msgid "Attack %s"
msgstr "Атаковать %s"
@@ -648,7 +654,7 @@ msgstr "Аудио"
msgid "Authentication failed."
msgstr "Ошибка авторизации."
-#: ../src/localplayer.cpp:1030
+#: ../src/localplayer.cpp:1057
msgid "Away"
msgstr ""
@@ -661,6 +667,19 @@ msgstr ""
msgid "Being"
msgstr ""
+#: ../src/gui/debugwindow.cpp:136
+#, fuzzy
+msgid "Being collision radius"
+msgstr "Радиус прокрутки"
+
+#: ../src/gui/debugwindow.cpp:138
+msgid "Being path"
+msgstr ""
+
+#: ../src/gui/debugwindow.cpp:137
+msgid "Being positions"
+msgstr ""
+
#: ../src/net/tmwa/playerhandler.cpp:124
msgid "Bereft of life, you rest in peace."
msgstr ""
@@ -673,15 +692,15 @@ msgstr ""
msgid "Blue:"
msgstr "Синий:"
-#: ../src/gui/setup_video.cpp:160
+#: ../src/gui/setup_interface.cpp:91
msgid "Bubbles with names"
msgstr "Пузырьки с названиями"
-#: ../src/gui/setup_video.cpp:159
+#: ../src/gui/setup_interface.cpp:90
msgid "Bubbles, no names"
msgstr "Пузырьки, без названий"
-#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+#: ../src/gui/buy.cpp:50 ../src/gui/buy.cpp:79 ../src/gui/buysell.cpp:47
msgid "Buy"
msgstr "Купить"
@@ -692,10 +711,10 @@ msgstr "Калибровать"
#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
-#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:178
+#: ../src/gui/popupmenu.cpp:197 ../src/gui/popupmenu.cpp:392
#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/setup.cpp:52 ../src/gui/socialwindow.cpp:275
#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
#: ../src/gui/updatewindow.cpp:144
msgid "Cancel"
@@ -759,15 +778,15 @@ msgstr "Изменить пароль"
msgid "Change Server"
msgstr "Сменить сервер"
-#: ../src/gui/setup_video.cpp:607
+#: ../src/gui/setup_video.cpp:466
msgid "Changes will take effect on map change."
msgstr "Изменения вступят в силу при переходе на другую карты."
-#: ../src/client.cpp:848
+#: ../src/client.cpp:845
msgid "Changing game servers"
msgstr "Изменение игровых серверов"
-#: ../src/gui/setup_video.cpp:452
+#: ../src/gui/setup_video.cpp:349
msgid "Changing to OpenGL"
msgstr "Переключение на OpenGL"
@@ -787,7 +806,7 @@ msgstr "Каналы не поддерживаются!"
msgid "Character deleted."
msgstr "Персонаж удален"
-#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
+#: ../src/gui/statuswindow.cpp:213 ../src/gui/statuswindow.cpp:250
#, c-format
msgid "Character points: %d"
msgstr "Очки персонажа: %d"
@@ -812,7 +831,7 @@ msgstr "Данные персонажа слишком низки"
msgid "Chat"
msgstr "Чат"
-#: ../src/keyboardconfig.cpp:75
+#: ../src/keyboardconfig.cpp:74
msgid "Chat Window"
msgstr "Окно чата"
@@ -841,7 +860,7 @@ msgstr "Выберите имя для гильдии."
msgid "Choose your party's name."
msgstr "Выберите название для вашей группы."
-#: ../src/gui/npcdialog.cpp:118
+#: ../src/gui/npcdialog.cpp:119
msgid "Clear log"
msgstr "Очистить запись"
@@ -860,10 +879,14 @@ msgstr "Версия клиента устарела."
msgid "Client version is too old."
msgstr "Версия клиента устарела."
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:51
msgid "Close"
msgstr "Закрыть"
+#: ../src/gui/debugwindow.cpp:135
+msgid "Collision tiles"
+msgstr ""
+
#: ../src/gui/setup_colors.cpp:51
msgid "Colors"
msgstr "Цвета"
@@ -1060,11 +1083,11 @@ msgstr ""
msgid "Connect"
msgstr "Соединение"
-#: ../src/client.cpp:661
+#: ../src/client.cpp:658
msgid "Connecting to server"
msgstr "Подключение к серверу"
-#: ../src/client.cpp:838
+#: ../src/client.cpp:835
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
@@ -1076,16 +1099,16 @@ msgstr "Соединение..."
msgid "Connection to server terminated. "
msgstr "Подключение к карт прекращено"
-#: ../src/keyboardconfig.cpp:83
+#: ../src/keyboardconfig.cpp:82
msgid "Copy Outfit"
msgstr ""
-#: ../src/gui/statuswindow.cpp:256
+#: ../src/gui/statuswindow.cpp:258
#, fuzzy, c-format
msgid "Correction points: %d"
msgstr "Очков навыков: %d"
-#: ../src/game.cpp:966
+#: ../src/game.cpp:950
msgid "Could Not Load Map"
msgstr "Не удалось загрузить карту"
@@ -1094,7 +1117,8 @@ msgid "Could not create party."
msgstr "Не удалось создать группу."
#: ../src/net/tmwa/guildhandler.cpp:296
-msgid "Could not inivte user to guild."
+#, fuzzy
+msgid "Could not invite user to guild."
msgstr "Не удалось пригласить пользователя в гильдию."
#: ../src/net/tmwa/specialhandler.cpp:157
@@ -1144,7 +1168,7 @@ msgstr "Создание группи не удалось, пожалуйста,
msgid "Critical Hit"
msgstr "Критический удар"
-#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#: ../src/gui/debugwindow.cpp:96
#, c-format
msgid "Cursor: (%d, %d)"
msgstr "Курсор: (%d, %d)"
@@ -1153,23 +1177,23 @@ msgstr "Курсор: (%d, %d)"
msgid "Custom Server"
msgstr "Собственный сервер"
-#: ../src/gui/setup_video.cpp:213
+#: ../src/gui/setup_video.cpp:167
msgid "Custom cursor"
msgstr "Выборочный курсор"
-#: ../src/gui/setup_video.cpp:460
+#: ../src/gui/setup_video.cpp:357
msgid "Deactivating OpenGL"
msgstr "Отключение OpenGL"
-#: ../src/gui/debugwindow.cpp:43
+#: ../src/gui/debugwindow.cpp:219
msgid "Debug"
msgstr "отлаживать"
-#: ../src/keyboardconfig.cpp:78
+#: ../src/keyboardconfig.cpp:77
msgid "Debug Window"
msgstr "Окно отладки"
-#: ../src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:96
msgid "Default"
msgstr "По умолчанию"
@@ -1177,7 +1201,7 @@ msgstr "По умолчанию"
msgid "Defense"
msgstr "Защита"
-#: ../src/resources/itemdb.cpp:311
+#: ../src/resources/itemdb.cpp:322
#, c-format
msgid "Defense %+d"
msgstr "Защита %+d"
@@ -1210,7 +1234,7 @@ msgstr "Ловкость %+d"
msgid "Dexterity:"
msgstr "Ловкость:"
-#: ../src/gui/setup_video.cpp:241
+#: ../src/gui/setup_video.cpp:181
msgid "Disable transparency (Low CPU mode)"
msgstr "Отключить прозрачность (режим низкой нагрузки процессора)"
@@ -1223,7 +1247,7 @@ msgstr ""
msgid "Disregarded"
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/manaserv/beinghandler.cpp:320
#: ../src/net/tmwa/playerhandler.cpp:108
msgid "Do you want your possessions identified?"
msgstr ""
@@ -1237,12 +1261,12 @@ msgstr "Скачать музыку"
msgid "Downloading server list...%2.2f%%"
msgstr "Загрузка список серверов...%2.2f%%"
-#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
+#: ../src/gui/inventorywindow.cpp:373 ../src/gui/popupmenu.cpp:377
msgid "Drop"
msgstr "Бросить"
-#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
-#: ../src/gui/popupmenu.cpp:372
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/inventorywindow.cpp:371
+#: ../src/gui/popupmenu.cpp:375
msgid "Drop..."
msgstr "Бросить..."
@@ -1250,7 +1274,7 @@ msgstr "Бросить..."
msgid "Duplicated login."
msgstr "Дублированный логин."
-#: ../src/client.cpp:935
+#: ../src/client.cpp:932
msgid "Email Change"
msgstr "Сменить E-MAIL"
@@ -1258,7 +1282,7 @@ msgstr "Сменить E-MAIL"
msgid "Email address already exists."
msgstr "E-mail уже зарегистрирован."
-#: ../src/client.cpp:936
+#: ../src/client.cpp:933
msgid "Email changed successfully!"
msgstr "E-mail успешно изменена!"
@@ -1266,17 +1290,17 @@ msgstr "E-mail успешно изменена!"
msgid "Email:"
msgstr "Email:"
-#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
-#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
-#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
-#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
-#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
-#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
#, c-format
msgid "Emote Shortcut %d"
msgstr "Комбинация клавиш для емоции %d"
-#: ../src/keyboardconfig.cpp:80
+#: ../src/keyboardconfig.cpp:79
msgid "Emote Shortcut Window"
msgstr "Окно емоций"
@@ -1309,12 +1333,12 @@ msgstr ""
msgid "Enter the old password first."
msgstr "Сначала введите старый пароль"
-#: ../src/client.cpp:721
+#: ../src/client.cpp:718
msgid "Entering game world"
msgstr "Вход в игровой мир"
-#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
-#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
+#: ../src/gui/inventorywindow.cpp:93 ../src/gui/inventorywindow.cpp:106
+#: ../src/gui/inventorywindow.cpp:362 ../src/gui/popupmenu.cpp:369
msgid "Equip"
msgstr "Надеть"
@@ -1322,15 +1346,15 @@ msgstr "Надеть"
msgid "Equip arrows first."
msgstr "Сначала оденьте стрелы"
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+#: ../src/gui/equipmentwindow.cpp:54 ../src/gui/windowmenu.cpp:55
msgid "Equipment"
msgstr "Снаряжение"
-#: ../src/keyboardconfig.cpp:72
+#: ../src/keyboardconfig.cpp:71
msgid "Equipment Window"
msgstr "Окно екипировки"
-#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/client.cpp:1033 ../src/gui/changeemaildialog.cpp:156
#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
@@ -1344,7 +1368,7 @@ msgstr "Ошибка"
msgid "Error creating guild."
msgstr "Ошибка создания гильдии"
-#: ../src/client.cpp:1336 ../src/client.cpp:1342
+#: ../src/client.cpp:1333 ../src/client.cpp:1339
msgid "Error creating updates directory!"
msgstr "Ошибка при создании директории обновления!"
@@ -1356,7 +1380,7 @@ msgstr "Ошибка присоединения к каналу."
msgid "Error retreiving server list!"
msgstr "Ошибка получения списка серверов!"
-#: ../src/game.cpp:967
+#: ../src/game.cpp:951
#, c-format
msgid "Error while loading %s"
msgstr "Ошибка во время загрузки %s"
@@ -1365,7 +1389,7 @@ msgstr "Ошибка во время загрузки %s"
msgid "Exp Notification"
msgstr "Сообщение об изменении опыта"
-#: ../src/gui/statuswindow.cpp:122
+#: ../src/gui/statuswindow.cpp:124
msgid "Exp:"
msgstr "Exp:"
@@ -1385,7 +1409,7 @@ msgstr ""
msgid "Experience sharing unknown."
msgstr ""
-#: ../src/gui/setup_video.cpp:230
+#: ../src/gui/setup_video.cpp:171
msgid "FPS limit:"
msgstr "FPS Предел:"
@@ -1425,25 +1449,25 @@ msgstr "Невозможно послать ибо отправитель либ
msgid "Failed to start recording."
msgstr "Не удалось начать запись."
-#: ../src/gui/setup_video.cpp:426
+#: ../src/gui/setup_video.cpp:323
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
"Не удалось перейти в полноэкранный режим и восстановить старый режим тоже не "
"удалось!"
-#: ../src/gui/setup_video.cpp:420
+#: ../src/gui/setup_video.cpp:317
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
"Не удалось перейти в окновой режим и восстановить старый режим тоже не "
"удалось!"
-#: ../src/net/tmwa/inventoryhandler.cpp:287
+#: ../src/net/tmwa/inventoryhandler.cpp:286
msgid "Failed to use item."
msgstr ""
-#: ../src/client.cpp:956
+#: ../src/client.cpp:953
msgid "Farewell, come back any time..."
msgstr "Прощайте, возвращайтесь в любое время..."
@@ -1451,16 +1475,13 @@ msgstr "Прощайте, возвращайтесь в любое время...
msgid "Female"
msgstr "Женщина"
-#: ../src/keyboardconfig.cpp:56
-msgid "Find Path to Mouse"
-msgstr "Идти за курсором мыши"
-
#: ../src/gui/recorder.cpp:87
msgid "Finishing recording."
msgstr "Запись завершена."
-#: ../src/gui/setup_video.cpp:256
-msgid "Font size"
+#: ../src/gui/setup_interface.cpp:130
+#, fuzzy
+msgid "Font size:"
msgstr "Размер шрифта"
#: ../src/commandhandler.cpp:204
@@ -1471,7 +1492,7 @@ msgstr "Для более точной информации введите /help
msgid "Friend"
msgstr "Друг"
-#: ../src/gui/setup_video.cpp:211
+#: ../src/gui/setup_video.cpp:165
msgid "Full screen"
msgstr "На полный экран"
@@ -1479,16 +1500,16 @@ msgstr "На полный экран"
msgid "GM Names"
msgstr "Имена ГМ"
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Game"
msgstr "Игра"
-#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/manaserv/beinghandler.cpp:314
#: ../src/net/tmwa/playerhandler.cpp:100
msgid "Game Over!"
msgstr "Игра окончена!"
-#: ../src/game.cpp:181
+#: ../src/game.cpp:179
msgid "General"
msgstr "Общие"
@@ -1509,7 +1530,11 @@ msgstr "Отключено от сервера!"
msgid "Green:"
msgstr "Зеленый:"
-#: ../src/gui/setup_video.cpp:253
+#: ../src/gui/debugwindow.cpp:134
+msgid "Grid"
+msgstr ""
+
+#: ../src/gui/setup_interface.cpp:129
msgid "Gui opacity"
msgstr "Прозрачность интерфейса"
@@ -1543,12 +1568,12 @@ msgstr "Создания гильдии еще не поддерживается
msgid "Guild name is missing."
msgstr "Отсутствует имя гильдии."
-#: ../src/resources/itemdb.cpp:312
+#: ../src/resources/itemdb.cpp:323
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: ../src/gui/statuswindow.cpp:117
+#: ../src/gui/statuswindow.cpp:119
msgid "HP:"
msgstr "ЖО:"
@@ -1564,7 +1589,7 @@ msgstr "Стрижка:"
msgid "Help"
msgstr "Помощь"
-#: ../src/keyboardconfig.cpp:69
+#: ../src/keyboardconfig.cpp:68
msgid "Help Window"
msgstr "Окно помощи"
@@ -1576,7 +1601,7 @@ msgstr "Скрыть окна"
msgid "Huh? What's that?"
msgstr "А? Что это?"
-#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/manaserv/beinghandler.cpp:319
#: ../src/net/tmwa/playerhandler.cpp:106
msgid "I guess this did not run too well."
msgstr "Я думаю, это не слишком хорошо сработало."
@@ -1604,11 +1629,11 @@ msgstr "Если вы - последний пользователь канала
msgid "Ignore %s"
msgstr "Игнорировано %s"
-#: ../src/keyboardconfig.cpp:103
+#: ../src/keyboardconfig.cpp:102
msgid "Ignore input 1"
msgstr "Игнорировать ввод 1"
-#: ../src/keyboardconfig.cpp:104
+#: ../src/keyboardconfig.cpp:103
msgid "Ignore input 2"
msgstr "Игнорировать ввод 2"
@@ -1616,7 +1641,7 @@ msgstr "Игнорировать ввод 2"
msgid "Ignored"
msgstr "Игнорировано"
-#: ../src/game.cpp:733
+#: ../src/game.cpp:717
msgid "Ignoring incoming trade requests"
msgstr "Игнорировать предложения о торговле"
@@ -1624,7 +1649,7 @@ msgstr "Игнорировать предложения о торговле"
msgid "Ignoring incoming trade requests."
msgstr "Входящих запросов торговли игнарируютса."
-#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/gui/debugwindow.cpp:235 ../src/net/manaserv/charhandler.cpp:210
#: ../src/net/tmwa/charserverhandler.cpp:146
msgid "Info"
msgstr "Сведения"
@@ -1660,6 +1685,10 @@ msgstr "Интеллект %+d"
msgid "Intelligence:"
msgstr "Интеллект:"
+#: ../src/gui/setup_interface.cpp:120
+msgid "Interface"
+msgstr ""
+
#: ../src/net/manaserv/charhandler.cpp:267
#, fuzzy
msgid "Invalid character slot selected."
@@ -1686,20 +1715,20 @@ msgstr "Неверное имя."
msgid "Invalid slot number."
msgstr "Неверное имя."
-#: ../src/client.cpp:1302
+#: ../src/client.cpp:1299
#, c-format
msgid "Invalid update host: %s"
msgstr "Неверный хост обновления: %s"
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+#: ../src/gui/inventorywindow.cpp:60 ../src/gui/windowmenu.cpp:56
msgid "Inventory"
msgstr "Инвентарь"
-#: ../src/keyboardconfig.cpp:71
+#: ../src/keyboardconfig.cpp:70
msgid "Inventory Window"
msgstr "Окно инвентаря"
-#: ../src/localplayer.cpp:898
+#: ../src/localplayer.cpp:925
#, fuzzy
msgid "Inventory is full."
msgstr "Инвентарь"
@@ -1713,7 +1742,7 @@ msgstr "Пригласить"
msgid "Invite %s to join your guild"
msgstr "Пригласить %s в вашу гильдию"
-#: ../src/gui/popupmenu.cpp:134
+#: ../src/gui/popupmenu.cpp:136
#, c-format
msgid "Invite %s to join your party"
msgstr "Пригласить %s в вашу группу"
@@ -1737,29 +1766,29 @@ msgstr "Пользователь %s приглашен в группу"
msgid "Inviting failed, because you can't see a player called %s."
msgstr "Приглашение не удалось, потому что вы не можете видеть игрока %s."
-#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
-#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
-#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
-#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
-#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
-#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:56 ../src/keyboardconfig.cpp:57
+#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
+#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
+#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
+#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
+#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
#, c-format
msgid "Item Shortcut %d"
msgstr "Комбинация клавиш предмета %d"
-#: ../src/keyboardconfig.cpp:76
+#: ../src/keyboardconfig.cpp:75
msgid "Item Shortcut Window"
msgstr "Окно комбинаций клавиш предметов"
-#: ../src/localplayer.cpp:901
+#: ../src/localplayer.cpp:928
msgid "Item belongs to someone else."
msgstr ""
-#: ../src/localplayer.cpp:897
+#: ../src/localplayer.cpp:924
msgid "Item is too far away"
msgstr ""
-#: ../src/localplayer.cpp:896
+#: ../src/localplayer.cpp:923
msgid "Item is too heavy."
msgstr ""
@@ -1779,33 +1808,39 @@ msgstr ""
msgid "Item sharing unknown."
msgstr ""
-#: ../src/client.cpp:785
+#: ../src/client.cpp:782
#, fuzzy
msgid "ItemDB: Error while loading "
msgstr "Ошибка во время загрузки %s"
-#: ../src/gui/statuswindow.cpp:159
+#: ../src/gui/statuswindow.cpp:161
msgid "Job:"
msgstr "Профессия:"
-#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
+#: ../src/gui/statuswindow.cpp:160 ../src/gui/statuswindow.cpp:278
#, c-format
msgid "Job: %d"
msgstr "Профессия: %d"
-#: ../src/net/manaserv/partyhandler.cpp:87
-msgid "Joined party."
-msgstr "Присоединился к группе."
+#: ../src/net/manaserv/partyhandler.cpp:98
+msgid ""
+"Joining party failed, because the invitation has timed out on the server."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:102
+#, fuzzy
+msgid "Joining party failed, because the inviter has left the game."
+msgstr "Создание группи не удалось, пожалуйста, выберите более короткое имя."
#: ../src/gui/setup_joystick.cpp:41
msgid "Joystick"
msgstr "Джойстик"
-#: ../src/gui/setup_keyboard.cpp:125
+#: ../src/gui/setup_keyboard.cpp:127
msgid "Key Conflict(s) Detected."
msgstr "Обнаружены конфликты клавиш!"
-#: ../src/gui/setup_keyboard.cpp:77
+#: ../src/gui/setup_keyboard.cpp:78
msgid "Keyboard"
msgstr "Клавиатура"
@@ -1813,11 +1848,11 @@ msgstr "Клавиатура"
msgid "Kick failed!"
msgstr ""
-#: ../src/gui/popupmenu.cpp:163
+#: ../src/gui/popupmenu.cpp:166
msgid "Kick monster"
msgstr "Вышвырнуть монстра"
-#: ../src/gui/popupmenu.cpp:141
+#: ../src/gui/popupmenu.cpp:144
msgid "Kick player"
msgstr ""
@@ -1825,7 +1860,7 @@ msgstr ""
msgid "Kick succeeded!"
msgstr ""
-#: ../src/gui/setup_video.cpp:131
+#: ../src/gui/setup_interface.cpp:62
msgid "Large"
msgstr "Большой"
@@ -1841,8 +1876,8 @@ msgstr "Покинуть Гильдию?"
msgid "Leave Party?"
msgstr "Покинуть группу?"
-#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
-#: ../src/gui/statuswindow.cpp:263
+#: ../src/gui/statuswindow.cpp:115 ../src/gui/statuswindow.cpp:217
+#: ../src/gui/statuswindow.cpp:265
#, c-format
msgid "Level: %d"
msgstr "Уровень: %d"
@@ -1866,11 +1901,11 @@ msgstr "Удары игрока по монстру"
msgid "Local Player Miss"
msgstr "Сохранить список игроков"
-#: ../src/gui/setup_video.cpp:220
+#: ../src/gui/setup_interface.cpp:108
msgid "Log NPC dialogue"
msgstr "записывать диалог с NPC"
-#: ../src/client.cpp:688
+#: ../src/client.cpp:685
msgid "Logging in"
msgstr "Вход"
@@ -1882,7 +1917,7 @@ msgstr "Вход"
msgid "Login attempt too soon after previous attempt."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/manaserv/beinghandler.cpp:323
#: ../src/net/tmwa/playerhandler.cpp:114
msgid "Looks like you got your head handed to you."
msgstr ""
@@ -1900,12 +1935,12 @@ msgstr "Удача %+d"
msgid "Luck:"
msgstr "Удача:"
-#: ../src/gui/skilldialog.cpp:470
+#: ../src/gui/skilldialog.cpp:472
#, c-format
msgid "Lvl: %d"
msgstr "Уровень: %d"
-#: ../src/gui/skilldialog.cpp:459
+#: ../src/gui/skilldialog.cpp:461
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Уровень: %d (%+d)"
@@ -1918,12 +1953,12 @@ msgstr "Магическая атака"
msgid "M.Defense"
msgstr "Магическая защита"
-#: ../src/resources/itemdb.cpp:313
+#: ../src/resources/itemdb.cpp:324
#, c-format
msgid "MP %+d"
msgstr "Мана %+d"
-#: ../src/gui/statuswindow.cpp:130
+#: ../src/gui/statuswindow.cpp:132
msgid "MP:"
msgstr "Мана:"
@@ -1936,22 +1971,22 @@ msgstr "Игрок"
msgid "Male"
msgstr "Мужчина"
-#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:87
msgid "Map"
msgstr "Карта"
-#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#: ../src/gui/debugwindow.cpp:103
#, c-format
msgid "Map: %s"
msgstr "Карта: %s"
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
-#: ../src/gui/statuswindow.cpp:497
+#: ../src/gui/buy.cpp:81 ../src/gui/sell.cpp:79
+#: ../src/gui/statuswindow.cpp:387 ../src/gui/statuswindow.cpp:465
+#: ../src/gui/statuswindow.cpp:499
msgid "Max"
msgstr "Макс"
-#: ../src/gui/setup_video.cpp:130
+#: ../src/gui/setup_interface.cpp:61
msgid "Medium"
msgstr "Средний"
@@ -1979,11 +2014,11 @@ msgstr "Сообщение закрывает чат."
msgid "Message now closes chat."
msgstr "Теперь сообщение закрывает чат."
-#: ../src/keyboardconfig.cpp:74
+#: ../src/keyboardconfig.cpp:73
msgid "Minimap Window"
msgstr "Окно мини-карты"
-#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
+#: ../src/gui/debugwindow.cpp:101
#, c-format
msgid "Minimap: %s"
msgstr "Миникарта: %s"
@@ -1992,8 +2027,8 @@ msgstr "Миникарта: %s"
msgid "Misses"
msgstr "Промахи"
-#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
-#: ../src/gui/statuswindow.cpp:240
+#: ../src/gui/statuswindow.cpp:116 ../src/gui/statuswindow.cpp:210
+#: ../src/gui/statuswindow.cpp:242
#, c-format
msgid "Money: %s"
msgstr "Деньги: %s"
@@ -2007,6 +2042,10 @@ msgstr "Удары монстра по игроку"
msgid "Monsters"
msgstr "Монстры"
+#: ../src/gui/debugwindow.cpp:139
+msgid "Mouse path"
+msgstr ""
+
#: ../src/keyboardconfig.cpp:40
msgid "Move Down"
msgstr "Двигаться вниз"
@@ -2027,12 +2066,12 @@ msgstr "Двигаться вверх"
msgid "Music volume"
msgstr "Громкость музыки"
-#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#: ../src/gui/debugwindow.cpp:100
#, c-format
msgid "Music: %s"
msgstr "Музыка: %s"
-#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
+#: ../src/gui/npcdialog.cpp:74 ../src/gui/npcpostdialog.cpp:41
msgid "NPC"
msgstr "NPC"
@@ -2054,7 +2093,7 @@ msgstr "Имя:"
msgid "Name: %s"
msgstr "Имя: %s"
-#: ../src/gui/ministatus.cpp:236
+#: ../src/gui/ministatus.cpp:234
msgid "Need"
msgstr "Необходимо"
@@ -2066,7 +2105,7 @@ msgstr ""
msgid "Need a user to op!"
msgstr ""
-#: ../src/game.cpp:386
+#: ../src/game.cpp:374
msgid "Network Error"
msgstr "Ошибка сети"
@@ -2086,11 +2125,11 @@ msgstr "Новый пароль указан неверно"
msgid "New password too short."
msgstr "Новый пароль слишком короткий."
-#: ../src/gui/npcdialog.cpp:49
+#: ../src/gui/npcdialog.cpp:50
msgid "Next"
msgstr "Следующий"
-#: ../src/keyboardconfig.cpp:100
+#: ../src/keyboardconfig.cpp:99
msgid "Next Chat Tab"
msgstr "Следующая закладка чата"
@@ -2114,11 +2153,11 @@ msgstr ""
msgid "No servers available."
msgstr "Нет доступных серверов"
-#: ../src/gui/setup_video.cpp:157
+#: ../src/gui/setup_interface.cpp:88
msgid "No text"
msgstr "Нет текста"
-#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/manaserv/beinghandler.cpp:315
#: ../src/net/tmwa/playerhandler.cpp:102
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
@@ -2126,11 +2165,15 @@ msgid ""
msgstr ""
"Нет, дети. Ваш персонаж не умирает. Он ... ммм ... пошел к лучшей жызни."
-#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
-#: ../src/gui/setup_video.cpp:656
+#: ../src/gui/setup_video.cpp:200 ../src/gui/setup_video.cpp:407
+#: ../src/gui/setup_video.cpp:487
msgid "None"
msgstr "ни один"
+#: ../src/gui/debugwindow.cpp:142
+msgid "Normal"
+msgstr ""
+
#: ../src/gui/recorder.cpp:91
msgid "Not currently recording."
msgstr "Запись не ведётся."
@@ -2163,12 +2206,12 @@ msgstr "Старый E-mail адрес указан неверно."
msgid "Old password incorrect."
msgstr "Старый пароль указан неверно"
-#: ../src/net/tmwa/gamehandler.cpp:89
+#: ../src/net/tmwa/gamehandler.cpp:83
#, c-format
msgid "Online users: %d"
msgstr "Сейчас в сети: %d"
-#: ../src/gui/setup_video.cpp:212
+#: ../src/gui/setup_video.cpp:166
msgid "OpenGL"
msgstr "OpenGL"
@@ -2198,24 +2241,24 @@ msgstr "Имена других игроков"
msgid "Outfit: %d"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
+#: ../src/gui/inventorywindow.cpp:110 ../src/gui/outfitwindow.cpp:51
msgid "Outfits"
msgstr ""
-#: ../src/keyboardconfig.cpp:81
+#: ../src/keyboardconfig.cpp:80
#, fuzzy
msgid "Outfits Window"
msgstr "Окно статуса"
-#: ../src/gui/setup_video.cpp:252
-msgid "Overhead text"
+#: ../src/gui/setup_interface.cpp:128
+msgid "Overhead text:"
msgstr ""
#: ../src/resources/userpalette.cpp:93
msgid "Own Name"
msgstr "Собственное имя"
-#: ../src/gui/setup_video.cpp:606
+#: ../src/gui/setup_video.cpp:465
#, fuzzy
msgid "Particle Effect Settings Changed."
msgstr "Эффекты частиц"
@@ -2224,22 +2267,17 @@ msgstr "Эффекты частиц"
msgid "Particle Effects"
msgstr "Эффекты частиц"
-#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#: ../src/gui/debugwindow.cpp:107
#, fuzzy, c-format
msgid "Particle count: %d"
msgstr "Эффекты частиц"
-#: ../src/gui/setup_video.cpp:255
+#: ../src/gui/setup_video.cpp:192
#, fuzzy
-msgid "Particle detail"
-msgstr "Качество частиц"
-
-#: ../src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
+msgid "Particle detail:"
msgstr "Качество частиц"
-#: ../src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:169
msgid "Particle effects"
msgstr "Эффекты частиц"
@@ -2261,6 +2299,18 @@ msgstr "Группа"
msgid "Party Name"
msgstr "имя группы"
+#: ../src/net/manaserv/partyhandler.cpp:152
+msgid ""
+"Party invitation rejected by server, because of too many invitations in a "
+"short time."
+msgstr ""
+
+#: ../src/net/manaserv/partyhandler.cpp:75
+#, c-format
+msgid ""
+"Party invite failed, because no player called %s is within the visual range."
+msgstr ""
+
#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
msgid "Party name is missing."
msgstr "Имя группы отсутствует."
@@ -2274,11 +2324,11 @@ msgstr "Группа успешно создана."
msgid "Party: %s"
msgstr "Группа: %s"
-#: ../src/client.cpp:916
+#: ../src/client.cpp:913
msgid "Password Change"
msgstr "Изменение пароля"
-#: ../src/client.cpp:917
+#: ../src/client.cpp:914
msgid "Password changed successfully!"
msgstr "Пароль успешно изменен!"
@@ -2291,7 +2341,7 @@ msgstr "Пароль:"
msgid "Passwords do not match."
msgstr "Пароли не совпадают."
-#: ../src/gui/popupmenu.cpp:188
+#: ../src/gui/popupmenu.cpp:191
#, c-format
msgid "Pick up %s"
msgstr "Поднять %s"
@@ -2382,7 +2432,7 @@ msgstr "Подготовка к загрузке"
msgid "Present: %s; %d players are present."
msgstr "%d игроков он-лайн."
-#: ../src/net/manaserv/beinghandler.cpp:303
+#: ../src/net/manaserv/beinghandler.cpp:329
msgid "Press OK to respawn."
msgstr ""
@@ -2390,12 +2440,12 @@ msgstr ""
msgid "Press the button to start calibration"
msgstr "Нажмите кнопку, чтобы начать калибровку"
-#: ../src/keyboardconfig.cpp:99
+#: ../src/keyboardconfig.cpp:98
msgid "Previous Chat Tab"
msgstr "Предыдущая закладка чата"
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:288
+#: ../src/gui/buy.cpp:70 ../src/gui/buy.cpp:277 ../src/gui/sell.cpp:72
+#: ../src/gui/sell.cpp:298
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Цена: %s / Всего: %s"
@@ -2417,10 +2467,10 @@ msgstr "Пульсирующий"
msgid "Put all whispers in tabs"
msgstr "Личные сообщения во вкладках"
-#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/buy.cpp:80 ../src/gui/quitdialog.cpp:40
#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
-#: ../src/keyboardconfig.cpp:102
+#: ../src/gui/sell.cpp:78 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:101
msgid "Quit"
msgstr "Выход"
@@ -2481,15 +2531,15 @@ msgstr "Запомнить имя пользователя"
msgid "Request for Trade"
msgstr ""
-#: ../src/net/tmwa/gamehandler.cpp:102
+#: ../src/net/tmwa/gamehandler.cpp:96
msgid "Request to quit denied!"
msgstr "Запрос на выход отклонен!"
-#: ../src/client.cpp:809
+#: ../src/client.cpp:806
msgid "Requesting characters"
msgstr "Запрос персонажей"
-#: ../src/client.cpp:889
+#: ../src/client.cpp:886
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
@@ -2498,23 +2548,23 @@ msgstr "Запрос регистрационных данных"
msgid "Requesting to join channel %s."
msgstr "Запрос на присоединение к каналу %s."
-#: ../src/gui/npcdialog.cpp:134
+#: ../src/gui/npcdialog.cpp:135
msgid "Reset"
msgstr "Сбросить"
-#: ../src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:52
msgid "Reset Windows"
msgstr "Восстановить расположение окон"
-#: ../src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:335
msgid "Restart needed for changes to take effect."
msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
-#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
+#: ../src/gui/setup_video.cpp:442 ../src/gui/setup_video.cpp:447
msgid "Restart your client for the change to take effect."
msgstr "Перезегрузите игру дабы изменения вступили в силу"
-#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
+#: ../src/gui/inventorywindow.cpp:133 ../src/gui/popupmenu.cpp:388
msgid "Retrieve"
msgstr "Получить"
@@ -2530,16 +2580,16 @@ msgstr "Enter переключает вас на окно чата."
msgid "Rotate the stick"
msgstr "Вращайте рукоять"
-#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/manaserv/beinghandler.cpp:321
#: ../src/net/tmwa/playerhandler.cpp:110
msgid "Sadly, no trace of you was ever found..."
msgstr "К сожалению, никаких ваших остатков не было найдено ..."
-#: ../src/game.cpp:354
+#: ../src/game.cpp:342
msgid "Saving screenshot failed!"
msgstr "Ошибка при сохранении снимка экрана!"
-#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
+#: ../src/gui/setup_video.cpp:441 ../src/gui/setup_video.cpp:446
msgid "Screen Resolution Changed"
msgstr "Разрешение экрана изменены"
@@ -2547,19 +2597,19 @@ msgstr "Разрешение экрана изменены"
msgid "Screenshot"
msgstr "Сделать скриншот"
-#: ../src/game.cpp:349
+#: ../src/game.cpp:337
msgid "Screenshot saved as "
msgstr "Снимок экрана сохранен как"
-#: ../src/keyboardconfig.cpp:98
+#: ../src/keyboardconfig.cpp:97
msgid "Scroll Chat Down"
msgstr "Прокрутить чат вниз"
-#: ../src/keyboardconfig.cpp:97
+#: ../src/keyboardconfig.cpp:96
msgid "Scroll Chat Up"
msgstr "Прокрутить чат вверх"
-#: ../src/gui/inventorywindow.cpp:87
+#: ../src/gui/inventorywindow.cpp:88
msgid "Search:"
msgstr ""
@@ -2567,7 +2617,7 @@ msgstr ""
msgid "Seems you need more money... ;-)"
msgstr "Кажется, вам нужно больше денег... ;-)"
-#: ../src/keyboardconfig.cpp:101
+#: ../src/keyboardconfig.cpp:100
msgid "Select OK"
msgstr "Выбрать Ok"
@@ -2599,7 +2649,7 @@ msgstr "Сколько предметов продать."
msgid "Selection out of range."
msgstr "Выбор вне зоне достижения"
-#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:50 ../src/gui/sell.cpp:77
msgid "Sell"
msgstr "Продать"
@@ -2623,11 +2673,11 @@ msgstr "Тип сервера:"
msgid "Server:"
msgstr "Сервер:"
-#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+#: ../src/client.cpp:577 ../src/gui/setup.cpp:44 ../src/gui/windowmenu.cpp:66
msgid "Setup"
msgstr "Настройка"
-#: ../src/keyboardconfig.cpp:77
+#: ../src/keyboardconfig.cpp:76
msgid "Setup Window"
msgstr "Окно настроек"
@@ -2651,7 +2701,7 @@ msgstr "Показ IP: Отключен"
msgid "Show IP: On"
msgstr "Показ IP: Включен"
-#: ../src/gui/setup_video.cpp:246
+#: ../src/gui/setup_interface.cpp:125
msgid "Show damage"
msgstr "Показать ущерб"
@@ -2659,14 +2709,20 @@ msgstr "Показать ущерб"
msgid "Show gender"
msgstr "Показать пол"
-#: ../src/gui/setup_video.cpp:219
+#: ../src/gui/setup_interface.cpp:107
msgid "Show own name"
msgstr "Показать собственное имя"
-#: ../src/gui/setup_video.cpp:221
-msgid "Show pickup notification"
+#: ../src/gui/setup_interface.cpp:109
+#, fuzzy
+msgid "Show pickup notification:"
msgstr "Показать уведомление о подборе предмета"
+#: ../src/gui/debugwindow.cpp:133
+#, fuzzy
+msgid "Show:"
+msgstr "Показ IP: Включен"
+
#: ../src/keyboardconfig.cpp:53
msgid "Sit"
msgstr "Сесть"
@@ -2675,21 +2731,21 @@ msgstr "Сесть"
msgid "Sit failed!"
msgstr "Не удалось сесть!"
-#: ../src/gui/skilldialog.cpp:377
+#: ../src/gui/skilldialog.cpp:379
#, c-format
msgid "Skill %d"
msgstr "Умения %d"
-#: ../src/gui/skilldialog.cpp:368
+#: ../src/gui/skilldialog.cpp:370
#, c-format
msgid "Skill Set %d"
msgstr "Навыков %d"
-#: ../src/keyboardconfig.cpp:73
+#: ../src/keyboardconfig.cpp:72
msgid "Skill Window"
msgstr "Окно навыков"
-#: ../src/gui/skilldialog.cpp:273
+#: ../src/gui/skilldialog.cpp:275
#, c-format
msgid "Skill points available: %d"
msgstr ""
@@ -2698,11 +2754,11 @@ msgstr ""
msgid "Skills"
msgstr "Умения"
-#: ../src/gui/inventorywindow.cpp:86
+#: ../src/gui/inventorywindow.cpp:87
msgid "Slots:"
msgstr "Вместимость:"
-#: ../src/gui/setup_video.cpp:129
+#: ../src/gui/setup_interface.cpp:60
msgid "Small"
msgstr "Маленький"
@@ -2714,12 +2770,12 @@ msgstr "Улыбнуться"
msgid "Social"
msgstr ""
-#: ../src/keyboardconfig.cpp:79
+#: ../src/keyboardconfig.cpp:78
#, fuzzy
msgid "Social Window"
msgstr "Окно навыков"
-#: ../src/gui/setup_video.cpp:573
+#: ../src/gui/setup_video.cpp:444
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Некоторые окна могут быть перемещены в соответствии пониженной разрешении."
@@ -2736,10 +2792,30 @@ msgstr "Звук"
msgid "Sound Engine"
msgstr ""
+#: ../src/gui/debugwindow.cpp:143
+#, fuzzy
+msgid "Special 1"
+msgstr "Специальные"
+
+#: ../src/gui/debugwindow.cpp:144
+#, fuzzy
+msgid "Special 2"
+msgstr "Специальные"
+
+#: ../src/gui/debugwindow.cpp:145
+#, fuzzy
+msgid "Special 3"
+msgstr "Специальные"
+
#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
msgid "Specials"
msgstr "Специальные"
+#: ../src/gui/debugwindow.cpp:141
+#, fuzzy
+msgid "Specials:"
+msgstr "Специальные"
+
#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
#: ../src/gui/setup_colors.cpp:333
msgid "Spectrum"
@@ -2749,11 +2825,11 @@ msgstr "спектр"
msgid "Speed hack detected."
msgstr "Обнаружен хак скорости."
-#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/popupmenu.cpp:381
msgid "Split"
msgstr "Разделить"
-#: ../src/localplayer.cpp:899
+#: ../src/localplayer.cpp:926
msgid "Stack is too big."
msgstr ""
@@ -2769,7 +2845,7 @@ msgstr "Статичный"
msgid "Status"
msgstr "Состояние"
-#: ../src/keyboardconfig.cpp:70
+#: ../src/keyboardconfig.cpp:69
msgid "Status Window"
msgstr "Окно статуса"
@@ -2785,11 +2861,11 @@ msgstr "Прекратить атаку"
msgid "Stop recording"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:59
+#: ../src/gui/inventorywindow.cpp:60
msgid "Storage"
msgstr "Хранение"
-#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:361
msgid "Store"
msgstr "Хранить"
@@ -2812,7 +2888,7 @@ msgstr "Сила %+d"
msgid "Strength:"
msgstr "Сила:"
-#: ../src/gui/npcdialog.cpp:51
+#: ../src/gui/npcdialog.cpp:52
msgid "Submit"
msgstr "Применить"
@@ -2828,7 +2904,12 @@ msgstr "Сменить персонажа"
msgid "Switch server"
msgstr "Сменить сервер"
-#: ../src/gui/setup_video.cpp:437
+#: ../src/gui/debugwindow.cpp:239
+#, fuzzy
+msgid "Switches"
+msgstr "Сменить сервер"
+
+#: ../src/gui/setup_video.cpp:334
msgid "Switching to Full Screen"
msgstr "Переключение в полноэкранный режим"
@@ -2836,7 +2917,7 @@ msgstr "Переключение в полноэкранный режим"
msgid "Talk"
msgstr "Говорить"
-#: ../src/gui/popupmenu.cpp:150
+#: ../src/gui/popupmenu.cpp:153
#, c-format
msgid "Talk to %s"
msgstr "Говорить с %s"
@@ -2857,7 +2938,7 @@ msgstr "Прицелиться на NPC"
msgid "Target Player"
msgstr "Прицелиться на игрока"
-#: ../src/gui/setup_video.cpp:158
+#: ../src/gui/setup_interface.cpp:89
msgid "Text"
msgstr "Текст"
@@ -2869,12 +2950,12 @@ msgstr "Спасибо за покупку!"
msgid "Thanks for selling."
msgstr "Спасибо за продажу!"
-#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/manaserv/beinghandler.cpp:313
#: ../src/net/tmwa/playerhandler.cpp:99
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Холодные руки смерти захватывают вашу души."
-#: ../src/game.cpp:385
+#: ../src/game.cpp:373
msgid "The connection to the server was lost."
msgstr "Соединение с сервером потеряно."
@@ -3099,7 +3180,7 @@ msgstr ""
msgid "This is what the color looks like"
msgstr "Вот, как выглядит сей цвет"
-#: ../src/client.cpp:783
+#: ../src/client.cpp:780
msgid ""
"This server is missing needed world data. Please contact the administrator"
"(s)."
@@ -3109,7 +3190,7 @@ msgstr ""
msgid "This user name is already taken."
msgstr "Этот аккаунт уже зарегистрирован"
-#: ../src/gui/setup_video.cpp:128
+#: ../src/gui/setup_interface.cpp:59
msgid "Tiny"
msgstr "Маленький"
@@ -3117,7 +3198,7 @@ msgstr "Маленький"
msgid "To:"
msgstr "Для:"
-#: ../src/keyboardconfig.cpp:96
+#: ../src/keyboardconfig.cpp:95
msgid "Toggle Chat"
msgstr "Переключится на чат"
@@ -3182,15 +3263,15 @@ msgstr "Торговля невозможна. Партнер находится
msgid "Trading with %s"
msgstr "Торговаться с %s"
-#: ../src/gui/setup_video.cpp:469
+#: ../src/gui/setup_video.cpp:366
msgid "Transparency disabled"
msgstr "Прозрачность отключена"
-#: ../src/gui/setup_video.cpp:477
+#: ../src/gui/setup_video.cpp:374
msgid "Transparency enabled"
msgstr "Прозрачность включена"
-#: ../src/localplayer.cpp:895
+#: ../src/localplayer.cpp:922
msgid "Tried to pick up nonexistent item."
msgstr ""
@@ -3214,7 +3295,7 @@ msgstr "Тип:"
msgid "Unable to buy."
msgstr "Низзя купить!"
-#: ../src/net/tmwa/inventoryhandler.cpp:401
+#: ../src/net/tmwa/inventoryhandler.cpp:400
msgid "Unable to equip."
msgstr "Низзя екипировать!"
@@ -3226,16 +3307,16 @@ msgstr "Невозможно подключиться к хосту \""
msgid "Unable to sell."
msgstr "Низзя продать!"
-#: ../src/net/tmwa/inventoryhandler.cpp:413
+#: ../src/net/tmwa/inventoryhandler.cpp:412
msgid "Unable to unequip."
msgstr "Низзя разекипировать"
-#: ../src/gui/setup_keyboard.cpp:90
+#: ../src/gui/setup_keyboard.cpp:92
msgid "Unassign"
msgstr "Снять"
-#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
-#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
+#: ../src/gui/equipmentwindow.cpp:73 ../src/gui/inventorywindow.cpp:95
+#: ../src/gui/inventorywindow.cpp:360 ../src/gui/popupmenu.cpp:367
msgid "Unequip"
msgstr "Снять"
@@ -3303,11 +3384,11 @@ msgstr ""
msgid "Unknown invite response for %s."
msgstr ""
-#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
+#: ../src/resources/itemdb.cpp:69
msgid "Unknown item"
msgstr "Неизвестный предмет"
-#: ../src/localplayer.cpp:902
+#: ../src/localplayer.cpp:929
msgid "Unknown problem picking up item."
msgstr ""
@@ -3316,7 +3397,7 @@ msgstr ""
msgid "Unregister"
msgstr "Удалить регистрацию"
-#: ../src/client.cpp:955
+#: ../src/client.cpp:952
msgid "Unregister Successful"
msgstr "Удаление аккаунта прошла успешно"
@@ -3324,7 +3405,7 @@ msgstr "Удаление аккаунта прошла успешно"
msgid "Unregistered ID."
msgstr "Незарегестрированый ID."
-#: ../src/gui/skilldialog.cpp:228
+#: ../src/gui/skilldialog.cpp:230
msgid "Up"
msgstr "Верх"
@@ -3332,7 +3413,7 @@ msgstr "Верх"
msgid "Updating..."
msgstr "Обновление..."
-#: ../src/gui/inventorywindow.cpp:93
+#: ../src/gui/inventorywindow.cpp:94
msgid "Use"
msgstr "Использовать"
@@ -3353,11 +3434,11 @@ msgstr "Пользователь с таким именем уже сущест
msgid "Username permanently erased."
msgstr "Пользователь с таким именем уже существует."
-#: ../src/gui/setup_video.cpp:244
+#: ../src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Видео"
-#: ../src/gui/setup_video.cpp:215
+#: ../src/gui/setup_interface.cpp:105
msgid "Visible names"
msgstr "Видимые имена"
@@ -3380,7 +3461,7 @@ msgstr "Выносливость %+d"
msgid "Vitality:"
msgstr "Живучесть:"
-#: ../src/gui/npcdialog.cpp:48
+#: ../src/gui/npcdialog.cpp:49
msgid "Waiting for server"
msgstr "Ожидание ответа от сервера"
@@ -3392,16 +3473,16 @@ msgstr "Ожидание ответа от сервера..."
msgid "Warp failed..."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/manaserv/beinghandler.cpp:310
#: ../src/net/tmwa/playerhandler.cpp:96
msgid "We regret to inform you that your character was killed in battle."
msgstr "Мы с сожалением сообщаем, что ваш персонаж был убит в бою."
-#: ../src/keyboardconfig.cpp:82
+#: ../src/keyboardconfig.cpp:81
msgid "Wear Outfit"
msgstr ""
-#: ../src/gui/inventorywindow.cpp:111
+#: ../src/gui/inventorywindow.cpp:112
msgid "Weight:"
msgstr "Вес:"
@@ -3474,7 +3555,7 @@ msgstr "Неверное имя пользователя, пароль или а
msgid "Yes"
msgstr "Да"
-#: ../src/net/manaserv/beinghandler.cpp:304
+#: ../src/net/manaserv/beinghandler.cpp:330
msgid "You Died"
msgstr "Вы умерли"
@@ -3487,7 +3568,7 @@ msgid ""
"You are carrying more than half your weight. You are unable to regain health."
msgstr ""
-#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/manaserv/beinghandler.cpp:309
#: ../src/net/tmwa/playerhandler.cpp:95
msgid "You are dead."
msgstr "Вы мертвы."
@@ -3496,7 +3577,7 @@ msgstr "Вы мертвы."
msgid "You are no more."
msgstr "Вас больше нет."
-#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/manaserv/beinghandler.cpp:312
#: ../src/net/tmwa/playerhandler.cpp:98
msgid "You are not that alive anymore."
msgstr "Больше вас нет в живых"
@@ -3570,7 +3651,7 @@ msgid "You may have to restart your client if you want to download new music"
msgstr ""
"Возможно придется перезагрузить клиент, чтобы вы смогли скачать новую музыку"
-#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
+#: ../src/gui/setup_video.cpp:367 ../src/gui/setup_video.cpp:375
msgid "You must restart to apply changes."
msgstr "Вы должны перезагрузитса, чтобы изменения вступили в силу."
@@ -3587,7 +3668,7 @@ msgid "You need to use the website to register an account for this server."
msgstr ""
"Вам необходимо использовать веб-сайт, чтобы зарегистрировать новый аккаунт"
-#: ../src/localplayer.cpp:920
+#: ../src/localplayer.cpp:947
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -3599,7 +3680,7 @@ msgstr[1] ""
msgid "You picked up %s."
msgstr "Вы получили %s."
-#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/manaserv/beinghandler.cpp:324
#: ../src/net/tmwa/playerhandler.cpp:116
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
@@ -3655,7 +3736,7 @@ msgstr ""
msgid "Your name needs to be at least 4 characters."
msgstr "Имя должно содержать не менее четырех символов."
-#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/manaserv/beinghandler.cpp:317
#: ../src/net/tmwa/playerhandler.cpp:104
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
@@ -3666,19 +3747,19 @@ msgstr ""
msgid "[mana-file] : The mana file is an XML file (.mana)"
msgstr ""
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_interface.cpp:113
msgid "as particle"
msgstr ""
-#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
+#: ../src/gui/setup_video.cpp:136 ../src/gui/setup_video.cpp:150
msgid "high"
msgstr "выс."
-#: ../src/gui/setup_video.cpp:223
+#: ../src/gui/setup_interface.cpp:111
msgid "in chat"
msgstr "в чате"
-#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
+#: ../src/gui/setup_video.cpp:135 ../src/gui/setup_video.cpp:148
msgid "low"
msgstr "низ."
@@ -3686,15 +3767,15 @@ msgstr "низ."
msgid "mana [options] [mana-file]"
msgstr ""
-#: ../src/gui/setup_video.cpp:189
+#: ../src/gui/setup_video.cpp:151
msgid "max"
msgstr "максимальное"
-#: ../src/gui/setup_video.cpp:187
+#: ../src/gui/setup_video.cpp:149
msgid "medium"
msgstr "средне"
-#: ../src/gui/setup_video.cpp:172
+#: ../src/gui/setup_video.cpp:134
msgid "off"
msgstr "выкл"
@@ -3707,7 +3788,7 @@ msgstr "Требует более новую версию"
msgid "requires v%s"
msgstr "Требует v%s"
-#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/beinginfo.cpp:33 ../src/resources/itemdb.cpp:271
#: ../src/resources/monsterdb.cpp:77
msgid "unnamed"
msgstr "безымянный"
@@ -3773,6 +3854,10 @@ msgstr "безымянный"
#~ msgid "Access denied."
#~ msgstr "Доступ запрещен"
+#, fuzzy
+#~ msgid "Ambient FX: %s"
+#~ msgstr "Эффекты окружающей среды"
+
#~ msgid "Ammo"
#~ msgstr "Боеприпасы"
@@ -3828,6 +3913,9 @@ msgstr "безымянный"
#~ msgid "Exp"
#~ msgstr "Exp:"
+#~ msgid "Find Path to Mouse"
+#~ msgstr "Идти за курсором мыши"
+
#~ msgid "GM"
#~ msgstr "ГМ"
@@ -3871,6 +3959,9 @@ msgstr "безымянный"
#~ msgid "Job Level: %d"
#~ msgstr "Уровень профессии: %d"
+#~ msgid "Joined party."
+#~ msgstr "Присоединился к группе."
+
#~ msgid "Knife"
#~ msgstr "Нож"
@@ -3914,6 +4005,10 @@ msgstr "безымянный"
#~ msgid "Pants"
#~ msgstr "Штаны"
+#, fuzzy
+#~ msgid "Particle detail: %s"
+#~ msgstr "Качество частиц"
+
#~ msgid "Party Window"
#~ msgstr "Окно группы"
@@ -3948,9 +4043,6 @@ msgstr "безымянный"
#~ msgid "Scroll laziness"
#~ msgstr "Заторможенность прокрутки"
-#~ msgid "Scroll radius"
-#~ msgstr "Радиус прокрутки"
-
#~ msgid "Select Server"
#~ msgstr "Выберите сервер"