summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-12 00:12:52 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-12 00:16:56 +0200
commit39aa603099c27f9a9012a32218ea712f345c75e3 (patch)
tree67c7510a04d1884f25cd60bb57097096eea29b89 /po
parentf72908d57ea9236afacaedea7c30651f80d38bde (diff)
downloadmana-39aa603099c27f9a9012a32218ea712f345c75e3.tar.gz
mana-39aa603099c27f9a9012a32218ea712f345c75e3.tar.bz2
mana-39aa603099c27f9a9012a32218ea712f345c75e3.tar.xz
mana-39aa603099c27f9a9012a32218ea712f345c75e3.zip
Added new translations
German, Spanish, French, Polish, Russian and Chinese translations updated.
Diffstat (limited to 'po')
-rw-r--r--po/de.po200
-rw-r--r--po/es.po52
-rw-r--r--po/fr.po443
-rw-r--r--po/pl.po159
-rw-r--r--po/ru.po81
-rw-r--r--po/zh_TW.po1426
6 files changed, 1220 insertions, 1141 deletions
diff --git a/po/de.po b/po/de.po
index 38e1ffe7..d034ac8a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2009-05-12 00:11+0200\n"
-"PO-Revision-Date: 2009-05-06 11:59+0000\n"
+"PO-Revision-Date: 2009-05-11 08:15+0000\n"
"Last-Translator: Terwarf <Unknown>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/commandhandler.cpp:141
@@ -22,9 +22,8 @@ msgid "-- Help --"
msgstr "-- Hilfe --"
#: src/commandhandler.cpp:142
-#, fuzzy
msgid "/help > Display this help"
-msgstr "/help > Diese Hilfe anzeigen"
+msgstr "/help > diese Hilfe anzeigen"
#: src/commandhandler.cpp:144
msgid "/where > Display map name"
@@ -32,7 +31,7 @@ msgstr "/where > Zeige den Namen der aktuellen Karte"
#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
-msgstr "/who > Zeige Zahl der angemeldeten Spieler"
+msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
@@ -294,18 +293,17 @@ msgid "Type /help for a list of commands."
msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
#: src/commandhandler.cpp:339
-#, fuzzy
msgid "Cannot send empty whispers!"
-msgstr "Kann keine leeren privaten Nachrichten senden!"
+msgstr "Kann keine leeren Nachrichten versenden!"
#: src/commandhandler.cpp:346
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
"you."
msgstr ""
-"Kann keinen neuen Tab für Spieler '%s' erstellen! Entweder es ist noch ein "
-"Tab geöffnet, oder der Spieler bist Du."
+"Kann keinen neuen Tab für Spieler '%s' erstellen - entweder es existiert "
+"bereits einer, oder der Spieler bist Du."
#: src/commandhandler.cpp:392
msgid "Return toggles chat."
@@ -331,7 +329,7 @@ msgstr ""
#: src/game.cpp:236
msgid "General"
-msgstr "Generell"
+msgstr "Öffentlich"
#: src/game.cpp:400
msgid "Screenshot saved to ~/"
@@ -591,7 +589,7 @@ msgstr "Chat"
#: src/gui/chat.cpp:332
#, c-format
msgid "%d players are present."
-msgstr ""
+msgstr "%d Spieler sind anwesend."
#: src/gui/chat.cpp:333
msgid "Present: "
@@ -761,18 +759,16 @@ msgid "Cast Test Spell 3"
msgstr "Spruch 3 sprechen"
#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
-#, fuzzy
msgid "Map"
-msgstr "Max"
+msgstr "Karte"
#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr "Warte auf den Server"
#: src/gui/npcdialog.cpp:45
-#, fuzzy
msgid "Submit"
-msgstr "Sitzen"
+msgstr "Absenden"
#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
@@ -836,7 +832,7 @@ msgstr "geflüsterte Nachricht"
#: src/gui/palette.cpp:97
msgid "Is"
-msgstr "ist"
+msgstr "Handlungen"
#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
#: src/net/ea/gui/partytab.cpp:39
@@ -860,7 +856,6 @@ msgid "Being"
msgstr "Aktionen"
#: src/gui/palette.cpp:104
-#, fuzzy
msgid "Other Players' Names"
msgstr "Namen anderer Spieler"
@@ -885,24 +880,20 @@ msgid "Unknown Item Type"
msgstr "Unbekannter Gegenstand"
#: src/gui/palette.cpp:111
-#, fuzzy
msgid "Generics"
-msgstr "Gewöhnlich"
+msgstr "Allgemeiner Gegenstand"
#: src/gui/palette.cpp:112
-#, fuzzy
msgid "Hats"
-msgstr "Hut"
+msgstr "Hüte"
#: src/gui/palette.cpp:113
-#, fuzzy
msgid "Usables"
-msgstr "Benutzbar"
+msgstr "Benutzbare Gegenstände"
#: src/gui/palette.cpp:114
-#, fuzzy
msgid "Shirts"
-msgstr "Hemd"
+msgstr "Hemden"
#: src/gui/palette.cpp:115
msgid "1 Handed Weapons"
@@ -921,19 +912,16 @@ msgid "2 Handed Weapons"
msgstr "zweihändige Waffen"
#: src/gui/palette.cpp:119
-#, fuzzy
msgid "Shields"
-msgstr "Schild"
+msgstr "Schilde"
#: src/gui/palette.cpp:120
-#, fuzzy
msgid "Rings"
-msgstr "Ring"
+msgstr "Ringe"
#: src/gui/palette.cpp:121
-#, fuzzy
msgid "Necklaces"
-msgstr "Halskette"
+msgstr "Halsketten"
#: src/gui/palette.cpp:122
msgid "Arms"
@@ -1004,7 +992,7 @@ msgstr "@@attack|%s angreifen@@"
#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
-msgstr "@@friend|Füge %s als Freund hinzu"
+msgstr "@@friend|Füge %s@@ als Freund hinzu"
#: src/gui/popupmenu.cpp:97
#, c-format
@@ -1047,14 +1035,13 @@ msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Abbrechen@@"
#: src/gui/popupmenu.cpp:157
-#, fuzzy, c-format
+#, c-format
msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|%s aufheben@@"
+msgstr "@@pickup|Aufheben %s@@"
#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
-#, fuzzy
msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Zum Chat hinzufügen@@"
+msgstr "@@chat|Zu Chat hinzufügen@@"
#: src/gui/popupmenu.cpp:348
msgid "@@use|Unequip@@"
@@ -1077,13 +1064,12 @@ msgid "@@split|Split@@"
msgstr "@@split|Aufteilen@@"
#: src/gui/popupmenu.cpp:364
-#, fuzzy
msgid "@@store|Store@@"
-msgstr "@@ignore|Ignoriere %s@@"
+msgstr "@@store|Einlagern@@"
#: src/gui/popupmenu.cpp:371
msgid "@@retrieve|Retrieve@@"
-msgstr ""
+msgstr "@@retrieve|Wiederholen@@"
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
@@ -1334,21 +1320,19 @@ msgstr "Wenn ignorierend:"
#: src/gui/setup_video.cpp:112
msgid "Tiny"
-msgstr ""
+msgstr "Winzig"
#: src/gui/setup_video.cpp:113
-#, fuzzy
msgid "Small"
-msgstr "Verkaufen"
+msgstr "Klein"
#: src/gui/setup_video.cpp:114
-#, fuzzy
msgid "Medium"
msgstr "Mittel"
#: src/gui/setup_video.cpp:115
msgid "Large"
-msgstr ""
+msgstr "Groß"
#: src/gui/setup_video.cpp:141
msgid "No text"
@@ -1404,7 +1388,7 @@ msgstr "Partikeleffekte"
#: src/gui/setup_video.cpp:195
msgid "Show name"
-msgstr "Zeige Namen"
+msgstr "Zeige eigenen Namen"
#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
@@ -1444,7 +1428,7 @@ msgstr "Partikeldetail"
#: src/gui/setup_video.cpp:223
msgid "Font size"
-msgstr ""
+msgstr "Schriftgröße"
#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
@@ -1968,9 +1952,8 @@ msgid "Debug Window"
msgstr "Debugfenster"
#: src/keyboardconfig.cpp:80
-#, fuzzy
msgid "Party Window"
-msgstr "Chatfenster"
+msgstr "Partyfenster"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2095,80 +2078,65 @@ msgid "tmw"
msgstr "tmw"
#: src/main.cpp:567
-#, fuzzy
msgid "Options:"
-msgstr "Optionen: "
+msgstr "Optionen:"
#: src/main.cpp:568
-#, fuzzy
msgid " -C --config-file : Configuration file to use"
-msgstr " -C --configfile : zu benutzende Konfigurationsdatei"
+msgstr " -C --config-file : zu benutzende Konfigurationsdatei"
#: src/main.cpp:569
-#, fuzzy
msgid " -d --data : Directory to load game data from"
-msgstr ""
-" -d --data : Verzeichnis, aus dem die Spieldaten geladen werden sollen"
+msgstr " -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
#: src/main.cpp:570
msgid " -D --default : Choose default character server and character"
-msgstr ""
+msgstr " -D --default : Wähle zuletzt benutzten Server und Spieler aus"
#: src/main.cpp:572
-#, fuzzy
msgid " -h --help : Display this help"
-msgstr " -h --help : Zeige diese Hilfe"
+msgstr " - --help : Display this help"
#: src/main.cpp:573
-#, fuzzy
msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
-" -S --homedir : Verzeichnis, in dem Updates und Einstellungen abgelegt "
-"werden sollen"
+" -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
#: src/main.cpp:574
-#, fuzzy
msgid " -H --update-host : Use this update host"
-msgstr " -H --updatehost : Benutze angegebenen Updateserver"
+msgstr " -H --update-host : Benutze angegebenen Updateserver"
#: src/main.cpp:575
-#, fuzzy
msgid " -P --password : Login with this password"
-msgstr " -P --password : Anmeldung mit angegebenem Passwort"
+msgstr " -P --password : Angegebenes Passwort benutzen"
#: src/main.cpp:576
-#, fuzzy
msgid " -c --character : Login with this character"
-msgstr " -c --character : Anmeldung mit angegebenem Charakter"
+msgstr " -c --charakter : Mit angegebenem Spieler anmelden"
#: src/main.cpp:577
-#, fuzzy
msgid " -p --port : Login Server Port"
-msgstr " -o --port : Port des Loginservers"
+msgstr " -p --port : Port des Anmeldungsservers"
#: src/main.cpp:578
-#, fuzzy
msgid " -s --server : Login Server name or IP"
-msgstr " -s --server : Name oder IP des Loginservers"
+msgstr " -s --server : Name oder IP des Anmeldungsservers"
#: src/main.cpp:579
-#, fuzzy
msgid " -u --skip-update : Skip the update downloads"
-msgstr " -u --skipupdate : Überspringe den Download von Updates"
+msgstr " -u --skip-update : Überspringe das Herunterladen von Updates"
#: src/main.cpp:580
-#, fuzzy
msgid " -U --username : Login with this username"
-msgstr " -U --username : Anmeldung mit angegebenem Benutzernamen"
+msgstr " -U --username : Mit angegebenem Benutzernamen anmelden"
#: src/main.cpp:582
msgid " -O --no-opengl : Disable OpenGL for this session"
-msgstr ""
+msgstr " -O --no-opengl : OpenGL-Erweiterungen deaktivieren"
#: src/main.cpp:584
-#, fuzzy
msgid " -v --version : Display the version"
-msgstr " -v --version : Zeige die Version des Clients an"
+msgstr " -v --version : Die Version des Spieles anzeigen"
#: src/main.cpp:589
msgid "The Mana World "
@@ -2336,7 +2304,7 @@ msgstr "Keine Server verfügbar"
#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
-msgstr ""
+msgstr "Jemand anderes versucht diesen Account zu benutzen"
#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
@@ -2505,9 +2473,9 @@ msgid "Unable to pick up item"
msgstr "Kann Gegenstand nicht aufheben"
#: src/net/ea/inventoryhandler.cpp:193
-#, fuzzy, c-format
+#, c-format
msgid "You picked up %s [@@%d|%s@@]"
-msgstr "Du hast %s [%s] aufgehoben"
+msgstr "Du hast %s [@@%d|%s@@] aufgehoben"
#: src/net/ea/inventoryhandler.cpp:239
msgid "Failed to use item"
@@ -2599,7 +2567,7 @@ msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
-msgstr ""
+msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
#: src/net/ea/partyhandler.cpp:329
#, c-format
@@ -2628,9 +2596,8 @@ msgid "Game Over!"
msgstr "Game Over!"
#: src/net/ea/playerhandler.cpp:102
-#, fuzzy
msgid "Insert coin to continue."
-msgstr "Insert coin to continue"
+msgstr "Insert coin to continue."
#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
msgid ""
@@ -2918,67 +2885,59 @@ msgstr "Willenskraft: %d"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
-msgstr ""
+msgstr "Fehlerhaftes Magiemerkmal"
#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
-#, fuzzy
msgid "Already logged in"
-msgstr "Es läuft bereits eine Aufzeichnung."
+msgstr "Bereits angemeldet"
#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
-#, fuzzy
msgid "Server is full"
-msgstr "Server"
+msgstr "Server ist voll"
#: src/net/tmwserv/loginhandler.cpp:110
-#, fuzzy
msgid "New password incorrect"
-msgstr "Gib dein neues Passwort zweimal ein:"
+msgstr "Neues Passwort fehlerhaft"
#: src/net/tmwserv/loginhandler.cpp:113
msgid "Old password incorrect"
-msgstr ""
+msgstr "Altes Passwort fehlerhaft"
#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
msgid "Account not connected. Please login first."
-msgstr ""
+msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
#: src/net/tmwserv/loginhandler.cpp:140
-#, fuzzy
msgid "New email address incorrect"
-msgstr "Gib die neue Email Adresse zweimal ein:"
+msgstr "Neue Emailadresse ist fehlerhaft"
#: src/net/tmwserv/loginhandler.cpp:143
-#, fuzzy
msgid "Old email address incorrect"
-msgstr "Gib die neue Email Adresse zweimal ein:"
+msgstr "Alte Emailadresse ist fehlerhaft"
#: src/net/tmwserv/loginhandler.cpp:149
-#, fuzzy
msgid "The new Email Address already exists."
-msgstr "Gib die neue Email Adresse zweimal ein:"
+msgstr "Die neue Emailadresse ist bereits vorhanden."
#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
msgid "Client version is too old"
-msgstr ""
+msgstr "Die Version des Spiels ist zu alt"
#: src/net/tmwserv/loginhandler.cpp:179
-#, fuzzy
msgid "Wrong username or password"
-msgstr "Fallsches Passwort"
+msgstr "Benutzername oder Passwort falsch"
#: src/net/tmwserv/loginhandler.cpp:211
msgid "Wrong username, password or email address"
-msgstr ""
+msgstr "Benutzername, Passwort oder Emailadresse falsch"
#: src/net/tmwserv/loginhandler.cpp:214
-#, fuzzy
msgid "Username already exists"
-msgstr "Dieser Spielername ist bereits vergeben"
+msgstr "Benutzername bereits vorhanden"
#: src/net/tmwserv/loginhandler.cpp:217
msgid "Email address already exists"
-msgstr ""
+msgstr "Emailadresse bereits vorhanden"
#: src/resources/itemdb.cpp:52
#, c-format
@@ -3032,9 +2991,27 @@ msgstr "NPC Datenbank: Fehler beim Laden von npcs.xml!"
#~ msgid "MiniMap"
#~ msgstr "Übersichtskarte"
+#~ msgid "; "
+#~ msgstr "; "
+
+#~ msgid "+"
+#~ msgstr "+"
+
+#~ msgid "-"
+#~ msgstr "-"
+
#~ msgid "Emote"
#~ msgstr "Gefühle"
+#~ msgid "inc"
+#~ msgstr "Verringern"
+
+#~ msgid "use"
+#~ msgstr "benutze"
+
+#~ msgid " -D --default : Bypass the login process with default settings"
+#~ msgstr " -D --default : Überspringe die Anmeldung mit den Voreinstellungen"
+
#~ msgid "NPC Number Request"
#~ msgstr "NPC Nummer Anfrage"
@@ -3048,17 +3025,8 @@ msgstr "NPC Datenbank: Fehler beim Laden von npcs.xml!"
#~ msgid "NPC Text Request"
#~ msgstr "NPC text Anfrage"
-#~ msgid "inc"
-#~ msgstr "Verringern"
-
-#~ msgid "use"
-#~ msgstr "benutze"
-
#~ msgid "%s: %s"
#~ msgstr "%s: %s"
#~ msgid "Emote Window"
#~ msgstr "Gefühlsfenster"
-
-#~ msgid " -D --default : Bypass the login process with default settings"
-#~ msgstr " -D --default : Überspringe die Anmeldung mit den Voreinstellungen"
diff --git a/po/es.po b/po/es.po
index b0059b46..94aa9b43 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2009-05-12 00:11+0200\n"
-"PO-Revision-Date: 2009-05-03 13:13+0000\n"
+"PO-Revision-Date: 2009-05-10 15:53+0000\n"
"Last-Translator: Jumpy <Unknown>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/commandhandler.cpp:141
@@ -22,9 +22,8 @@ msgid "-- Help --"
msgstr "ayuda"
#: src/commandhandler.cpp:142
-#, fuzzy
msgid "/help > Display this help"
-msgstr "/help > Mostrar la ayuda"
+msgstr "/help > Muestra la ayuda"
#: src/commandhandler.cpp:144
msgid "/where > Display map name"
@@ -57,6 +56,7 @@ msgstr "/w Alias para un mensaje"
#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
+"/query > Crea una ventana para mensajes privados con un otro utilizador"
#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
@@ -64,19 +64,19 @@ msgstr "/q > Alias para una demanda"
#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
-msgstr ""
+msgstr "/list > Enseña la lista de los salones publicos"
#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
-msgstr ""
+msgstr "/join > Entrar o crear un salon"
#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
-msgstr ""
+msgstr "/party > Invita un jugador en un grupo"
#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
-msgstr ""
+msgstr "/record > Empieza a registrar el chat en un archivo externo"
#: src/commandhandler.cpp:162
msgid "/toggle > Determine whether <return> toggles the chat log"
@@ -140,7 +140,7 @@ msgstr ""
#: src/commandhandler.cpp:198
msgid "If <channel> doesn't exist, it's created."
-msgstr ""
+msgstr "Si <channel> no existe, lo crea"
#: src/commandhandler.cpp:202
msgid "Command: /list"
@@ -738,18 +738,16 @@ msgid "Cast Test Spell 3"
msgstr ""
#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
-#, fuzzy
msgid "Map"
-msgstr "Minimapa"
+msgstr ""
#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
#: src/gui/npcdialog.cpp:45
-#, fuzzy
msgid "Submit"
-msgstr "Salir"
+msgstr ""
#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
@@ -865,14 +863,12 @@ msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-#, fuzzy
msgid "Hats"
-msgstr "Estadísticas"
+msgstr ""
#: src/gui/palette.cpp:113
-#, fuzzy
msgid "Usables"
-msgstr "Usar"
+msgstr ""
#: src/gui/palette.cpp:114
msgid "Shirts"
@@ -895,9 +891,8 @@ msgid "2 Handed Weapons"
msgstr ""
#: src/gui/palette.cpp:119
-#, fuzzy
msgid "Shields"
-msgstr "Habilidades"
+msgstr ""
#: src/gui/palette.cpp:120
msgid "Rings"
@@ -1019,9 +1014,9 @@ msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Cancelar@@"
#: src/gui/popupmenu.cpp:157
-#, fuzzy, c-format
+#, c-format
msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|Recoger %s@@"
+msgstr ""
#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
msgid "@@chat|Add to chat@@"
@@ -1048,9 +1043,8 @@ msgid "@@split|Split@@"
msgstr "@@split|Dividir@@"
#: src/gui/popupmenu.cpp:364
-#, fuzzy
msgid "@@store|Store@@"
-msgstr "@@use|Usar@@"
+msgstr ""
#: src/gui/popupmenu.cpp:371
msgid "@@retrieve|Retrieve@@"
@@ -1308,14 +1302,12 @@ msgid "Tiny"
msgstr ""
#: src/gui/setup_video.cpp:113
-#, fuzzy
msgid "Small"
-msgstr "Vender"
+msgstr ""
#: src/gui/setup_video.cpp:114
-#, fuzzy
msgid "Medium"
-msgstr "Medio"
+msgstr ""
#: src/gui/setup_video.cpp:115
msgid "Large"
@@ -1935,9 +1927,8 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-#, fuzzy
msgid "Party Window"
-msgstr "Reiniciar ventanas"
+msgstr ""
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2078,9 +2069,8 @@ msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-#, fuzzy
msgid " -h --help : Display this help"
-msgstr "/help > Mostrar la ayuda"
+msgstr ""
#: src/main.cpp:573
msgid " -S --home-dir : Directory to use as home directory"
diff --git a/po/fr.po b/po/fr.po
index 1197f7bd..2a2d06b7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,13 +9,13 @@ msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2009-05-12 00:11+0200\n"
-"PO-Revision-Date: 2009-05-10 12:10+0000\n"
+"PO-Revision-Date: 2009-05-10 20:26+0000\n"
"Last-Translator: Jumpy <Unknown>\n"
"Language-Team: French\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/commandhandler.cpp:141
@@ -23,43 +23,42 @@ msgid "-- Help --"
msgstr "-- Aide --"
#: src/commandhandler.cpp:142
-#, fuzzy
msgid "/help > Display this help"
-msgstr "/help > Affiche cette aide."
+msgstr "/help > Montre l'aide"
#: src/commandhandler.cpp:144
msgid "/where > Display map name"
-msgstr "/where > Affiche le nom de la carte."
+msgstr "/where > Affiche le nom de la carte"
#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
-msgstr "/who > Affiche le nombre d'utilisateurs en ligne."
+msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
-msgstr "/me > Dire quelque chose à votre propos."
+msgstr "/me > Dire quelque chose à votre propos"
#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
-msgstr "/clear > Vide cette fenêtre."
+msgstr "/clear > Vide cette fenêtre"
#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envoie un message privé à un utilisateur."
+msgstr "/msg > Envoie un message privé à un utilisateur"
#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias de msg."
+msgstr "/whisper > Alias de msg"
#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
-msgstr "/w > Alias de msg."
+msgstr "/w > Alias de msg"
#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
"/query > Créé un nouvel onglet pour vos messages privés avec un autre "
-"utilisateur."
+"utilisateur"
#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
@@ -71,11 +70,11 @@ msgstr "/list > Affiche une liste de tous les salons publics"
#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
-msgstr "/join > Rejoint ou crée un salon"
+msgstr "/join > Rejoindre ou créer un salon."
#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
-msgstr "/party Invite un utilisateur dans un groupe"
+msgstr "/party > Invite un utilisateur dans un groupe"
#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
@@ -99,27 +98,27 @@ msgstr "/announce > Annonce globale (MJ uniquement)"
#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
-msgstr "Pour plus d'information sur une commande, tapez /help <commande>"
+msgstr "Pour plus d'informations sur une commande, tapez /help <commande>"
#: src/commandhandler.cpp:173
msgid "Command: /help"
-msgstr "Commande: /help"
+msgstr "Commande : /help"
#: src/commandhandler.cpp:174
msgid "This command displays a list of all commands available."
-msgstr "Cette commande affiche une liste de toutes les commandes disponibles"
+msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
#: src/commandhandler.cpp:175
msgid "Command: /help <command>"
-msgstr "Commande: /help <commande>"
+msgstr "Commande : /help <commande>"
#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
-msgstr "Cette commande affiche une aide sur la commande concernée"
+msgstr "Cette commande affiche une aide sur la commande <command>."
#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
-msgstr "Commande: /announce <msg>"
+msgstr "Commande : /announce <msg>"
#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
@@ -127,37 +126,37 @@ msgstr "*** uniquement disponible pour les MJ ***"
#: src/commandhandler.cpp:186
msgid "This command sends the message <msg> to all players currently online."
-msgstr "Cette commande envoie le message <msg> à tous les joueurs en ligne"
+msgstr "Cette commande envoie le message <msg> à tous les joueurs en ligne."
#: src/commandhandler.cpp:191
msgid "Command: /clear"
-msgstr "Commande: /clear"
+msgstr "Commande : /clear"
#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr ""
-"Cette commande vide l'historique de conversation de la précédente "
-"conversation"
+"Cette commande vide l'historique de conversation de la conversation "
+"précédente."
#: src/commandhandler.cpp:196
msgid "Command: /join <channel>"
-msgstr "Commande: /join <salon>"
+msgstr "Commande : /join <channel>"
#: src/commandhandler.cpp:197
msgid "This command makes you enter <channel>."
-msgstr "Cette commande vous fait rentrer dans le salon <salon>"
+msgstr "Cette commande vous fait rentrer dans le salon <channel>."
#: src/commandhandler.cpp:198
msgid "If <channel> doesn't exist, it's created."
-msgstr "Si <salon> n'existe pas, il sera créé"
+msgstr "Si <channel> n'existe pas, il sera créé."
#: src/commandhandler.cpp:202
msgid "Command: /list"
-msgstr "Commande: /list"
+msgstr "Commande : /list"
#: src/commandhandler.cpp:203
msgid "This command shows a list of all channels."
-msgstr "Cette commande affiche une liste de tous les salons publics"
+msgstr "Cette commande affiche une liste de tous les salons publics."
#: src/commandhandler.cpp:207
msgid "Command: /me <message>"
@@ -165,31 +164,31 @@ msgstr "Commande : /me <message>"
#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
-msgstr "Cette commande informe les autres joueurs que vous faites <message>"
+msgstr "Cette commande informe les autres joueurs que vous faites <msg>."
#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
-msgstr "Commande : /msg <pseudo> <message>"
+msgstr "Commande : /msg <nick> <message>"
#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
-msgstr "Commande : /whisper <pseudo> <message>"
+msgstr "Commande : /whisper <nick> <message>"
#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
-msgstr "Commande : /w <pseudo> <message>"
+msgstr "Commande : /w <nick> <message>"
#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
-msgstr "Cette commande envoie le texte <message> au joueur <pseudo>"
+msgstr "Cette commande envoie le texte <message> au joueur <nick>"
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
-"Si le <pseudo> contient des espaces, entourez le de guillemets (exemple : "
-"\"pseu do\")"
+"Si le <nick> contient des espaces, entourez le de guillemets (exemple : \"ni "
+"ck\")."
#: src/commandhandler.cpp:221
msgid "Command: /query <nick>"
@@ -202,15 +201,15 @@ msgstr "Commande : /q <nick>"
#: src/commandhandler.cpp:223
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 <pseudo>"
+"Cette commande essaye de créer une fenêtre de dialogue entre vous et <nick>"
#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
-msgstr "Commande : /party <pseudo>"
+msgstr "Commande : /party <nick>"
#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
-msgstr "Cette commande invite <pseudo> à rejoindre votre groupe"
+msgstr "Cette commande invite <nick> à rejoindre votre groupe."
#: src/commandhandler.cpp:235
msgid "Command: /present"
@@ -222,18 +221,18 @@ msgid ""
"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, si il est activé, ou dans l'enregistrement "
+"dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement "
"de la conversation."
#: src/commandhandler.cpp:242
msgid "Command: /record <filename>"
-msgstr "Commande : /record <fichier>"
+msgstr "Commande : /record <filename>"
#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
"Cette commande active l'enregistrement de la conversation dans le fichier "
-"<fichier>"
+"<filename>."
#: src/commandhandler.cpp:245
msgid "Command: /record"
@@ -241,12 +240,11 @@ msgstr "Commande : /record"
#: src/commandhandler.cpp:246
msgid "This command finishes a recording session."
-msgstr ""
-"Cette commande termine une session d'enregistrement démarrée avec /record"
+msgstr "Cette commande termine une session d'enregistrement."
#: src/commandhandler.cpp:250
msgid "Command: /toggle <state>"
-msgstr "Command: /toggle <statut>"
+msgstr "Command: /toggle <state>"
#: src/commandhandler.cpp:251
msgid ""
@@ -254,15 +252,16 @@ msgid ""
"whether the chat log turns off automatically."
msgstr ""
"Cette commande définie si la touche entrée doit fermer le fichier "
-"d'enregistrement de la conversation ou si celui-ci se fermera automatiquement"
+"d'enregistrement de la conversation ou si celui-ci se fermera "
+"automatiquement."
#: src/commandhandler.cpp:253
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\", \"oui\", \"vrai\" pour activer le "
-"bouton sur marche, ou \"0\", \"non\", \"faux\" pour désactiver le bouton."
+"<state> peut être en position \"1\", \"yes\", \"true\" pour activer le "
+"bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
#: src/commandhandler.cpp:256
msgid "Command: /toggle"
@@ -297,22 +296,21 @@ msgid "Type /help for a list of commands."
msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
#: src/commandhandler.cpp:339
-#, fuzzy
msgid "Cannot send empty whispers!"
-msgstr "Impossible d'envoyer un message privé vide !"
+msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
#: src/commandhandler.cpp:346
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
"you."
msgstr ""
-"Impossible de créer un onglet pour le pseudo '%s' ! Soit il existe déjà, "
-"soit c'est votre pseudo."
+"Vous ne pouvez pas créer une fenêtre de dialogue privée avec '%s' ! Elle "
+"existe déjà ou il s'agit de vous même."
#: src/commandhandler.cpp:392
msgid "Return toggles chat."
-msgstr ""
+msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
#: src/commandhandler.cpp:392
msgid "Message closes chat."
@@ -320,7 +318,7 @@ msgstr "Ce message ferme la conversation."
#: src/commandhandler.cpp:401
msgid "Return now toggles chat."
-msgstr ""
+msgstr "La touche enter ferme la ligne d'entrée de la conversation."
#: src/commandhandler.cpp:405
msgid "Message now closes chat."
@@ -370,11 +368,11 @@ msgstr "non"
#: src/game.cpp:794
msgid "Ignoring incoming trade requests"
-msgstr "Ignorer les requêtes d'échanges entrantes."
+msgstr "Ignorer les requêtes d'échanges entrantes"
#: src/game.cpp:801
msgid "Accepting incoming trade requests"
-msgstr "Accepter les requêtes d'échanges entrantes."
+msgstr "Accepter les requêtes d'échanges entrantes"
#: src/gui/buddywindow.cpp:35
msgid "Buddy"
@@ -442,7 +440,7 @@ msgstr "Compte : %s"
#: src/gui/changeemaildialog.cpp:49
msgid "Type New Email Address twice:"
-msgstr "Entrer la nouvelle adresse mail de nouveau :"
+msgstr "Entrer de nouveau la nouvelle adresse mail :"
#: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
#: src/gui/charselectdialog.cpp:120
@@ -456,7 +454,7 @@ msgstr "Mot de passe :"
#: src/gui/changepassworddialog.cpp:52
msgid "Type New Password twice:"
-msgstr "Entrer le nouveau mot de passe de nouveau :"
+msgstr "Entrer une nouvelle fois le nouveau mot de passe :"
#: src/gui/charcreatedialog.cpp:54
msgid "Create Character"
@@ -473,7 +471,7 @@ msgstr "Couleur des cheveux :"
#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
-msgstr "Coiffure :"
+msgstr "Coupe :"
#: src/gui/charcreatedialog.cpp:73
msgid "Create"
@@ -500,7 +498,7 @@ msgstr "Erreur"
#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
-msgstr "Votre nom doit comporter un minimum de 4 caractères"
+msgstr "Votre nom doit comporter un minimum de 4 caractères."
#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
@@ -590,12 +588,12 @@ msgstr "Argent : %s"
#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
msgid "Chat"
-msgstr "Chat"
+msgstr "Conversation"
#: src/gui/chat.cpp:332
#, c-format
msgid "%d players are present."
-msgstr ""
+msgstr "%d joueurs sont présents."
#: src/gui/chat.cpp:333
msgid "Present: "
@@ -603,12 +601,12 @@ msgstr "Présent : "
#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
-msgstr "Présence écrite dans le fichier d'enregistrement"
+msgstr "Présence inscrite dans le fichier d'enregistrement."
#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
-msgstr "Envoyé à %s : %s"
+msgstr "Message privé envoyé à %s : %s"
#: src/gui/confirmdialog.cpp:42
msgid "Yes"
@@ -765,18 +763,16 @@ msgid "Cast Test Spell 3"
msgstr "Jeter le sort d'essai 3"
#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
-#, fuzzy
msgid "Map"
-msgstr "Max."
+msgstr "Plan"
#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr "Attente du serveur"
#: src/gui/npcdialog.cpp:45
-#, fuzzy
msgid "Submit"
-msgstr "S'assoir"
+msgstr "Soumettre"
#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
@@ -864,7 +860,6 @@ msgid "Being"
msgstr "Forme de vie"
#: src/gui/palette.cpp:104
-#, fuzzy
msgid "Other Players' Names"
msgstr "Nom des autres joueurs"
@@ -889,24 +884,20 @@ msgid "Unknown Item Type"
msgstr "Type inconnu d'objet"
#: src/gui/palette.cpp:111
-#, fuzzy
msgid "Generics"
-msgstr "Commun"
+msgstr "Génériques"
#: src/gui/palette.cpp:112
-#, fuzzy
msgid "Hats"
-msgstr "Chapeau"
+msgstr "Chapeaux"
#: src/gui/palette.cpp:113
-#, fuzzy
msgid "Usables"
-msgstr "Utilisable"
+msgstr "Utilisables"
#: src/gui/palette.cpp:114
-#, fuzzy
msgid "Shirts"
-msgstr "TShirt"
+msgstr "Chemises"
#: src/gui/palette.cpp:115
msgid "1 Handed Weapons"
@@ -925,19 +916,16 @@ msgid "2 Handed Weapons"
msgstr "Armes à deux mains"
#: src/gui/palette.cpp:119
-#, fuzzy
msgid "Shields"
-msgstr "Bouclier"
+msgstr "Boucliers"
#: src/gui/palette.cpp:120
-#, fuzzy
msgid "Rings"
-msgstr "Anneau"
+msgstr "Anneaux"
#: src/gui/palette.cpp:121
-#, fuzzy
msgid "Necklaces"
-msgstr "Collier"
+msgstr "Colliers"
#: src/gui/palette.cpp:122
msgid "Arms"
@@ -993,7 +981,7 @@ msgstr "1/4 Barre de vie"
#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
-msgstr "@@nom|Ajouter le nom dans la conversation@@"
+msgstr "@@name|Ajouter le nom dans la conversation@@"
#: src/gui/popupmenu.cpp:87
#, c-format
@@ -1013,7 +1001,7 @@ msgstr "@@friend|Être ami avec %s@@"
#: src/gui/popupmenu.cpp:97
#, c-format
msgid "@@disregard|Disregard %s@@"
-msgstr "@@négliger|Négliger %s@@"
+msgstr "@@disregard|Négliger%s@@"
#: src/gui/popupmenu.cpp:98
#, c-format
@@ -1038,7 +1026,7 @@ msgstr "@@guild|Inviter %s à rejoindre votre guilde@@"
#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
-msgstr "@@party|Invitation de %s à joindre votre partie @@"
+msgstr "@@party|Invitation de %s à joindre votre groupe@@"
#: src/gui/popupmenu.cpp:125
#, c-format
@@ -1051,12 +1039,11 @@ msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Annuler@@"
#: src/gui/popupmenu.cpp:157
-#, fuzzy, c-format
+#, c-format
msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Ramasser %s@@"
#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
-#, fuzzy
msgid "@@chat|Add to chat@@"
msgstr "@@chat|Ajouter à la conversation@@"
@@ -1081,13 +1068,12 @@ msgid "@@split|Split@@"
msgstr "@@split|Partager@@"
#: src/gui/popupmenu.cpp:364
-#, fuzzy
msgid "@@store|Store@@"
-msgstr "@@ignore|Ignorer %s@@"
+msgstr "@@store|Magasin@@"
#: src/gui/popupmenu.cpp:371
msgid "@@retrieve|Retrieve@@"
-msgstr ""
+msgstr "@@retrieve|Retirer@@"
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
@@ -1099,7 +1085,7 @@ msgstr "Changer de personnage"
#: src/gui/recorder.cpp:87
msgid "Finishing recording."
-msgstr "Fin de l'engistrement"
+msgstr "Fin de l'engistrement."
#: src/gui/recorder.cpp:91
msgid "Not currently recording."
@@ -1287,7 +1273,7 @@ msgstr "Conflit(s) de touche détecté"
#: src/gui/setup_keyboard.cpp:120
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
-"Trouver une solution ou des choses étranges se produiront pendant la partie"
+"Trouver une solution ou des choses étranges se produiront pendant la partie."
#: src/gui/setup_players.cpp:56
msgid "Name"
@@ -1339,21 +1325,19 @@ msgstr "Quand ignoré :"
#: src/gui/setup_video.cpp:112
msgid "Tiny"
-msgstr ""
+msgstr "fin"
#: src/gui/setup_video.cpp:113
-#, fuzzy
msgid "Small"
-msgstr "Vendre"
+msgstr "Petit"
#: src/gui/setup_video.cpp:114
-#, fuzzy
msgid "Medium"
-msgstr "moyen"
+msgstr "Medium"
#: src/gui/setup_video.cpp:115
msgid "Large"
-msgstr ""
+msgstr "Grand"
#: src/gui/setup_video.cpp:141
msgid "No text"
@@ -1449,7 +1433,7 @@ msgstr "Détail des particules"
#: src/gui/setup_video.cpp:223
msgid "Font size"
-msgstr ""
+msgstr "Taille de police"
#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
@@ -1491,11 +1475,11 @@ msgstr "Résolution de l'écran changée"
#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
-msgstr "Rédémarrez le jeu pour que les changements soient appliqués"
+msgstr "Rédémarrez le jeu pour que les changements soient appliqués."
#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
-msgstr "Paramètres d'effet de particules changés"
+msgstr "Paramètres d'effet de particules changés."
#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
@@ -1516,7 +1500,7 @@ msgstr "Compétences"
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
-msgstr "Points d'aptitude : %d"
+msgstr "Points de compétences : %d"
#: src/gui/skill.cpp:146
msgid "Up"
@@ -1604,7 +1588,7 @@ msgstr "Agilité"
#: src/gui/status.cpp:200
msgid "Vitality"
-msgstr "Vitalité :"
+msgstr "Vitalité"
#: src/gui/status.cpp:201
msgid "Intelligence"
@@ -1633,7 +1617,7 @@ msgstr "Stockage"
#: src/gui/storagewindow.cpp:65
msgid "Store"
-msgstr "Stocker"
+msgstr "Entreposer"
#: src/gui/storagewindow.cpp:66
msgid "Retrieve"
@@ -1704,7 +1688,7 @@ msgstr "Jouer"
#: src/gui/updatewindow.cpp:325
msgid "curl error "
-msgstr "Erreur curl "
+msgstr "Courbe d'erreur "
#: src/gui/updatewindow.cpp:326
msgid " host: "
@@ -1728,7 +1712,7 @@ msgstr "Terminé"
#: src/gui/widgets/channeltab.cpp:49
msgid "/users > Lists the users in the current channel"
-msgstr "/users > Affiche la liste des différents utilisateurs dans ce salon"
+msgstr "/users > Affiche la liste des utilisateurs de ce salon"
#: src/gui/widgets/channeltab.cpp:50
msgid "/topic > Set the topic of the current channel"
@@ -1736,7 +1720,7 @@ msgstr "/topic > Change le sujet du salon"
#: src/gui/widgets/channeltab.cpp:51
msgid "/quit > Leave a channel"
-msgstr "/quit > Quitte un salon"
+msgstr "/quit > Quitter un salon"
#: src/gui/widgets/channeltab.cpp:52
msgid "/op > Make a user a channel operator"
@@ -1744,15 +1728,15 @@ msgstr "/op > Faire de l'utilisateur un opérateur du salon"
#: src/gui/widgets/channeltab.cpp:53
msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Sort un utilisateur du salon"
+msgstr "/kick > Sortir un utilisateur du salon"
#: src/gui/widgets/channeltab.cpp:63
msgid "Command: /users"
-msgstr "Commande: /users"
+msgstr "Commande : /users"
#: src/gui/widgets/channeltab.cpp:64
msgid "This command shows the users in this channel."
-msgstr "The commande affiche la liste d'utilisateurs présents dans ce salon"
+msgstr "The commande affiche la liste d'utilisateurs présents dans ce salon."
#: src/gui/widgets/channeltab.cpp:68
msgid "Command: /topic <message>"
@@ -1768,7 +1752,7 @@ msgstr "Commande : /quit"
#: src/gui/widgets/channeltab.cpp:74
msgid "This command leaves the current channel."
-msgstr "Cette commande quitte le salon"
+msgstr "Cette commande quitte le salon."
#: src/gui/widgets/channeltab.cpp:75
msgid "If you're the last person in the channel, it will be deleted."
@@ -1777,11 +1761,11 @@ msgstr ""
#: src/gui/widgets/channeltab.cpp:79
msgid "Command: /op <nick>"
-msgstr "Commande : /op <pseudo>"
+msgstr "Commande : /op <nick>"
#: src/gui/widgets/channeltab.cpp:80
msgid "This command makes <nick> a channel operator."
-msgstr "Cette commande donne les droit d'opérateur du salon à <pseudo>"
+msgstr "Cette commande donne les droit d'opérateur du salon à <nick>"
#: src/gui/widgets/channeltab.cpp:83
msgid "Channel operators can kick and op other users from the channel."
@@ -1791,11 +1775,11 @@ msgstr ""
#: src/gui/widgets/channeltab.cpp:88
msgid "Command: /kick <nick>"
-msgstr "Commande : /kick <pseudo>"
+msgstr "Commande : /kick <nick>"
#: src/gui/widgets/channeltab.cpp:89
msgid "This command makes <nick> leave the channel."
-msgstr "Cette commande sort <pseudo> du salon."
+msgstr "Cette commande sort <nick> du salon."
#: src/gui/widgets/channeltab.cpp:118
msgid "Need a user to op!"
@@ -1837,7 +1821,7 @@ msgstr "Commande : /close"
#: src/gui/widgets/whispertab.cpp:79
msgid "This command closes the current whisper tab."
-msgstr "Cette commande ferme l'onglet courant de conversation privée"
+msgstr "Cette commande ferme l'onglet courant de conversation privée."
#: src/gui/windowmenu.cpp:59
msgid "Status"
@@ -1889,7 +1873,7 @@ msgstr "Arrêter d'attaquer"
#: src/keyboardconfig.cpp:49
msgid "Target Closest"
-msgstr "Cibler le plus proche"
+msgstr "Cible la plus proche"
#: src/keyboardconfig.cpp:50
msgid "Target NPC"
@@ -1974,9 +1958,8 @@ msgid "Debug Window"
msgstr "Fenêtre de debug"
#: src/keyboardconfig.cpp:80
-#, fuzzy
msgid "Party Window"
-msgstr "Fenêtre de conversation"
+msgstr "Fenêtre de groupe"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2026,7 +2009,7 @@ msgstr "Ignorer l'entrée 2"
#: src/localplayer.cpp:837
msgid "Unarmed"
-msgstr "Non armé"
+msgstr "Désarmé"
#: src/localplayer.cpp:838
msgid "Knife"
@@ -2103,77 +2086,68 @@ msgid "tmw"
msgstr "tmw"
#: src/main.cpp:567
-#, fuzzy
msgid "Options:"
-msgstr "Options : "
+msgstr "Options :"
#: src/main.cpp:568
-#, fuzzy
msgid " -C --config-file : Configuration file to use"
-msgstr " -C --configfile : Fichier de configuration à utiliser"
+msgstr " -C --config-file : Fichier de configuration a utiliser"
#: src/main.cpp:569
-#, fuzzy
msgid " -d --data : Directory to load game data from"
-msgstr " -d --data : Dossier à partir duquel charger les données de jeu"
+msgstr ""
+" -d --data : Repertoire dans lequel les données du jeu se trouvent et "
+"seront chargées"
#: src/main.cpp:570
msgid " -D --default : Choose default character server and character"
msgstr ""
+" -D --default : Choisir le serveur de personnages et le personnage par "
+"défaut"
#: src/main.cpp:572
-#, fuzzy
msgid " -h --help : Display this help"
-msgstr " -h --help : Affiche cette aide"
+msgstr " -h --help : Montre cette aide"
#: src/main.cpp:573
-#, fuzzy
msgid " -S --home-dir : Directory to use as home directory"
-msgstr " -S --homedir : Dossier à utiliser en tant que dossier personnel"
+msgstr " -S --home-dir : Répertoire a utiliser comme répertoire principal"
#: src/main.cpp:574
-#, fuzzy
msgid " -H --update-host : Use this update host"
-msgstr " -H --updatehost : Adresse à utiliser comme adresse de mise à jour"
+msgstr " -H --update-host : Utilise cette mise à jour d'Hôte"
#: src/main.cpp:575
-#, fuzzy
msgid " -P --password : Login with this password"
-msgstr " -P --password : Se connecter avec ce mot de passe"
+msgstr " -P --password : Se connecter avec ce mot de passe"
#: src/main.cpp:576
-#, fuzzy
msgid " -c --character : Login with this character"
-msgstr " -c --character : Se connecter avec ce personnage"
+msgstr " -c --character : Se connecter avec ce personnage"
#: src/main.cpp:577
-#, fuzzy
msgid " -p --port : Login Server Port"
-msgstr " -o --port : Port du serveur de connexion"
+msgstr " -p --port : Port de connexion au serveur"
#: src/main.cpp:578
-#, fuzzy
msgid " -s --server : Login Server name or IP"
-msgstr " -s --server : Nom ou IP du serveur de connexion"
+msgstr " -s --server : Ip ou nom du serveur pour la connection"
#: src/main.cpp:579
-#, fuzzy
msgid " -u --skip-update : Skip the update downloads"
-msgstr " -u --skipupdate : Sauter le téléchargement des mises à jour"
+msgstr " -u --skip-update : Passer les téléchargements de mise à jour"
#: src/main.cpp:580
-#, fuzzy
msgid " -U --username : Login with this username"
-msgstr " -U --username : Se connecter avec ce nom d'utilisateur"
+msgstr " -U --username : Se connecter avec ce nom d'utilisateur"
#: src/main.cpp:582
msgid " -O --no-opengl : Disable OpenGL for this session"
-msgstr ""
+msgstr " -O --no-opengl : Désactive OpenGL pour cette session"
#: src/main.cpp:584
-#, fuzzy
msgid " -v --version : Display the version"
-msgstr " -v --version : Affiche la version"
+msgstr " -v --version : Affiche la version"
#: src/main.cpp:589
msgid "The Mana World "
@@ -2205,7 +2179,7 @@ msgstr "Rien à vendre"
#: src/net/ea/buysellhandler.cpp:119
msgid "Thanks for buying"
-msgstr "Merci d'avoir acheté"
+msgstr "Merci pour votre achat"
#: src/net/ea/buysellhandler.cpp:126
msgid "Unable to buy"
@@ -2247,7 +2221,7 @@ msgstr "Personnage supprimé"
#: src/net/ea/charserverhandler.cpp:140
msgid "Failed to delete character."
-msgstr "La suppresion du personnage n'a pu se réaliser"
+msgstr "La suppresion du personnage n'a pu s\"effectuer."
#: src/net/ea/charserverhandler.cpp:224
#: src/net/tmwserv/charserverhandler.cpp:253
@@ -2280,7 +2254,8 @@ msgstr "Chance :"
#: src/net/ea/chathandler.cpp:78
msgid "Whisper could not be sent, user is offline"
-msgstr "Le message privé ne peut pas être envoyé, l'utilisateur est hors-ligne"
+msgstr ""
+"Le message privé ne peut pas être envoyé, l'utilisateur n'est pas connecté."
#: src/net/ea/chathandler.cpp:81
msgid "Whisper could not be sent, ignored by user"
@@ -2292,7 +2267,7 @@ msgstr ""
#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
msgid "Channels are not supported!"
-msgstr "Les canaux ne sont pas gérés !"
+msgstr "Les salons ne sont pas gérés !"
#: src/net/ea/equipmenthandler.cpp:111
msgid "Unable to equip."
@@ -2342,7 +2317,7 @@ msgstr "Aucun serveur n'est disponible"
#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
-msgstr ""
+msgstr "Quelqu'un d'autre essaye d'utiliser ce compte"
#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
@@ -2394,23 +2369,23 @@ msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe
#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp >Affiche / Modifie les préférences d'expérience du groupe"
+msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
-msgstr "Commande : /new <nom-du-groupe>"
+msgstr "Commande : /new <party-name>"
#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
-msgstr "Commande : /create <nom-du-groupe>"
+msgstr "Commande : /create <party-name>"
#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
-msgstr "Cette commande crée un nouveau groupe appelé <nom-du-groupe>"
+msgstr "Cette commande crée un nouveau groupe appelé <party-name>"
#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
-msgstr "Commande : /invite <pseudo>"
+msgstr "Commande : /invite <nick>"
#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
@@ -2418,11 +2393,11 @@ msgstr "Commande : /leave"
#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
-msgstr "Cette commande vous fait quitter votre groupe actuel"
+msgstr "Cette commande vous fait quitter votre groupe actuel."
#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
-msgstr "Commande : /item <préférences>"
+msgstr "Commande : /item <policy>"
#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
@@ -2448,12 +2423,12 @@ msgstr ""
#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
-msgstr "Commande : /exp <préférences>"
+msgstr "Commande : /exp <policy>"
#: src/net/ea/gui/partytab.cpp:100
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"
+"Cette commande change les préférences du groupe sur le partage d'expérience."
#: src/net/ea/gui/partytab.cpp:101
msgid ""
@@ -2506,9 +2481,9 @@ msgid "Unable to pick up item"
msgstr "Impossible de ramasser l'objet"
#: src/net/ea/inventoryhandler.cpp:193
-#, fuzzy, c-format
+#, c-format
msgid "You picked up %s [@@%d|%s@@]"
-msgstr "vous avez ramassé %s [%s]"
+msgstr "Vous avez ramassé %s [@@%d|%s@@]"
#: src/net/ea/inventoryhandler.cpp:239
msgid "Failed to use item"
@@ -2534,7 +2509,7 @@ msgstr "Rejeté par le server"
msgid ""
"You have been permanently banned from the game. Please contact the GM Team."
msgstr ""
-"Vous avez été banni de façon permanent du jeu. Merci de vous mettre en "
+"Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
"contact avec l'équipe des MJ."
#: src/net/ea/loginhandler.cpp:127
@@ -2582,7 +2557,7 @@ msgstr "%s est maintenant membre de votre groupe."
#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
-msgstr "Réponse d'invitation de %s inconnue"
+msgstr "Réponse d'invitation de %s inconnue."
#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
@@ -2591,7 +2566,7 @@ msgstr "vous avez quitté le groupe."
#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
-msgstr "%s a quitté le groupe"
+msgstr "%s a quitté le groupe."
#: src/net/ea/partyhandler.cpp:274
#, c-format
@@ -2600,7 +2575,7 @@ msgstr "Un membre inconnu a essayé de dire : %s"
#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
-msgstr ""
+msgstr "Cette manière d'inviter n'est pas en place actuellement."
#: src/net/ea/partyhandler.cpp:329
#, c-format
@@ -2619,7 +2594,7 @@ msgstr ""
#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
msgid "You are not that alive anymore."
-msgstr "Vous n'êtes plus tout a fait en vie."
+msgstr "Vous n'êtes plus vraiment en vie."
#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
msgid "The cold hands of the grim reaper are grabbing for your soul."
@@ -2630,17 +2605,16 @@ msgid "Game Over!"
msgstr "Jeu terminé !"
#: src/net/ea/playerhandler.cpp:102
-#, fuzzy
msgid "Insert coin to continue."
-msgstr "Insérez une pièce pour continuer"
+msgstr "veuillez insérer une pièce pour continuer."
#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr ""
-"No, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin il... "
-"est parti dans un monde meilleur."
+"No, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
+"il... est parti dans un monde meilleur."
#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
msgid ""
@@ -2656,7 +2630,7 @@ msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
msgid "Do you want your possessions identified?"
-msgstr "Voulez*vous que vos biens soient identifiés ?"
+msgstr "Voulez-vous que vos biens soient identifiés ?"
#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
msgid "Sadly, no trace of you was ever found..."
@@ -2668,7 +2642,7 @@ msgstr "Vaporisé."
#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
msgid "Looks like you got your head handed to you."
-msgstr "Il semble que l'on vous a rendu votre tête."
+msgstr "Il semble que l'on vous ait rendu votre tête."
#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
msgid ""
@@ -2683,7 +2657,7 @@ msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
#: src/net/ea/playerhandler.cpp:121
msgid "You are no more."
-msgstr "Vous n'êtes plus"
+msgstr "Vous n'existez plus."
#: src/net/ea/playerhandler.cpp:122
msgid "You have ceased to be."
@@ -2691,7 +2665,7 @@ msgstr "Vous avez cessez d'exister."
#: src/net/ea/playerhandler.cpp:123
msgid "You've expired and gone to meet your maker."
-msgstr "Tu es fini et est parti retrouvé ton créateur."
+msgstr "Tu es fini. Tu es parti retrouver ton créateur."
#: src/net/ea/playerhandler.cpp:124
msgid "You're a stiff."
@@ -2699,12 +2673,12 @@ msgstr "Tu es un dur."
#: src/net/ea/playerhandler.cpp:125
msgid "Bereft of life, you rest in peace."
-msgstr "Privé de vie, vous reposez en paix."
+msgstr "Privé de toute essence de vie, vous reposez en paix."
#: src/net/ea/playerhandler.cpp:126
msgid "If you weren't so animated, you'd be pushing up the daisies."
msgstr ""
-"Si tu n'étais pas autant en forme, tu serai en train de manger les "
+"Si tu n'étais pas autant en forme, tu serais en train de manger les "
"pissenlits par la racine."
#: src/net/ea/playerhandler.cpp:127
@@ -2713,27 +2687,27 @@ msgstr "Vos processus métaboliques appartiennent au passé maintenant."
#: src/net/ea/playerhandler.cpp:128
msgid "You're off the twig."
-msgstr ""
+msgstr "Tu es en dehors des clous"
#: src/net/ea/playerhandler.cpp:129
msgid "You've kicked the bucket."
-msgstr ""
+msgstr "Tu viens de toucher le fond."
#: src/net/ea/playerhandler.cpp:130
msgid ""
"You've shuffled off your mortal coil, run down the curtain and joined the "
"bleedin' choir invisibile."
msgstr ""
-"Vous êtes sorti de votre envellope mortelle et avez rejoint l'armée de "
-"l'invisible"
+"Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
+"l'armée de l'ombre."
#: src/net/ea/playerhandler.cpp:132
msgid "You are an ex-player."
-msgstr "Tu es un ancien joueur"
+msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
#: src/net/ea/playerhandler.cpp:133
msgid "You're pining for the fjords."
-msgstr ""
+msgstr "Tu reposes au fond de l'eau."
#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
msgid "Message"
@@ -2743,8 +2717,8 @@ msgstr "Message"
msgid ""
"You are carrying more than half your weight. You are unable to regain health."
msgstr ""
-"Vous portez plus de la moitié de votre poid. vous n'êtes plus en mesure de "
-"regagner vos points de vie."
+"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/ea/playerhandler.cpp:289
msgid "You picked up "
@@ -2752,7 +2726,7 @@ msgstr "Vous avez ramassé "
#: src/net/ea/playerhandler.cpp:412
msgid "Equip arrows first"
-msgstr "Equiper en premier les flêches"
+msgstr "Equiper les flêches en premier"
#: src/net/ea/skillhandler.cpp:138
msgid "Trade failed!"
@@ -2792,7 +2766,7 @@ msgstr "PV insuffisant !"
#: src/net/ea/skillhandler.cpp:171
msgid "You have no memos!"
-msgstr "Vous n'avez aps de messages !"
+msgstr "Vous n'avez pas de messages !"
#: src/net/ea/skillhandler.cpp:174
msgid "You cannot do that right now!"
@@ -2852,7 +2826,7 @@ msgstr "Echange impossible. Ce personnage n'existe pas."
#: src/net/ea/tradehandler.cpp:124
msgid "Trade cancelled due to an unknown reason."
-msgstr "Echange annul\" pour une raison inconnue."
+msgstr "Echange annulé pour une raison inconnue."
#: src/net/ea/tradehandler.cpp:130
msgid "Trade: You and "
@@ -2868,19 +2842,19 @@ msgstr " annulé"
#: src/net/ea/tradehandler.cpp:144
msgid "Unhandled trade cancel packet"
-msgstr "paquet de troc non pris en charge"
+msgstr "Paquet de troc non pris en charge"
#: src/net/ea/tradehandler.cpp:194
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
-"Impossible de rajouter un objet. Votre partner pour cet échange est "
+"Impossible de rajouter un objet. Votre partenaire pour cet échange est "
"surchargé."
#: src/net/ea/tradehandler.cpp:199
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
-"Impossible de rajouter un objet. Votre partner pour cet échange n'a plus de "
-"place libre."
+"Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
+"de place libre."
#: src/net/ea/tradehandler.cpp:203
msgid "Failed adding item for unknown reason."
@@ -2921,67 +2895,59 @@ msgstr "Volonté : %d"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
-msgstr ""
+msgstr "Mauvaise empreinte magique"
#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
-#, fuzzy
msgid "Already logged in"
-msgstr "Enregistrement en cours."
+msgstr "Déjà connecté"
#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
-#, fuzzy
msgid "Server is full"
-msgstr "Serveur"
+msgstr "Le serveur est plein"
#: src/net/tmwserv/loginhandler.cpp:110
-#, fuzzy
msgid "New password incorrect"
-msgstr "Entrer le nouveau mot de passe de nouveau :"
+msgstr "Nouveau mot de passe incorrect"
#: src/net/tmwserv/loginhandler.cpp:113
msgid "Old password incorrect"
-msgstr ""
+msgstr "Ancien mot de passe incorrect"
#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
msgid "Account not connected. Please login first."
-msgstr ""
+msgstr "Compte non connecté. Identifiez-vous tout d'abord."
#: src/net/tmwserv/loginhandler.cpp:140
-#, fuzzy
msgid "New email address incorrect"
-msgstr "Entrer la nouvelle adresse mail de nouveau :"
+msgstr "Nouvelle adresse email incorrecte"
#: src/net/tmwserv/loginhandler.cpp:143
-#, fuzzy
msgid "Old email address incorrect"
-msgstr "Entrer la nouvelle adresse mail de nouveau :"
+msgstr "Ancienne adresse email incorrecte"
#: src/net/tmwserv/loginhandler.cpp:149
-#, fuzzy
msgid "The new Email Address already exists."
-msgstr "Entrer la nouvelle adresse mail de nouveau :"
+msgstr "Cette nouvelle adresse email existe déjà."
#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
msgid "Client version is too old"
-msgstr ""
+msgstr "La version de votre client est trop ancienne."
#: src/net/tmwserv/loginhandler.cpp:179
-#, fuzzy
msgid "Wrong username or password"
-msgstr "Mauvais mot de passe"
+msgstr "Mauvais nom d'utilisateur ou mot de passe."
#: src/net/tmwserv/loginhandler.cpp:211
msgid "Wrong username, password or email address"
-msgstr ""
+msgstr "Mauvais nom d'utilisateur, mot de passe ou adrese email."
#: src/net/tmwserv/loginhandler.cpp:214
-#, fuzzy
msgid "Username already exists"
-msgstr "Ce nom d'utilisateur est déjà utilisé"
+msgstr "Ce nom d'utilisateur existe déjà"
#: src/net/tmwserv/loginhandler.cpp:217
msgid "Email address already exists"
-msgstr ""
+msgstr "Cette adresse email existe déjà"
#: src/resources/itemdb.cpp:52
#, c-format
@@ -3009,7 +2975,7 @@ msgstr "items.xml"
#: src/resources/itemdb.cpp:150
msgid "Unnamed"
-msgstr "anonyme"
+msgstr "Aonyme"
#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
msgid "unnamed"
@@ -3024,20 +2990,40 @@ msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
"Base de donnée des PNJ : Erreur pendant le chargement du fichier npcs.xml !"
-#~ msgid "Save player list"
-#~ msgstr "Sauvegarder la liste de joueurs"
-
#~ msgid "Scroll radius"
#~ msgstr "Rayon du défilement"
#~ msgid "Scroll laziness"
#~ msgstr "Lenteur du défilement"
+#~ msgid "MiniMap"
+#~ msgstr "Plan"
+
+#~ msgid "; "
+#~ msgstr "; "
+
+#~ msgid "+"
+#~ msgstr "+"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "Save player list"
+#~ msgstr "Sauvegarder la liste de joueurs"
+
#~ msgid "Emote"
#~ msgstr "Emote"
-#~ msgid "MiniMap"
-#~ msgstr "Plan"
+#~ msgid "inc"
+#~ msgstr "inc"
+
+#~ msgid "use"
+#~ msgstr "Utiliser"
+
+#~ msgid " -D --default : Bypass the login process with default settings"
+#~ msgstr ""
+#~ " -D --default : Bypasser le processus de connexion par la configuration "
+#~ "par défaut"
#~ msgid "NPC Number Request"
#~ msgstr "Requête de nombre PNJ"
@@ -3052,19 +3038,8 @@ msgstr ""
#~ msgid "NPC Text Request"
#~ msgstr "Requête de texte PNJ"
-#~ msgid "use"
-#~ msgstr "Utiliser"
-
#~ msgid "%s: %s"
#~ msgstr "%s : %s"
#~ msgid "Emote Window"
#~ msgstr "Fenêtre d'emote"
-
-#~ msgid "inc"
-#~ msgstr "inc"
-
-#~ msgid " -D --default : Bypass the login process with default settings"
-#~ msgstr ""
-#~ " -D --default : Bypasser le processus de connexion par la configuration "
-#~ "par défaut"
diff --git a/po/pl.po b/po/pl.po
index f0c6fcba..21031dc6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,13 +10,13 @@ msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2009-05-12 00:11+0200\n"
-"PO-Revision-Date: 2009-04-29 15:31+0000\n"
-"Last-Translator: lusmanko <Unknown>\n"
+"PO-Revision-Date: 2009-05-10 15:42+0000\n"
+"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: <pl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/commandhandler.cpp:141
@@ -24,9 +24,8 @@ msgid "-- Help --"
msgstr "-- Pomoc --"
#: src/commandhandler.cpp:142
-#, fuzzy
msgid "/help > Display this help"
-msgstr "/help > Wyświetla tą pomoc"
+msgstr ""
#: src/commandhandler.cpp:144
msgid "/where > Display map name"
@@ -290,18 +289,15 @@ msgid "Type /help for a list of commands."
msgstr "Wpisz /help aby usyskać listę komend."
#: src/commandhandler.cpp:339
-#, fuzzy
msgid "Cannot send empty whispers!"
-msgstr "Nie można wysłać pustych szeptów!"
+msgstr ""
#: src/commandhandler.cpp:346
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
"you."
msgstr ""
-"Nie można utworzyć zakładki szeptu dla ksywki '%s'!Już istnieje, lub podana "
-"ksywka to ty."
#: src/commandhandler.cpp:392
msgid "Return toggles chat."
@@ -755,18 +751,16 @@ msgid "Cast Test Spell 3"
msgstr "Test Rzucania Zaklęcia 3"
#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
-#, fuzzy
msgid "Map"
-msgstr "Maks."
+msgstr ""
#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr "Oczekiwanie na serwer"
#: src/gui/npcdialog.cpp:45
-#, fuzzy
msgid "Submit"
-msgstr "Usiądź"
+msgstr ""
#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
@@ -854,9 +848,8 @@ msgid "Being"
msgstr "Byt"
#: src/gui/palette.cpp:104
-#, fuzzy
msgid "Other Players' Names"
-msgstr "Imiona Innych Graczy"
+msgstr ""
#: src/gui/palette.cpp:105
msgid "Own Name"
@@ -879,24 +872,20 @@ msgid "Unknown Item Type"
msgstr "Nieznany Typ Przedmiotu"
#: src/gui/palette.cpp:111
-#, fuzzy
msgid "Generics"
-msgstr "Ogólne"
+msgstr ""
#: src/gui/palette.cpp:112
-#, fuzzy
msgid "Hats"
-msgstr "Kapelusze"
+msgstr ""
#: src/gui/palette.cpp:113
-#, fuzzy
msgid "Usables"
-msgstr "Używalne"
+msgstr ""
#: src/gui/palette.cpp:114
-#, fuzzy
msgid "Shirts"
-msgstr "Koszulki"
+msgstr ""
#: src/gui/palette.cpp:115
msgid "1 Handed Weapons"
@@ -915,19 +904,16 @@ msgid "2 Handed Weapons"
msgstr "Bronie dwuręczne"
#: src/gui/palette.cpp:119
-#, fuzzy
msgid "Shields"
-msgstr "Tarcze"
+msgstr ""
#: src/gui/palette.cpp:120
-#, fuzzy
msgid "Rings"
-msgstr "Pierścienie"
+msgstr ""
#: src/gui/palette.cpp:121
-#, fuzzy
msgid "Necklaces"
-msgstr "Naszyjniki"
+msgstr ""
#: src/gui/palette.cpp:122
msgid "Arms"
@@ -1041,14 +1027,13 @@ msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Anuluj@@"
#: src/gui/popupmenu.cpp:157
-#, fuzzy, c-format
+#, c-format
msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|Podnieś %s@@"
+msgstr ""
#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
-#, fuzzy
msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Dodaj do Czatu@@"
+msgstr ""
#: src/gui/popupmenu.cpp:348
msgid "@@use|Unequip@@"
@@ -1071,9 +1056,8 @@ msgid "@@split|Split@@"
msgstr "@@split|Rozdziel@@"
#: src/gui/popupmenu.cpp:364
-#, fuzzy
msgid "@@store|Store@@"
-msgstr "@@ignore|Ignoruj %s@@"
+msgstr ""
#: src/gui/popupmenu.cpp:371
msgid "@@retrieve|Retrieve@@"
@@ -1331,14 +1315,12 @@ msgid "Tiny"
msgstr ""
#: src/gui/setup_video.cpp:113
-#, fuzzy
msgid "Small"
-msgstr "Sprzedaj"
+msgstr ""
#: src/gui/setup_video.cpp:114
-#, fuzzy
msgid "Medium"
-msgstr "średnie"
+msgstr ""
#: src/gui/setup_video.cpp:115
msgid "Large"
@@ -1958,9 +1940,8 @@ msgid "Debug Window"
msgstr "Okno diagnostyczne"
#: src/keyboardconfig.cpp:80
-#, fuzzy
msgid "Party Window"
-msgstr "Okno Czatu"
+msgstr ""
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2085,77 +2066,64 @@ msgid "tmw"
msgstr "tmw"
#: src/main.cpp:567
-#, fuzzy
msgid "Options:"
-msgstr "Opcje: "
+msgstr ""
#: src/main.cpp:568
-#, fuzzy
msgid " -C --config-file : Configuration file to use"
-msgstr " -C --configfile : Plik konfiguracyjny do użycia"
+msgstr ""
#: src/main.cpp:569
-#, fuzzy
msgid " -d --data : Directory to load game data from"
-msgstr " -d --data : Katalog, z którego mają być wczytane dane gry"
+msgstr ""
#: src/main.cpp:570
msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-#, fuzzy
msgid " -h --help : Display this help"
-msgstr " -h --help : Pokazuje tą pomoc"
+msgstr ""
#: src/main.cpp:573
-#, fuzzy
msgid " -S --home-dir : Directory to use as home directory"
-msgstr " -S --homedir : Katalog do użycia jako katalog domowy"
+msgstr ""
#: src/main.cpp:574
-#, fuzzy
msgid " -H --update-host : Use this update host"
-msgstr " -H --updatehost : Użyj tego hosta aktualizacyjnego"
+msgstr ""
#: src/main.cpp:575
-#, fuzzy
msgid " -P --password : Login with this password"
-msgstr " -P --password : Zaloguj z tym hasłem"
+msgstr ""
#: src/main.cpp:576
-#, fuzzy
msgid " -c --character : Login with this character"
-msgstr " -c --character : Zaloguj z tą postacią"
+msgstr ""
#: src/main.cpp:577
-#, fuzzy
msgid " -p --port : Login Server Port"
-msgstr " -o --port : Port serwera logowania"
+msgstr ""
#: src/main.cpp:578
-#, fuzzy
msgid " -s --server : Login Server name or IP"
-msgstr " -s --server : Nazwa serweru logowania lub IP"
+msgstr ""
#: src/main.cpp:579
-#, fuzzy
msgid " -u --skip-update : Skip the update downloads"
-msgstr " -u --skipupdate : Pomiń pobieranie aktualizacji"
+msgstr ""
#: src/main.cpp:580
-#, fuzzy
msgid " -U --username : Login with this username"
-msgstr " -U --username : Zaloguj z tą nazwą użytkownika"
+msgstr ""
#: src/main.cpp:582
msgid " -O --no-opengl : Disable OpenGL for this session"
msgstr ""
#: src/main.cpp:584
-#, fuzzy
msgid " -v --version : Display the version"
-msgstr " -v --version : Pokazuje wersję"
+msgstr ""
#: src/main.cpp:589
msgid "The Mana World "
@@ -2482,9 +2450,9 @@ msgid "Unable to pick up item"
msgstr "Nie można podnieść przedmiotu"
#: src/net/ea/inventoryhandler.cpp:193
-#, fuzzy, c-format
+#, c-format
msgid "You picked up %s [@@%d|%s@@]"
-msgstr "Podniosłeś %s [%s]"
+msgstr ""
#: src/net/ea/inventoryhandler.cpp:239
msgid "Failed to use item"
@@ -2602,9 +2570,8 @@ msgid "Game Over!"
msgstr "Koniec gry!"
#: src/net/ea/playerhandler.cpp:102
-#, fuzzy
msgid "Insert coin to continue."
-msgstr "Wrzuć moneŧę, by kontynuować"
+msgstr ""
#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
msgid ""
@@ -2885,19 +2852,16 @@ msgid "Wrong magic_token"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
-#, fuzzy
msgid "Already logged in"
-msgstr "Już zapisuje."
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
-#, fuzzy
msgid "Server is full"
-msgstr "Serwer"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:110
-#, fuzzy
msgid "New password incorrect"
-msgstr "Wpisz dwukrotnie nowe hasło:"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:113
msgid "Old password incorrect"
@@ -2908,37 +2872,32 @@ msgid "Account not connected. Please login first."
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:140
-#, fuzzy
msgid "New email address incorrect"
-msgstr "Wpisz dwukrotnie nowy adres email:"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:143
-#, fuzzy
msgid "Old email address incorrect"
-msgstr "Wpisz dwukrotnie nowy adres email:"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:149
-#, fuzzy
msgid "The new Email Address already exists."
-msgstr "Wpisz dwukrotnie nowy adres email:"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
msgid "Client version is too old"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:179
-#, fuzzy
msgid "Wrong username or password"
-msgstr "Nieprawidłowe hasło"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:211
msgid "Wrong username, password or email address"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:214
-#, fuzzy
msgid "Username already exists"
-msgstr "Ta nazwa użytkownika jest już zajęta"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:217
msgid "Email address already exists"
@@ -2993,11 +2952,21 @@ msgstr "Baza NPC: Błąd podczas wczytywania npcs.xml!"
#~ msgid "Scroll laziness"
#~ msgstr "Opóźnienie przy przewijaniu ekranu"
+#~ msgid "MiniMap"
+#~ msgstr "MiniMapa"
+
#~ msgid "Emote"
#~ msgstr "Emoty"
-#~ msgid "MiniMap"
-#~ msgstr "MiniMapa"
+#~ msgid "inc"
+#~ msgstr "podw."
+
+#~ msgid "use"
+#~ msgstr "użyj"
+
+#~ msgid " -D --default : Bypass the login process with default settings"
+#~ msgstr ""
+#~ " -D --default : Pomiń proces logowania z domyślnymi ustawieniami"
#~ msgid "NPC Number Request"
#~ msgstr "Prośba NPC Numer"
@@ -3012,18 +2981,8 @@ msgstr "Baza NPC: Błąd podczas wczytywania npcs.xml!"
#~ msgid "NPC Text Request"
#~ msgstr "Tekst NPC - Prośba"
-#~ msgid "inc"
-#~ msgstr "podw."
-
-#~ msgid "use"
-#~ msgstr "użyj"
-
#~ msgid "%s: %s"
#~ msgstr "%s: %s"
#~ msgid "Emote Window"
#~ msgstr "Okno Emotek"
-
-#~ msgid " -D --default : Bypass the login process with default settings"
-#~ msgstr ""
-#~ " -D --default : Pomiń proces logowania z domyślnymi ustawieniami"
diff --git a/po/ru.po b/po/ru.po
index ac8f66ce..541c9811 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2009-05-12 00:11+0200\n"
-"PO-Revision-Date: 2009-03-19 09:49+0000\n"
-"Last-Translator: Alexander Aleschenko <Unknown>\n"
+"PO-Revision-Date: 2009-05-11 20:01+0000\n"
+"Last-Translator: Koptev Oleg <Unknown>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/commandhandler.cpp:141
@@ -23,35 +23,35 @@ msgstr "-- Помощь --"
#: src/commandhandler.cpp:142
msgid "/help > Display this help"
-msgstr ""
+msgstr "/help > Отображает этото текст"
#: src/commandhandler.cpp:144
msgid "/where > Display map name"
-msgstr ""
+msgstr "/where > Отображает имя карты"
#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
-msgstr ""
+msgstr "/who > Отображает количество пользователей он-лайн"
#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
-msgstr ""
+msgstr "/me > Расскажите что-нибудь о себе"
#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
-msgstr ""
+msgstr "/clear > Очищает это окно"
#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
-msgstr ""
+msgstr "/msg > Послать приватное сообщение пользователю"
#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
-msgstr ""
+msgstr "/whisper > Вариант команды msg"
#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
-msgstr ""
+msgstr "/w > Вариант команды msg"
#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
@@ -67,15 +67,15 @@ msgstr ""
#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
-msgstr ""
+msgstr "/join > Создать или присоединиться к каналу"
#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
-msgstr ""
+msgstr "Пригласить пользователя на канал"
#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
-msgstr ""
+msgstr "/record > Записывать чат во внешний файл"
#: src/commandhandler.cpp:162
msgid "/toggle > Determine whether <return> toggles the chat log"
@@ -107,7 +107,7 @@ msgstr "Команда: /help <команда>"
#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
-msgstr ""
+msgstr "Эта команда показывает помощь по <команде>."
#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
@@ -131,23 +131,23 @@ msgstr "Эта команда очищает лог чата."
#: src/commandhandler.cpp:196
msgid "Command: /join <channel>"
-msgstr ""
+msgstr "Команда: /join <канал>"
#: src/commandhandler.cpp:197
msgid "This command makes you enter <channel>."
-msgstr ""
+msgstr "Команда для входа на <канал>."
#: src/commandhandler.cpp:198
msgid "If <channel> doesn't exist, it's created."
-msgstr ""
+msgstr "Если <канал> не существует, он будет создан."
#: src/commandhandler.cpp:202
msgid "Command: /list"
-msgstr ""
+msgstr "Команда: /list"
#: src/commandhandler.cpp:203
msgid "This command shows a list of all channels."
-msgstr ""
+msgstr "Эта команда показывает список всех каналов."
#: src/commandhandler.cpp:207
msgid "Command: /me <message>"
@@ -167,11 +167,11 @@ msgstr ""
#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
-msgstr ""
+msgstr "Команда: /w <ник> <сообщение>"
#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
-msgstr ""
+msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
@@ -736,18 +736,16 @@ msgid "Cast Test Spell 3"
msgstr ""
#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
-#, fuzzy
msgid "Map"
-msgstr "МиниКарта"
+msgstr ""
#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
#: src/gui/npcdialog.cpp:45
-#, fuzzy
msgid "Submit"
-msgstr "Выход"
+msgstr ""
#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
@@ -863,14 +861,12 @@ msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-#, fuzzy
msgid "Hats"
-msgstr "Статистика"
+msgstr ""
#: src/gui/palette.cpp:113
-#, fuzzy
msgid "Usables"
-msgstr "Использовать"
+msgstr ""
#: src/gui/palette.cpp:114
msgid "Shirts"
@@ -893,9 +889,8 @@ msgid "2 Handed Weapons"
msgstr ""
#: src/gui/palette.cpp:119
-#, fuzzy
msgid "Shields"
-msgstr "Умения"
+msgstr ""
#: src/gui/palette.cpp:120
msgid "Rings"
@@ -1017,9 +1012,9 @@ msgid "@@cancel|Cancel@@"
msgstr "@@cancelОтмена@@"
#: src/gui/popupmenu.cpp:157
-#, fuzzy, c-format
+#, c-format
msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|Подобрать %s@@"
+msgstr ""
#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
msgid "@@chat|Add to chat@@"
@@ -1046,9 +1041,8 @@ msgid "@@split|Split@@"
msgstr "@@split|Разделить@@"
#: src/gui/popupmenu.cpp:364
-#, fuzzy
msgid "@@store|Store@@"
-msgstr "@@use|Использовать@@"
+msgstr ""
#: src/gui/popupmenu.cpp:371
msgid "@@retrieve|Retrieve@@"
@@ -1306,14 +1300,12 @@ msgid "Tiny"
msgstr ""
#: src/gui/setup_video.cpp:113
-#, fuzzy
msgid "Small"
-msgstr "Продать"
+msgstr ""
#: src/gui/setup_video.cpp:114
-#, fuzzy
msgid "Medium"
-msgstr "средне"
+msgstr ""
#: src/gui/setup_video.cpp:115
msgid "Large"
@@ -1931,9 +1923,8 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-#, fuzzy
msgid "Party Window"
-msgstr "Восстановить расположение окон"
+msgstr ""
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2922,11 +2913,11 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
-#~ msgid "Save player list"
-#~ msgstr "Сохранить список игроков"
-
#~ msgid "Scroll radius"
#~ msgstr "Радиус прокрутки"
#~ msgid "Scroll laziness"
#~ msgstr "Заторможенность прокрутки"
+
+#~ msgid "Save player list"
+#~ msgstr "Сохранить список игроков"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 49f80bb8..7da3be89 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,302 +8,301 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-21 17:27+0200\n"
-"PO-Revision-Date: 2009-05-08 06:15+0000\n"
+"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"PO-Revision-Date: 2009-05-11 03:32+0000\n"
"Last-Translator: netwareboss <netwareboss@gmail.com>\n"
"Language-Team: Traditional Chinese <themanaworld-"
"devel@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Poedit-Country: China\n"
"X-Poedit-Language: Chinese\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:141
msgid "-- Help --"
msgstr "-- 說明 --"
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
-msgid "/help > Display this help."
-msgstr "/help > 顯示這個說明文件。"
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
+msgstr "/help >顯示指令說明"
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr "/where > 顯示地圖名稱"
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr "/who > 顯示線上使用者的數量"
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr "/me > 顯示關於自己的資訊"
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr "/clear > 清除這個視窗"
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr "/msg > 傳送私人訊息給某使用者"
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr "/whisper > 效果同 msg"
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr "/w > 效果同 msg"
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr "/query > 建立與另一個使用者的私人訊息分頁"
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr "/q > 效果同 query"
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr "/list > 顯示所有公開頻道"
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr "/join > 加入或建立頻道"
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr "/party > 邀請使用者組隊"
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr "/record > 開始紀錄對話內容到外部檔案"
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:162
msgid "/toggle > Determine whether <return> toggles the chat log"
msgstr ""
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:163
msgid "/present > Get list of players present (sent to chat log, if logging)"
msgstr "/present > 取得上線玩家的清單(如果開啟記錄,傳送到聊天紀錄)"
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr "/announce > 全域廣播 (GM 專用)"
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr "輸入/help <指令> 獲取更多幫助訊息"
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr "指令: /help"
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:174
msgid "This command displays a list of all commands available."
msgstr "該指令可顯示所有可用指令。"
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:175
msgid "Command: /help <command>"
msgstr "指令: /help <指令>"
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
msgstr "該指令會顯示<指令>的幫助訊息"
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
msgstr "指令: /announce <信息>"
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr "*** 只有GM可用 ***"
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:186
msgid "This command sends the message <msg> to all players currently online."
msgstr "該指令會發送<信息>給所有線上用戶。"
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:191
msgid "Command: /clear"
msgstr "指令: /clear"
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr "該指令可以清除聊天紀錄。"
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:196
msgid "Command: /join <channel>"
msgstr "指令: /join <頻道名稱>"
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:197
msgid "This command makes you enter <channel>."
msgstr "這個指令可以讓你輸入 <頻道名稱>."
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:198
msgid "If <channel> doesn't exist, it's created."
msgstr "假如 <頻道名稱> 不存在,那就建立."
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:202
msgid "Command: /list"
msgstr "指令: /list"
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:203
msgid "This command shows a list of all channels."
msgstr "這個指令會顯示所有頻道的清單。"
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:207
msgid "Command: /me <message>"
msgstr "指令: /me <message>"
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr "這個指令會告訴其他人您正在做 <msg> 的事。"
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr "指令: /msg <nick> <message>"
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr "指令: /whisper <nick> <message>"
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr "指令: /w <nick> <message>"
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr "這個指令會傳送 <message> 的文字給 <nick>。"
-#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
+#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/partytab.cpp:76
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "如果<暱稱>之間有空格,用雙引號(\")括起來。"
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:221
msgid "Command: /query <nick>"
msgstr "指令: /query <nick>"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr "指令: /q <nick>"
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr "這個指令會嘗試建立您和 <nick> 之間的悄悄話分頁。"
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr "指令: /party <nick>"
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:76
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
msgid "This command invites <nick> to party with you."
msgstr "這個指令會邀請 <nick> 跟您組隊。"
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr "指令: /present"
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:236
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 ""
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:242
msgid "Command: /record <filename>"
msgstr "指令: /record <filename>"
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr "這個指令會開始將聊天紀錄錄製為檔案 <filename>。"
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr "指令: /record"
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:246
msgid "This command finishes a recording session."
msgstr "這個指令會結束錄製的作業階段。"
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:250
msgid "Command: /toggle <state>"
msgstr "指令: /toggle <state>"
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:251
msgid ""
"This command sets whether the return key should toggle the chat log, or "
"whether the chat log turns off automatically."
msgstr ""
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:253
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> 可以是 \"1\"、\"yes\"、\"true\" 其中之一來代表切換為開,或是 \"0\"、\"no\"、\"false\" "
-"來代表切換為關仔嶺。"
+"可以是 \"1\"、\"yes\"、\"true\" 其中之一來代表切換為開,或是 \"0\"、\"no\"、\"false\" 來代表切換為關閉."
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr "指令: /toggle"
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:257
msgid "This command displays the return toggle status."
msgstr ""
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:261
msgid "Command: /where"
msgstr "指令: /where"
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:262
msgid "This command displays the name of the current map."
msgstr "這個指令顯示目前地圖名。"
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:266
msgid "Command: /who"
msgstr "指令: /who"
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:267
msgid "This command displays the number of players currently online."
msgstr "這調指令可顯示目前線上人數。"
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:272
msgid "Unknown command."
msgstr "不明指令"
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:273
msgid "Type /help for a list of commands."
msgstr "輸入 /help 獲取指令列表。"
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
-msgstr "不能送出空的悄悄話!"
+#: src/commandhandler.cpp:339
+msgid "Cannot send empty whispers!"
+msgstr "傳送密語失敗"
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
-"Cannont create a whisper tab for nick '%s'!It either already exists, or is "
+"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
"you."
-msgstr "不能建立 nick 「%s」的悄悄話分頁!它已經存在,或者對象是你自己。"
+msgstr ""
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:392
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:392
msgid "Message closes chat."
msgstr ""
-#: src/commandhandler.cpp:398
+#: src/commandhandler.cpp:401
msgid "Return now toggles chat."
msgstr ""
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:405
msgid "Message now closes chat."
msgstr ""
@@ -313,45 +312,45 @@ msgid ""
"Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"、\"0\"。"
-#: src/game.cpp:248
+#: src/game.cpp:236
msgid "General"
msgstr "一般"
-#: src/game.cpp:411
+#: src/game.cpp:400
msgid "Screenshot saved to ~/"
msgstr "抓圖存到 ~/"
-#: src/game.cpp:416
+#: src/game.cpp:405
msgid "Saving screenshot failed!"
msgstr "儲存抓圖失敗!"
-#: src/game.cpp:492
-msgid "Network Error"
-msgstr "網路錯誤"
-
-#: src/game.cpp:493
+#: src/game.cpp:481
msgid "The connection to the server was lost, the program will now quit"
msgstr "已中斷連線到伺服器,程式將要離開"
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:487
+msgid "Network Error"
+msgstr "網路錯誤"
+
+#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
#: src/keyboardconfig.cpp:100
msgid "Quit"
msgstr "離開"
-#: src/game.cpp:665
+#: src/game.cpp:647
msgid "Are you sure you want to quit?"
msgstr "您確定要離開?"
-#: src/game.cpp:672
+#: src/game.cpp:654
msgid "no"
msgstr "否"
-#: src/game.cpp:813
+#: src/game.cpp:794
msgid "Ignoring incoming trade requests"
msgstr "忽略收到的交易要求"
-#: src/game.cpp:820
+#: src/game.cpp:801
msgid "Accepting incoming trade requests"
msgstr "接受收到的交易要求"
@@ -363,12 +362,12 @@ msgstr "好友"
msgid "Buddy List"
msgstr "好友清單"
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:39
+#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
msgid "Buy"
msgstr "購買"
#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:277
+#: src/gui/sell.cpp:278
#, c-format
msgid "Price: %s / Total: %s"
msgstr "價格: %s / 總共: %s"
@@ -378,13 +377,13 @@ msgid "Max"
msgstr "最大"
#: src/gui/buy.cpp:73 src/gui/buy.cpp:223 src/gui/buy.cpp:241
-#: src/gui/sell.cpp:75 src/gui/sell.cpp:249 src/gui/sell.cpp:263
+#: src/gui/sell.cpp:75 src/gui/sell.cpp:250 src/gui/sell.cpp:264
#, c-format
msgid "Description: %s"
msgstr "說明:%s"
#: src/gui/buy.cpp:74 src/gui/buy.cpp:225 src/gui/buy.cpp:242
-#: src/gui/sell.cpp:76 src/gui/sell.cpp:251 src/gui/sell.cpp:264
+#: src/gui/sell.cpp:76 src/gui/sell.cpp:252 src/gui/sell.cpp:265
#, c-format
msgid "Effect: %s"
msgstr "效果:%s"
@@ -393,203 +392,211 @@ msgstr "效果:%s"
msgid "Shop"
msgstr "商店"
-#: src/gui/buysell.cpp:39 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
msgid "Sell"
msgstr "出售"
-#: src/gui/buysell.cpp:39 src/gui/changeemaildialog.cpp:52
-#: src/gui/changepassworddialog.cpp:55 src/gui/charcreatedialog.cpp:75
-#: src/gui/char_select.cpp:112 src/gui/connection.cpp:38
-#: src/gui/item_amount.cpp:67 src/gui/login.cpp:74
-#: src/gui/npcintegerdialog.cpp:49 src/gui/npclistdialog.cpp:58
-#: src/gui/npcpostdialog.cpp:54 src/gui/npcstringdialog.cpp:47
+#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
+#: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
+#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:58
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:52 src/gui/updatewindow.cpp:112
+#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
+#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
msgid "Cancel"
msgstr "取消"
-#: src/gui/changeemaildialog.cpp:42 src/gui/changeemaildialog.cpp:51
-#: src/gui/char_select.cpp:122
+#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
+#: src/gui/charselectdialog.cpp:121
msgid "Change Email Address"
msgstr "變更郵件地址"
-#: src/gui/changeemaildialog.cpp:46 src/gui/changepassworddialog.cpp:47
-#: src/gui/char_select.cpp:124
+#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
+#: src/gui/charselectdialog.cpp:123
#, c-format
msgid "Account: %s"
msgstr "帳號: %s"
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
msgid "Type New Email Address twice:"
msgstr "輸入新的電子郵件地址兩次:"
-#: src/gui/changepassworddialog.cpp:43 src/gui/changepassworddialog.cpp:54
-#: src/gui/char_select.cpp:121
+#: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
+#: src/gui/charselectdialog.cpp:120
msgid "Change Password"
msgstr "變更密碼"
-#: src/gui/changepassworddialog.cpp:49 src/gui/login.cpp:51
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:49
+#: src/gui/changepassworddialog.cpp:50 src/gui/login.cpp:52
+#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
msgid "Password:"
msgstr "密碼:"
-#: src/gui/changepassworddialog.cpp:51
+#: src/gui/changepassworddialog.cpp:52
msgid "Type New Password twice:"
msgstr "輸入新密碼兩次:"
-#: src/gui/charcreatedialog.cpp:55
+#: src/gui/charcreatedialog.cpp:54
msgid "Create Character"
msgstr "新增角色"
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:50
+#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
#: src/gui/register.cpp:60
msgid "Name:"
msgstr "名字:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "髮色:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "髮型:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "創造"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "男生"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "女生"
-#: src/gui/charcreatedialog.cpp:95 src/gui/charcreatedialog.cpp:235
+#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
#, c-format
msgid "Please distribute %d points"
msgstr "請分配%d點數"
-#: src/gui/charcreatedialog.cpp:173 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:162 src/main.cpp:1487
+#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1503
#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
msgid "Error"
msgstr "錯誤"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "你的名字至少需要4個字元"
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "角色狀態確定"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "請移除%d點數"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "確認刪除角色"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "你確定想刪除這個角色?"
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
msgid "Account and Character Management"
msgstr "帳號與角色管理"
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
msgid "Select Character"
msgstr "選擇角色"
-#: src/gui/char_select.cpp:111 src/gui/item_amount.cpp:66
-#: src/gui/ok_dialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:102
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
+#: src/gui/serverdialog.cpp:103
msgid "Ok"
msgstr "確認"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "上一個"
-#: src/gui/char_select.cpp:114 src/gui/npc_text.cpp:88
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
msgid "Next"
msgstr "下一個"
-#: src/gui/char_select.cpp:115 src/gui/char_select.cpp:125
-#: src/gui/char_select.cpp:302 src/gui/char_select.cpp:323
-#: src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
+#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/unregisterdialog.cpp:49
#, c-format
msgid "Name: %s"
msgstr "名字:%s"
-#: src/gui/char_select.cpp:116 src/gui/char_select.cpp:126
-#: src/gui/char_select.cpp:304 src/gui/char_select.cpp:324
-#: src/gui/status.cpp:56 src/gui/status.cpp:175
+#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
+#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/status.cpp:55 src/gui/status.cpp:174
#, c-format
msgid "Level: %d"
msgstr "等級:%d"
-#: src/gui/char_select.cpp:118 src/gui/char_select.cpp:165
-#: src/gui/char_select.cpp:167 src/gui/char_select.cpp:333
+#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
+#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
msgid "New"
msgstr "新增"
-#: src/gui/char_select.cpp:119 src/gui/char_select.cpp:166
-#: src/gui/char_select.cpp:167 src/gui/char_select.cpp:316
+#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
+#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
#: src/gui/setup_players.cpp:230
msgid "Delete"
msgstr "刪除"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "取消註冊"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "金錢:%d"
-#: src/gui/char_select.cpp:162 src/gui/char_select.cpp:306
-#: src/gui/char_select.cpp:326
+#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
+#: src/gui/charselectdialog.cpp:325
#, c-format
msgid "Job Level: %d"
msgstr "職業等級:%d"
-#: src/gui/char_select.cpp:163 src/gui/char_select.cpp:309
-#: src/gui/char_select.cpp:328 src/gui/status.cpp:58 src/gui/status.cpp:183
+#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
+#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/status.cpp:182
#, c-format
msgid "Money: %s"
msgstr "金錢: %s"
-#: src/gui/chat.cpp:72 src/gui/menuwindow.cpp:65 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
msgid "Chat"
msgstr "聊天"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr "%d 位玩家的清單"
+
+#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
msgid "Present: "
msgstr "上線: "
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+msgid "; "
+msgstr ""
+
+#: src/gui/chat.cpp:349
msgid "Attendance written to record log."
msgstr "將上線訊息寫入錄製紀錄。"
-#: src/gui/chat.cpp:451
+#: src/gui/chat.cpp:474
#, c-format
msgid "Whispering to %s: %s"
msgstr "對%s竊竊私語:%s"
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "是"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "否"
@@ -597,26 +604,16 @@ msgstr "否"
msgid "Connecting..."
msgstr "連線中..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr "無法讀取 selection.png"
-#: src/gui/emotewindow.cpp:37 src/gui/menuwindow.cpp:76
-msgid "Emote"
-msgstr "表情"
-
-#: src/gui/emotewindow.cpp:47 src/gui/inventorywindow.cpp:67
-#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:280
-#: src/gui/skill.cpp:147
-msgid "Use"
-msgstr "使用"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "裝備"
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:274
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
msgid "Unequip"
msgstr "卸下裝備"
@@ -640,97 +637,100 @@ msgstr "離開公會"
msgid "Help"
msgstr "說明"
-#: src/gui/help.cpp:47 src/gui/npc_text.cpp:95
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "關閉"
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
msgid "Inventory"
msgstr "物品攔"
-#: src/gui/inventorywindow.cpp:66 src/gui/inventorywindow.cpp:68
-#: src/gui/inventorywindow.cpp:277
+#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
+#: src/gui/inventorywindow.cpp:270
msgid "Equip"
msgstr "裝備"
-#: src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+msgid "Use"
+msgstr "使用"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "丟棄"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "分開"
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:92
msgid "Slots:"
msgstr "欄位:"
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
msgid "Weight:"
msgstr "重量:"
-#: src/gui/item_amount.cpp:68
+#: src/gui/itemamount.cpp:95
msgid "All"
msgstr "全部"
-#: src/gui/item_amount.cpp:92
+#: src/gui/itemamount.cpp:121
msgid "Select amount of items to trade."
msgstr "請選擇交易的物品數量"
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "請選擇丟棄的物品數量"
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
msgid "Select amount of items to store."
msgstr "選擇要儲存的物品數量。"
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
msgid "Select amount of items to retrieve."
msgstr "選擇要取回的物品數量。"
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "請選擇你要分離的物品數量"
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
msgid "Weight: "
msgstr "重量: "
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
msgid "Login"
msgstr "登入"
-#: src/gui/login.cpp:53 src/gui/register.cpp:64 src/gui/serverdialog.cpp:75
-#: src/gui/widgets/chattab.cpp:136
+#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
+#: src/gui/widgets/chattab.cpp:135
msgid "Server:"
msgstr "伺服器:"
-#: src/gui/login.cpp:54 src/gui/register.cpp:65 src/gui/serverdialog.cpp:76
+#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
msgid "Port:"
-msgstr "Port:"
+msgstr "端口(port):"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
msgid "Recent:"
msgstr "最近的:"
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
msgid "Remember Username"
msgstr "保存用戶名"
-#: src/gui/login.cpp:73 src/gui/npcintegerdialog.cpp:48
-#: src/gui/npclistdialog.cpp:57 src/gui/npcstringdialog.cpp:46
-#: src/gui/serverselectdialog.cpp:57 src/gui/textdialog.cpp:36
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:72
+#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
msgid "OK"
msgstr "確定"
-#: src/gui/login.cpp:75 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
msgid "Register"
msgstr "註冊"
-#: src/gui/magic.cpp:32 src/gui/menuwindow.cpp:71 src/gui/skilldialog.cpp:117
-#: src/localplayer.cpp:860
+#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
+#: src/localplayer.cpp:845
msgid "Magic"
msgstr "魔法"
@@ -746,69 +746,40 @@ msgstr "施展測試咒文 2"
msgid "Cast Test Spell 3"
msgstr "施展測試咒文 3"
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "狀態"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "技能"
-
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr "公會"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+msgid "Map"
+msgstr "地圖"
-#: src/gui/menuwindow.cpp:73
-msgid "Buddys"
-msgstr "好友"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
+msgstr "等待伺服器中"
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "快捷鍵"
+#: src/gui/npcdialog.cpp:46
+msgid "Submit"
+msgstr "確認"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "設定"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "小地圖"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr "增加"
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
-msgstr ""
+#: src/gui/npcdialog.cpp:96
+msgid "-"
+msgstr "減少"
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
msgid "Reset"
msgstr "重設"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr ""
-"\n"
-"> 取消\n"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
msgid "Send"
msgstr "傳送"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr "NPC 文字要求"
-
-#: src/gui/npc_text.cpp:53 src/gui/npc_text.cpp:119
-msgid "Waiting for server"
-msgstr "等待伺服器"
-
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:233
-#: src/gui/setup_video.cpp:495
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:567
msgid "Text"
msgstr "文字"
@@ -861,7 +832,7 @@ msgid "Is"
msgstr "是"
#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:38
+#: src/net/ea/gui/partytab.cpp:37
msgid "Party"
msgstr "隊伍"
@@ -879,11 +850,11 @@ msgstr "超連結"
#: src/gui/palette.cpp:103
msgid "Being"
-msgstr "生物"
+msgstr "物件"
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
-msgstr "其他玩家的名字"
+msgid "Other Players' Names"
+msgstr "其他使用者名字"
#: src/gui/palette.cpp:105
msgid "Own Name"
@@ -899,27 +870,27 @@ msgstr "電腦"
#: src/gui/palette.cpp:108
msgid "Monsters"
-msgstr "Monsters"
+msgstr "怪物"
#: src/gui/palette.cpp:110
msgid "Unknown Item Type"
msgstr "不明物品類型"
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr "一般"
#: src/gui/palette.cpp:112
-msgid "Hat"
+msgid "Hats"
msgstr "帽子"
#: src/gui/palette.cpp:113
-msgid "Usable"
-msgstr "可使用"
+msgid "Usables"
+msgstr "可使用的"
#: src/gui/palette.cpp:114
-msgid "Shirt"
-msgstr "襯衫"
+msgid "Shirts"
+msgstr "內衣"
#: src/gui/palette.cpp:115
msgid "1 Handed Weapons"
@@ -938,16 +909,16 @@ msgid "2 Handed Weapons"
msgstr "雙手武器"
#: src/gui/palette.cpp:119
-msgid "Shield"
+msgid "Shields"
msgstr "盾牌"
#: src/gui/palette.cpp:120
-msgid "Ring"
-msgstr "指環"
+msgid "Rings"
+msgstr "戒指"
#: src/gui/palette.cpp:121
-msgid "Necklace"
-msgstr "項鍊"
+msgid "Necklaces"
+msgstr "腕甲"
#: src/gui/palette.cpp:122
msgid "Arms"
@@ -955,7 +926,7 @@ msgstr "武器"
#: src/gui/palette.cpp:123
msgid "Ammo"
-msgstr ""
+msgstr "阿木"
#: src/gui/palette.cpp:125
msgid "Particle Effects"
@@ -1001,94 +972,102 @@ msgstr "1/2 HP 量"
msgid "1/4 HP Bar"
msgstr "1/4 HP 量"
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
-msgstr ""
+msgstr "@@name|增加聊天名單@@"
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@交易|與%s交易@@"
-#: src/gui/popupmenu.cpp:86 src/gui/popupmenu.cpp:128
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
#, c-format
msgid "@@attack|Attack %s@@"
msgstr "@@攻擊|攻擊%s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
-msgstr ""
+msgstr "@@friend|與%s交朋友@@"
-#: src/gui/popupmenu.cpp:95
+#: src/gui/popupmenu.cpp:97
#, c-format
msgid "@@disregard|Disregard %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:98
#, c-format
msgid "@@ignore|Ignore %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
#, c-format
msgid "@@unignore|Un-Ignore %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:103
#, c-format
msgid "@@ignore|Completely ignore %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:111
+#: src/gui/popupmenu.cpp:113
#, c-format
msgid "@@guild|Invite %s to join your guild@@"
-msgstr ""
+msgstr "@@guild|邀請 %s 加入你的公會@@"
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
-msgstr ""
+msgstr "@@party|邀請 %s 加入你的隊伍@@"
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, c-format
msgid "@@talk|Talk To %s@@"
-msgstr ""
+msgstr "@@對話|與 %s 對話@@"
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:375
msgid "@@cancel|Cancel@@"
msgstr "@@取消|取消@@"
-#: src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:157
#, c-format
-msgid "@@pickup|Pick Up %s@@"
-msgstr "@@撿起|撿起%s@@"
+msgid "@@pickup|Pick up %s@@"
+msgstr "@@pickup|撿起 %s @@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
+msgstr "@@chat|加入聊天@@"
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@使用|裝備@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
msgid "@@use|Unequip@@"
msgstr "@@使用|卸下@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@使用|裝備@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@使用|使用@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@丟棄|丟棄@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@分離|分離@@"
+#: src/gui/popupmenu.cpp:364
+msgid "@@store|Store@@"
+msgstr "@@store|"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "交換伺服器"
@@ -1157,18 +1136,30 @@ msgstr "密碼不能少於%d個字元。"
msgid "Passwords do not match."
msgstr "密碼不一樣."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
msgid "Choose your server"
msgstr "選擇您的伺服器"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "請輸入伺服氣得IP地址和Port"
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
msgid "Select Server"
msgstr "選擇伺服器"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "設定"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "確定"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "重置視窗"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "聲音"
@@ -1185,11 +1176,11 @@ msgstr "音效音量"
msgid "Music volume"
msgstr "音樂音量"
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
msgid "This is what the color looks like"
msgstr "這是顏色看起來的樣子"
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
msgid "Colors"
msgstr "顏色"
@@ -1197,22 +1188,22 @@ msgstr "顏色"
msgid "Type: "
msgstr "類型: "
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
msgid "Static"
-msgstr ""
+msgstr "狀態"
#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
msgid "Pulse"
-msgstr ""
+msgstr "暫停"
#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:436
+#: src/gui/setup_colors.cpp:432
msgid "Rainbow"
msgstr "彩虹"
#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:436
+#: src/gui/setup_colors.cpp:432
msgid "Spectrum"
msgstr "光譜"
@@ -1220,26 +1211,18 @@ msgstr "光譜"
msgid "Delay: "
msgstr "延遲: "
-#: src/gui/setup_colors.cpp:109
+#: src/gui/setup_colors.cpp:108
msgid "Red: "
msgstr "紅: "
-#: src/gui/setup_colors.cpp:125
+#: src/gui/setup_colors.cpp:123
msgid "Green: "
msgstr "綠: "
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:138
msgid "Blue: "
msgstr "藍: "
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "確定"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "重置視窗"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "按下按鈕開始矯正"
@@ -1308,7 +1291,7 @@ msgstr "不理"
msgid "Ignored"
msgstr "忽略"
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
msgid "???"
msgstr "???"
@@ -1336,153 +1319,173 @@ msgstr "玩家"
msgid "When ignoring:"
msgstr "當忽略時:"
-#: src/gui/setup_video.cpp:123
+#: src/gui/setup_video.cpp:112
+msgid "Tiny"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "Small"
+msgstr "小型"
+
+#: src/gui/setup_video.cpp:114
+msgid "Medium"
+msgstr "中型"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr "大型"
+
+#: src/gui/setup_video.cpp:151
msgid "Full screen"
msgstr "全螢幕"
-#: src/gui/setup_video.cpp:124
+#: src/gui/setup_video.cpp:152
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:125
+#: src/gui/setup_video.cpp:153
msgid "Custom cursor"
msgstr "自訂滑鼠標"
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_video.cpp:155
msgid "Visible names"
msgstr "可見的名稱"
-#: src/gui/setup_video.cpp:127
+#: src/gui/setup_video.cpp:157
msgid "Particle effects"
msgstr "粒子效果"
-#: src/gui/setup_video.cpp:128
+#: src/gui/setup_video.cpp:159
msgid "Show name"
msgstr "顯示名稱"
-#: src/gui/setup_video.cpp:129
+#: src/gui/setup_video.cpp:160
msgid "Show pickup notification"
msgstr "顯示撿拾通知"
-#: src/gui/setup_video.cpp:130
+#: src/gui/setup_video.cpp:161
msgid "in chat"
msgstr "聊天中"
-#: src/gui/setup_video.cpp:131
+#: src/gui/setup_video.cpp:162
msgid "as particle"
-msgstr ""
+msgstr "如同練習"
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "FPS限制:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "顯示"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:189
msgid "Overhead text"
msgstr "置頂文字"
-#: src/gui/setup_video.cpp:158
+#: src/gui/setup_video.cpp:190
msgid "Gui opacity"
msgstr "Gui 透明度"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "捲動半徑"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "捲動延遲"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Ambient FX"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:194
msgid "Particle Detail"
msgstr "紋理細節"
-#: src/gui/setup_video.cpp:230 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:195
+msgid "Font size"
+msgstr "字型大小"
+
+#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
msgid "No text"
msgstr "沒有文字"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
+#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
msgid "Bubbles, no names"
-msgstr ""
+msgstr "有聊天泡泡,沒名字"
-#: src/gui/setup_video.cpp:239 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
msgid "Bubbles with names"
-msgstr ""
+msgstr "聊天泡泡加名字"
-#: src/gui/setup_video.cpp:247 src/gui/setup_video.cpp:538
+#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
msgid "off"
msgstr "關閉"
-#: src/gui/setup_video.cpp:250 src/gui/setup_video.cpp:261
-#: src/gui/setup_video.cpp:541 src/gui/setup_video.cpp:555
+#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
msgid "low"
msgstr "低"
-#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:267
-#: src/gui/setup_video.cpp:544 src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
msgid "high"
msgstr "高"
-#: src/gui/setup_video.cpp:264 src/gui/setup_video.cpp:558
+#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
msgid "medium"
msgstr "中"
-#: src/gui/setup_video.cpp:270 src/gui/setup_video.cpp:564
+#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
msgid "max"
msgstr "最大"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:410
msgid "Failed to switch to "
msgstr "無法切換到 "
-#: src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:411
msgid "windowed"
msgstr "視窗化"
-#: src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:411
msgid "fullscreen"
msgstr "全螢幕"
-#: src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:412
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:351
+#: src/gui/setup_video.cpp:421
msgid "Switching to full screen"
msgstr "切換全螢幕"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "請重新啟動"
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "切換為OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "確認切換OpenGL需要重新開始"
-#: src/gui/setup_video.cpp:448
+#: src/gui/setup_video.cpp:520
msgid "Screen resolution changed"
msgstr "螢幕解析度已變更"
-#: src/gui/setup_video.cpp:449
+#: src/gui/setup_video.cpp:521
msgid "Restart your client for the change to take effect."
msgstr "請重新啟動您的客戶端讓變更生效。"
-#: src/gui/setup_video.cpp:473
+#: src/gui/setup_video.cpp:545
msgid "Particle effect settings changed."
msgstr "粒子效果設定值已變更。"
-#: src/gui/setup_video.cpp:474
+#: src/gui/setup_video.cpp:546
msgid "Changes will take effect on map change."
msgstr "變更會在地圖改變後生效。"
@@ -1494,6 +1497,10 @@ msgstr "skills.xml"
msgid "Mystery Skill"
msgstr "神秘技能"
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "技能"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1503,182 +1510,174 @@ msgstr "技能點數:%d"
msgid "Up"
msgstr "升級"
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-msgid "use"
-msgstr "使用"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr "武器"
#: src/gui/skilldialog.cpp:121
msgid "Crafts"
-msgstr ""
+msgstr "工藝品"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, c-format
msgid "Job: %d"
msgstr "職業:%d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr "HP:"
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr "MP:"
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
msgid "Job:"
msgstr "職業:"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
msgid "Stats"
msgstr "狀態"
-#: src/gui/status.cpp:79
+#: src/gui/status.cpp:78
msgid "Total"
msgstr "總共"
-#: src/gui/status.cpp:80
+#: src/gui/status.cpp:79
msgid "Cost"
msgstr "需求"
-#: src/gui/status.cpp:84
+#: src/gui/status.cpp:83
msgid "Attack:"
msgstr "攻擊:"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
msgid "Defense:"
msgstr "防禦:"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
msgid "M.Attack:"
msgstr "摩攻:"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
msgid "M.Defense:"
msgstr "魔防:"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr "% Ac準確度:"
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr "% E迴避率:"
-#: src/gui/status.cpp:93
+#: src/gui/status.cpp:92
#, no-c-format
msgid "% Reflex:"
msgstr "% 傷害反射:"
-#: src/gui/status.cpp:199
+#: src/gui/status.cpp:198
msgid "Strength"
msgstr "力量"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
msgid "Agility"
msgstr "敏捷"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
msgid "Vitality"
msgstr "體力"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
msgid "Intelligence"
msgstr "智力"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
msgid "Dexterity"
msgstr "閃躲"
-#: src/gui/status.cpp:204
+#: src/gui/status.cpp:203
msgid "Luck"
msgstr "幸運"
-#: src/gui/status.cpp:222
+#: src/gui/status.cpp:221
#, c-format
msgid "Remaining Status Points: %d"
msgstr "剩餘狀態點數:%d"
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
msgid "Max level"
msgstr "最大等級"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr "貯藏庫"
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
msgid "Store"
msgstr "寄放"
-#: src/gui/storagewindow.cpp:65
+#: src/gui/storagewindow.cpp:66
msgid "Retrieve"
msgstr "取回"
-#: src/gui/storagewindow.cpp:75
+#: src/gui/storagewindow.cpp:78
msgid "Slots: "
msgstr "欄位: "
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:51
msgid "Propose trade"
msgstr "是否交易"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
msgid "Confirmed. Waiting..."
msgstr "已確認。請稍候..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
msgid "Agree trade"
msgstr "同意交易"
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
msgid "Agreed. Waiting..."
msgstr "已同意。請稍候..."
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:57
msgid "Trade: You"
msgstr "交易:您"
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
msgid "Trade"
msgstr "交易"
-#: src/gui/trade.cpp:74
+#: src/gui/trade.cpp:73
msgid "Add"
msgstr "增加"
-#: src/gui/trade.cpp:96 src/gui/trade.cpp:132 src/gui/trade.cpp:178
+#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
#, c-format
msgid "You get %s."
msgstr "您得到 %s。"
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "你付出:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "更改"
-#: src/gui/trade.cpp:271
+#: src/gui/trade.cpp:268
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
-#: src/gui/trade.cpp:321
+#: src/gui/trade.cpp:311
msgid "You don't have enough money"
msgstr "您沒有足夠的錢"
@@ -1790,21 +1789,21 @@ msgstr "需要指定要成為 op 的使用者!"
msgid "Need a user to kick!"
msgstr "需要指定要踢掉的使用者!"
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:114
msgid "Global announcement:"
msgstr "主要公告:"
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:120
#, c-format
msgid "Global announcement from %s:"
msgstr "%s 主要公告:"
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr "%s 的悄悄話: "
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
msgid "Unknown item"
msgstr "不明的物品"
@@ -1812,23 +1811,34 @@ msgstr "不明的物品"
msgid "Cannot send empty chat!"
msgstr "不能傳送空的聊天訊息!"
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr "/close > 關閉悄悄話分頁"
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr "指令: /close"
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
msgid "This command closes the current whisper tab."
msgstr "這個指令會關閉目前的悄悄話分頁。"
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "狀態"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr "公會"
+
+#: src/gui/windowmenu.cpp:66
+msgid "Buddys"
+msgstr "好友"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "快捷鍵"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr "上移"
@@ -1948,8 +1958,8 @@ msgid "Debug Window"
msgstr "程式除錯視窗"
#: src/keyboardconfig.cpp:80
-msgid "Emote Window"
-msgstr "表情視窗"
+msgid "Party Window"
+msgstr "隊伍視窗"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -1997,159 +2007,163 @@ msgstr "忽略輸入 1"
msgid "Ignore input 2"
msgstr "忽略輸入 2"
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:834
msgid "Unarmed"
msgstr "未命名"
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:835
msgid "Knife"
msgstr "小刀"
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:836
msgid "Sword"
msgstr "劍"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr "長戰斧"
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
msgid "Staff"
msgstr "杖"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr "鞭子"
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
msgid "Bow"
msgstr "弓"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr "射擊"
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
msgid "Mace"
msgstr "錘"
-#: src/localplayer.cpp:858
+#: src/localplayer.cpp:843
msgid "Axe"
msgstr "斧"
-#: src/localplayer.cpp:859
+#: src/localplayer.cpp:844
msgid "Thrown"
msgstr "投擲"
-#: src/localplayer.cpp:861
+#: src/localplayer.cpp:846
msgid "Craft"
-msgstr ""
+msgstr "工藝品"
-#: src/localplayer.cpp:862
+#: src/localplayer.cpp:847
msgid "Unknown Skill"
msgstr "不明的技能"
-#: src/main.cpp:253
+#: src/main.cpp:255
msgid "Invalid update host: "
msgstr "無效的更新主機: "
-#: src/main.cpp:286 src/main.cpp:292
+#: src/main.cpp:288 src/main.cpp:294
msgid "Error creating updates directory!"
msgstr "建立更新目錄失敗!"
-#: src/main.cpp:325
+#: src/main.cpp:327
msgid " can't be created, but it doesn't exist! Exiting."
msgstr " 不能建立,但是它也不存在!現在結束。"
-#: src/main.cpp:481
+#: src/main.cpp:483
msgid "Couldn't set "
msgstr "無法設定 "
-#: src/main.cpp:482
+#: src/main.cpp:484
msgid " video mode: "
msgstr " 視訊模式: "
-#: src/main.cpp:562
+#: src/main.cpp:566
msgid "tmw"
msgstr "tmw"
-#: src/main.cpp:563
-msgid "Options: "
-msgstr "選項: "
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr " -C --configfile : 要使用的組態檔案"
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr " -d --data : 用來載入遊戲資料的目錄"
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
-msgstr " -D --default : 以預設的設定值跳過登入程序"
+#: src/main.cpp:567
+msgid "Options:"
+msgstr "選項:"
#: src/main.cpp:568
-msgid " -h --help : Display this help"
-msgstr " -h --help : 顯示這個說明"
+msgid " -C --config-file : Configuration file to use"
+msgstr " -C --config-file : 使用此設定檔"
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
-msgstr " -S --homedir : 做為家目錄的目錄"
+msgid " -d --data : Directory to load game data from"
+msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr " -H --updatehost : 使用這個更新主機"
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
-msgstr " -P --password : 以這個密碼登入"
+msgid " -D --default : Choose default character server and character"
+msgstr " -D --default : 選擇預設的角色伺服器及角色"
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
-msgstr " -c --character : 以這個角色登入"
+msgid " -h --help : Display this help"
+msgstr " -h --help : 顯示求助說明"
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
-msgstr " -o --port : 登入伺服器連接埠"
+msgid " -S --home-dir : Directory to use as home directory"
+msgstr " -S --home-dir : 設定此目錄為家目錄"
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
-msgstr " -s --server : 登入伺服器名稱或 IP"
+msgid " -H --update-host : Use this update host"
+msgstr " -H --update-host : 使用此更新伺服器"
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
-msgstr " -u --skipupdate : 略過更新的下載"
+msgid " -P --password : Login with this password"
+msgstr " -P --password : 用此密碼登入"
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
-msgstr " -U --username : 以這個使用者名稱登入"
+msgid " -c --character : Login with this character"
+msgstr " -c --character : 用此帳號登入"
#: src/main.cpp:577
-msgid " -v --version : Display the version"
-msgstr " -v --version : 顯示版本"
+msgid " -p --port : Login Server Port"
+msgstr " -p --port : 伺服器端口"
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr " -s --server : 登入伺服器名稱或IP位址"
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr " -u --skip-update : 不使用更新"
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
+msgstr " -U -username : 使用此帳號登入"
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr " -O --no-opengl : 不使用OpenGL"
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr " -v --version : 顯示遊戲版本"
+
+#: src/main.cpp:589
msgid "The Mana World "
-msgstr ""
+msgstr "瑪那世界 "
-#: src/main.cpp:1499
+#: src/main.cpp:1515
msgid "Connecting to map server..."
msgstr "正在連接到地圖伺服器..."
-#: src/main.cpp:1507
+#: src/main.cpp:1523
msgid "Connecting to character server..."
msgstr "正在連接角色伺服器..."
-#: src/main.cpp:1515
+#: src/main.cpp:1531
msgid "Connecting to account server..."
msgstr "正在連接帳號伺服器..."
-#: src/net/ea/adminhandler.cpp:67
+#: src/net/ea/adminhandler.cpp:66
msgid "Kick failed!"
msgstr "踢人失敗!"
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
msgid "Kick succeeded!"
msgstr "踢人成功!"
@@ -2230,18 +2244,18 @@ msgstr "閃躲:"
msgid "Luck:"
msgstr "幸運:"
-#: src/net/ea/chathandler.cpp:81
+#: src/net/ea/chathandler.cpp:78
msgid "Whisper could not be sent, user is offline"
msgstr "無法傳送悄悄話,使用者已離線"
-#: src/net/ea/chathandler.cpp:84
+#: src/net/ea/chathandler.cpp:81
msgid "Whisper could not be sent, ignored by user"
msgstr "無法傳送悄悄話,被使用者忽略"
-#: src/net/ea/chathandler.cpp:203 src/net/ea/chathandler.cpp:209
-#: src/net/ea/chathandler.cpp:214 src/net/ea/chathandler.cpp:219
-#: src/net/ea/chathandler.cpp:224 src/net/ea/chathandler.cpp:229
-#: src/net/ea/chathandler.cpp:234 src/net/ea/chathandler.cpp:239
+#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
+#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
+#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
+#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
msgid "Channels are not supported!"
msgstr "頻道不支援!"
@@ -2253,125 +2267,133 @@ msgstr "無法裝備。"
msgid "Unable to unequip."
msgstr "無法卸下裝備。"
-#: src/net/ea/generalhandler.cpp:90 src/net/tmwserv/generalhandler.cpp:80
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
#, c-format
msgid "Strength: %d"
msgstr "力量: %d"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, c-format
msgid "Agility: %d"
msgstr "敏捷: %d"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, c-format
msgid "Vitality: %d"
msgstr "體力: %d"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, c-format
msgid "Intelligence: %d"
msgstr "智力: %d"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, c-format
msgid "Dexterity: %d"
msgstr "閃躲: %d"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr "幸運: %d"
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:125
msgid "Authentication failed"
msgstr "驗證失敗"
-#: src/net/ea/generalhandler.cpp:126
+#: src/net/ea/generalhandler.cpp:128
msgid "No servers available"
msgstr "沒有可用的伺服器"
-#: src/net/ea/generalhandler.cpp:129
+#: src/net/ea/generalhandler.cpp:132
+msgid "Someone else is trying to use this account"
+msgstr "此帳號正在使用中"
+
+#: src/net/ea/generalhandler.cpp:135
msgid "This account is already logged in"
msgstr "這個帳號已經登入"
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:138
msgid "Speed hack detected"
-msgstr ""
+msgstr "使用加速器"
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:141
msgid "Duplicated login"
msgstr "重複登入"
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:144
msgid "Unknown connection error"
msgstr "不明的連線錯誤"
-#: src/net/ea/generalhandler.cpp:197
+#: src/net/ea/generalhandler.cpp:201
msgid "Got disconnected from server!"
msgstr "和伺服器失去連線"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:52
+msgid "/help > Display this help."
+msgstr "/help > 顯示這個說明文件。"
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr "/create > 建立新的隊伍"
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr "/new > 效果同 create 指令"
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr "/invite > 邀請玩家加入您的隊伍"
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr "/leave > 離開您加入的隊伍"
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:57
msgid "/kick > Kick some one from the party you are in"
msgstr "/kick > 從您加入的隊伍中把某人踢出"
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr "/item > 顯示/改變隊伍道具分享選項"
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr "/exp > 顯示/改變隊伍經驗值分享選項"
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr "指令: /new <party-name>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr "指令: /create <party-name>"
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:70
msgid "These commands create a new party called <party-name>."
msgstr "這些指令會建立叫做 <party-name> 的新隊伍。"
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr "指令: /invite <nick>"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr "指令: /leave"
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:82
msgid "This command causes the player to leave the party."
msgstr "這個指令會使玩家離開隊伍。"
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:86
msgid "Command: /item <policy>"
msgstr "指令: /item <policy>"
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:87
msgid "This command changes the party's item sharing policy."
msgstr "這個指令會改變隊伍的道具分享政策。"
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:88
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
@@ -2379,23 +2401,23 @@ msgstr ""
"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用道具分享,或是 \"0\"、\"no\"、\"false\" "
"來停用道具分享。"
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr "指令: /item"
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:92
msgid "This command displays the party's current item sharing policy."
msgstr "這個指令會顯示此隊伍目前的道具分享政策。"
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:96
msgid "Command: /exp <policy>"
msgstr "指令: /exp <policy>"
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:97
msgid "This command changes the party's experience sharing policy."
msgstr "這個指令會改變此隊伍的經驗值分享政策。"
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:98
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2403,77 +2425,77 @@ msgstr ""
"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用經驗值分享,或是 \"0\"、\"no\"、\"false\" "
"來停用經驗值分享。"
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr "指令: /exp"
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:102
msgid "This command displays the party's current experience sharing policy."
msgstr "這個指令會顯示此隊伍目前的經驗值分享政策。"
-#: src/net/ea/gui/partytab.cpp:111
+#: src/net/ea/gui/partytab.cpp:110
msgid "Party name is missing."
msgstr "漏掉隊伍名稱。"
-#: src/net/ea/gui/partytab.cpp:134 src/net/ea/partyhandler.cpp:188
+#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
msgid "Item sharing enabled."
msgstr "物品分享已啟用。"
-#: src/net/ea/gui/partytab.cpp:137 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
msgid "Item sharing disabled."
msgstr "物品分享已停用。"
-#: src/net/ea/gui/partytab.cpp:140 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
msgid "Item sharing not possible."
msgstr "物品分享不可能。"
-#: src/net/ea/gui/partytab.cpp:166 src/net/ea/partyhandler.cpp:165
+#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
msgid "Experience sharing enabled."
msgstr "經驗值分享已啟用。"
-#: src/net/ea/gui/partytab.cpp:169 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
msgid "Experience sharing disabled."
msgstr "經驗值分享已停用。"
-#: src/net/ea/gui/partytab.cpp:172 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
msgid "Experience sharing not possible."
msgstr "經驗值分享不可能。"
-#: src/net/ea/inventoryhandler.cpp:184
+#: src/net/ea/inventoryhandler.cpp:183
msgid "Unable to pick up item"
msgstr "無法撿拾物品"
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:193
#, c-format
-msgid "You picked up %s [%s]"
-msgstr "您已經撿起 %s [%s]"
+msgid "You picked up %s [@@%d|%s@@]"
+msgstr "你撿起了 %s [@@%d|%s@@]"
-#: src/net/ea/inventoryhandler.cpp:240
+#: src/net/ea/inventoryhandler.cpp:239
msgid "Failed to use item"
msgstr "使用物品失敗"
-#: src/net/ea/loginhandler.cpp:111
+#: src/net/ea/loginhandler.cpp:110
msgid "Unregistered ID"
msgstr "未註冊的 ID"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
msgid "Wrong password"
msgstr "錯誤的密碼"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
msgid "Account expired"
msgstr "帳號已過期"
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
msgid "Rejected from server"
msgstr "被伺服器拒絕"
-#: src/net/ea/loginhandler.cpp:124
+#: src/net/ea/loginhandler.cpp:123
msgid ""
"You have been permanently banned from the game. Please contact the GM Team."
msgstr "您已經被這個遊戲永遠列入黑名單。請連絡 GM 團隊。"
-#: src/net/ea/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:127
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -2482,190 +2504,196 @@ msgstr ""
"您暫時被此遊戲列入黑名單,直到 %s。\n"
" 請透過討論區連絡 GM 團隊。"
-#: src/net/ea/loginhandler.cpp:135
+#: src/net/ea/loginhandler.cpp:134
msgid "This user name is already taken"
msgstr "這個使用者名稱已經被使用了"
-#: src/net/ea/loginhandler.cpp:138
+#: src/net/ea/loginhandler.cpp:137 src/net/tmwserv/loginhandler.cpp:89
+#: src/net/tmwserv/loginhandler.cpp:119 src/net/tmwserv/loginhandler.cpp:152
+#: src/net/tmwserv/loginhandler.cpp:188 src/net/tmwserv/loginhandler.cpp:220
msgid "Unknown error"
msgstr "不明的錯誤"
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
-msgstr "隊伍已成功的建立。"
-
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:77
msgid "Could not create party."
msgstr "無法建立隊伍。"
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
+msgstr "隊伍已成功的建立。"
+
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr "%s 已經是隊伍的一員。"
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr "%s 拒絕您的邀請。"
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr "%s 現在已經是您隊伍的成員。"
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr "給 %s 的不明邀請回應。"
-#: src/net/ea/partyhandler.cpp:229
+#: src/net/ea/partyhandler.cpp:232
msgid "You have left the party."
msgstr "您已經離開此隊伍。"
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
#, c-format
msgid "%s has left your party."
msgstr "%s 已經離開您的隊伍。"
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "不明的成員試著要說:%s"
-#: src/net/ea/partyhandler.cpp:323
+#: src/net/ea/partyhandler.cpp:298
+msgid "Inviting like this isn't supported at the moment."
+msgstr "此時無法支援邀請"
+
+#: src/net/ea/partyhandler.cpp:327
#, c-format
msgid "%s is not in your party!"
msgstr "%s 不在您的隊伍中!"
-#: src/net/ea/playerhandler.cpp:108 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
msgid "You are dead."
msgstr "您已經死亡。"
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
msgid "We regret to inform you that your character was killed in battle."
msgstr "我們很遺憾的通知您,您的角色已經在戰鬥中被殺了。"
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
msgid "You are not that alive anymore."
msgstr "您不再是那麼有活力。"
-#: src/net/ea/playerhandler.cpp:112 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "殘酷的死神用冰冷的手正在抽出你的靈魂。"
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
msgid "Game Over!"
msgstr "遊戲結束!"
-#: src/net/ea/playerhandler.cpp:114
-msgid "Insert coin to continue"
-msgstr "投入硬幣接關"
+#: src/net/ea/playerhandler.cpp:102
+msgid "Insert coin to continue."
+msgstr "請投入金幣"
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr "不,孩子。您的角色並沒有真的死掉。他...呃...去了更好的地方。"
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr "您想讓敵人的武器插入您的喉嚨好折斷它的計畫失敗了。"
-#: src/net/ea/playerhandler.cpp:119 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
msgid "I guess this did not run too well."
-msgstr ""
+msgstr "我猜這並沒有跑得很好"
-#: src/net/ea/playerhandler.cpp:121 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
msgid "Do you want your possessions identified?"
msgstr "您想要鑑定你的財產嗎?"
-#: src/net/ea/playerhandler.cpp:123 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
msgid "Sadly, no trace of you was ever found..."
msgstr "很悲傷的,沒有人發現你的蹤跡..."
-#: src/net/ea/playerhandler.cpp:125 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
msgid "Annihilated."
msgstr "灰飛煙滅了。"
-#: src/net/ea/playerhandler.cpp:127 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
msgid "Looks like you got your head handed to you."
msgstr "看起來你把你的頭拿在手上。"
-#: src/net/ea/playerhandler.cpp:129 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr ""
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:120
msgid "You're not dead yet. You're just resting."
msgstr "您還沒有死。您現在只是在休息。"
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:121
msgid "You are no more."
-msgstr ""
+msgstr "你已經沒有更多"
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:122
msgid "You have ceased to be."
msgstr ""
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:123
msgid "You've expired and gone to meet your maker."
-msgstr ""
+msgstr "你已經過期了,請求助管理員"
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:124
msgid "You're a stiff."
msgstr "身體僵硬"
-#: src/net/ea/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:125
msgid "Bereft of life, you rest in peace."
msgstr "失去了生命,您安詳的休息了。"
-#: src/net/ea/playerhandler.cpp:138
+#: src/net/ea/playerhandler.cpp:126
msgid "If you weren't so animated, you'd be pushing up the daisies."
msgstr ""
-#: src/net/ea/playerhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:127
msgid "Your metabolic processes are now history."
msgstr ""
-#: src/net/ea/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:128
msgid "You're off the twig."
-msgstr ""
+msgstr "你折斷了樹枝"
-#: src/net/ea/playerhandler.cpp:141
+#: src/net/ea/playerhandler.cpp:129
msgid "You've kicked the bucket."
msgstr "你踢了水桶"
-#: src/net/ea/playerhandler.cpp:142
+#: src/net/ea/playerhandler.cpp:130
msgid ""
"You've shuffled off your mortal coil, run down the curtain and joined the "
"bleedin' choir invisibile."
msgstr ""
-#: src/net/ea/playerhandler.cpp:144
+#: src/net/ea/playerhandler.cpp:132
msgid "You are an ex-player."
msgstr "您已是前-玩家。"
-#: src/net/ea/playerhandler.cpp:145
+#: src/net/ea/playerhandler.cpp:133
msgid "You're pining for the fjords."
msgstr ""
-#: src/net/ea/playerhandler.cpp:258 src/net/ea/playerhandler.cpp:281
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
msgid "Message"
msgstr "訊息"
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:247
msgid ""
"You are carrying more than half your weight. You are unable to regain health."
msgstr "您已經攜帶超過負重能力的一半。您將無法恢復生命。"
-#: src/net/ea/playerhandler.cpp:301
+#: src/net/ea/playerhandler.cpp:289
msgid "You picked up "
msgstr "您已經撿起 "
-#: src/net/ea/playerhandler.cpp:424
+#: src/net/ea/playerhandler.cpp:412
msgid "Equip arrows first"
msgstr "請先裝備弓箭"
@@ -2807,7 +2835,7 @@ msgstr "交易已完成。"
#: src/net/tmwserv/beinghandler.cpp:328
msgid " Press OK to respawn"
-msgstr ""
+msgstr " 請按確認啟動"
#: src/net/tmwserv/beinghandler.cpp:329
msgid "You died"
@@ -2821,40 +2849,96 @@ msgstr "沒有可用的遊戲伺服器。"
msgid "Willpower:"
msgstr "意志力:"
-#: src/net/tmwserv/chathandler.cpp:151
+#: src/net/tmwserv/chathandler.cpp:157
msgid "Topic: "
msgstr "主題: "
-#: src/net/tmwserv/generalhandler.cpp:90
+#: src/net/tmwserv/generalhandler.cpp:92
#, c-format
msgid "Willpower: %d"
msgstr "意志力: %d"
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwserv/loginhandler.cpp:80
+msgid "Wrong magic_token"
+msgstr "錯誤的魔法代號"
+
+#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+msgid "Already logged in"
+msgstr "已經登入"
+
+#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+msgid "Server is full"
+msgstr "伺服器人數已滿"
+
+#: src/net/tmwserv/loginhandler.cpp:110
+msgid "New password incorrect"
+msgstr "新密碼不正確"
+
+#: src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr "舊密碼輸入錯誤"
+
+#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+msgid "Account not connected. Please login first."
+msgstr "帳號還沒連線,請先登入"
+
+#: src/net/tmwserv/loginhandler.cpp:140
+msgid "New email address incorrect"
+msgstr "新的Email位址不正確"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr "舊得Email位址不正確"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+msgstr "Email已經被註冊"
+
+#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+msgid "Client version is too old"
+msgstr "遊戲版本太老舊!!"
+
+#: src/net/tmwserv/loginhandler.cpp:179
+msgid "Wrong username or password"
+msgstr "錯誤的帳號或密碼"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr "錯誤的帳號或密碼及E-mail"
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr "名字已經有人使用"
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr "E-mail已經存在"
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr "攻擊 %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr "防禦 %+d"
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr "items.xml"
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr "未知物品"
@@ -2870,6 +2954,118 @@ msgstr "monsters.xml"
msgid "NPC Database: Error while loading npcs.xml!"
msgstr "NPC 資料庫:當載入 npcs.xml 時發生錯誤!"
+#~ msgid "MiniMap"
+#~ msgstr "小地圖"
+
+#, c-format
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@撿起|撿起%s@@"
+
+#~ msgid "Emote"
+#~ msgstr "表情"
+
+#~ msgid "use"
+#~ msgstr "使用"
+
+#~ msgid "Insert coin to continue"
+#~ msgstr "投入硬幣接關"
+
+#~ msgid "Options: "
+#~ msgstr "選項: "
+
+#~ msgid " -C --configfile : Configuration file to use"
+#~ msgstr " -C --configfile : 要使用的組態檔案"
+
+#~ msgid " -d --data : Directory to load game data from"
+#~ msgstr " -d --data : 用來載入遊戲資料的目錄"
+
+#~ msgid " -D --default : Bypass the login process with default settings"
+#~ msgstr " -D --default : 以預設的設定值跳過登入程序"
+
+#~ msgid " -h --help : Display this help"
+#~ msgstr " -h --help : 顯示這個說明"
+
+#~ msgid " -H --updatehost : Use this update host"
+#~ msgstr " -H --updatehost : 使用這個更新主機"
+
+#~ msgid " -P --password : Login with this password"
+#~ msgstr " -P --password : 以這個密碼登入"
+
+#~ msgid " -u --skipupdate : Skip the update downloads"
+#~ msgstr " -u --skipupdate : 略過更新的下載"
+
+#~ msgid " -U --username : Login with this username"
+#~ msgstr " -U --username : 以這個使用者名稱登入"
+
+#~ msgid " -v --version : Display the version"
+#~ msgstr " -v --version : 顯示版本"
+
+#~ msgid "Cannont send empty whispers!"
+#~ msgstr "不能送出空的悄悄話!"
+
+#, c-format
+#~ msgid ""
+#~ "Cannont create a whisper tab for nick '%s'!It either already exists, or is "
+#~ "you."
+#~ msgstr "不能建立 nick 「%s」的悄悄話分頁!它已經存在,或者對象是你自己。"
+
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr ""
+#~ "\n"
+#~ "> 取消\n"
+
+#~ msgid "NPC Text Request"
+#~ msgstr "NPC 文字要求"
+
+#~ msgid "Other Player's Names"
+#~ msgstr "其他玩家的名字"
+
+#~ msgid "Generic"
+#~ msgstr "一般"
+
+#~ msgid "Hat"
+#~ msgstr "帽子"
+
+#~ msgid "Usable"
+#~ msgstr "可使用"
+
+#~ msgid "Shirt"
+#~ msgstr "襯衫"
+
+#~ msgid "Shield"
+#~ msgstr "盾牌"
+
+#~ msgid "Ring"
+#~ msgstr "指環"
+
+#~ msgid "Necklace"
+#~ msgstr "項鍊"
+
+#, c-format
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "Emote Window"
+#~ msgstr "表情視窗"
+
+#~ msgid " -S --homedir : Directory to use as home directory"
+#~ msgstr " -S --homedir : 做為家目錄的目錄"
+
+#~ msgid " -c --character : Login with this character"
+#~ msgstr " -c --character : 以這個角色登入"
+
+#~ msgid " -o --port : Login Server Port"
+#~ msgstr " -o --port : 登入伺服器連接埠"
+
+#~ msgid " -s --server : Login Server name or IP"
+#~ msgstr " -s --server : 登入伺服器名稱或 IP"
+
+#, c-format
+#~ msgid "You picked up %s [%s]"
+#~ msgstr "您已經撿起 %s [%s]"
+
#~ msgid "Gold: %d"
#~ msgstr "金幣:%d"