summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-06 00:33:45 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-06 00:33:45 +0300
commit2df2bc1dcd25894101636c3b57061bcf60828273 (patch)
tree5fd598efcc04b16ba3343bf721938e06aaae2eab
parent78ee4491892b8fae778b913a0b8db52b9876dabe (diff)
downloadManaVerse-2df2bc1dcd25894101636c3b57061bcf60828273.tar.gz
ManaVerse-2df2bc1dcd25894101636c3b57061bcf60828273.tar.bz2
ManaVerse-2df2bc1dcd25894101636c3b57061bcf60828273.tar.xz
ManaVerse-2df2bc1dcd25894101636c3b57061bcf60828273.zip
Rebuild translations. Update ru and es translations.
-rw-r--r--po/cs.po153
-rw-r--r--po/de.po150
-rw-r--r--po/es.po151
-rw-r--r--po/fi.po257
-rw-r--r--po/fr.po156
-rw-r--r--po/id.po153
-rw-r--r--po/ja.po1040
-rw-r--r--po/manaplus.pot142
-rw-r--r--po/nl_BE.po153
-rw-r--r--po/pl.po150
-rw-r--r--po/pt.po260
-rw-r--r--po/pt_BR.po260
-rw-r--r--po/ru.po153
-rw-r--r--po/zh_CN.po150
14 files changed, 1572 insertions, 1756 deletions
diff --git a/po/cs.po b/po/cs.po
index 55980a9ba..b4f7f306d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
"PO-Revision-Date: 2011-11-11 21:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
@@ -43,47 +43,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Nastavení"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Výkon"
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Přihlašuji se"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Požaduji postavy"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Zaměňuji herní servery"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,63 +93,63 @@ msgstr "Zaměňuji herní servery"
msgid "Error"
msgstr "Chyba"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Požaduji registrační detaily"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Změna hesla"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Změna emailu"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Zrušení registrace úspěšné"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Nashledanou, vraťte se kdykoli..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Neplatný host updatů: %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "Chyba při vytváření adresáře s updaty!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Neznámý příkaz."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "Nelze zaslat prázdné šeptání!"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,105 +158,105 @@ msgstr ""
"Nelze vytvořit záložku se šeptáním pro \"%s\"! Buďto záložka existuje nebo "
"jsi to ty."
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr ""
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Chybí jméno party."
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Chybí jméno guildy."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Prosím zadej jméno."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "Enter přepíná chat."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "Zpráva zavírá chat."
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "Enter nyní přepíná chat."
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Zpráva nyní ukončuje chat."
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "přítel"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "přehlížený"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "neutrální"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "Hráč je již %s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "Hráč byl úspěšně zařazen jako %s!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "Hráč nemůže být zařazen jako %s!"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "Hráč nebyl ignorován!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "Hráč již není ignorován!"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "Hráč nemůže být odignorován!"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "Hráč již byl vymazán!"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "Hráč byl úspěšně vymazán!"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "Hráč nemůže být vymazán!"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr "Doba běhu klienta: %s"
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -264,7 +264,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -272,7 +272,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -280,7 +280,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -288,7 +288,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -296,27 +296,27 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr "velikost chache fontů"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr "Velikost cache:"
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "Vytvořeno:"
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "Odstraněno:"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr ""
@@ -746,12 +746,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Přítomno: %s; %d hráčů je přítomno."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Šeptání pro %s: %s"
@@ -1255,8 +1255,8 @@ msgid "Need"
msgstr "Potřebuješ"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Čeká se na server"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1507,8 +1507,9 @@ msgid "Warp"
msgstr ""
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Načíst staré výstroje"
+#, fuzzy
+msgid "Clear outfit"
+msgstr "Obléct výstroj"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1570,12 +1571,12 @@ msgid "Name: "
msgstr "Jméno: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr "Hráčův komentář"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr "Komentář: "
@@ -4401,7 +4402,11 @@ msgstr ""
msgid " --safemode : Start game in safe mode"
msgstr ""
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr ""
@@ -5628,6 +5633,12 @@ msgstr ""
msgid "Unknown item"
msgstr "Neznámý předmět"
+#~ msgid "Waiting for server"
+#~ msgstr "Čeká se na server"
+
+#~ msgid "Load old outfits"
+#~ msgstr "Načíst staré výstroje"
+
#~ msgid "(?) move"
#~ msgstr "(?) pohyb"
diff --git a/po/de.po b/po/de.po
index ab13265a3..e07cf9c8e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
"PO-Revision-Date: 2011-11-11 21:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -45,47 +45,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Einstellungen"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Verbinde zum Server"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Anmelden"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Spielfiguren werden angefragt"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Verbinde zum Charakterserver"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Charakterserver wechseln"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,64 +95,64 @@ msgstr "Charakterserver wechseln"
msgid "Error"
msgstr "Fehler"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Passwort ändern"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "E-Mail ändern"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "erfolgreich abgemeldet."
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komme jeder Zeit wieder..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Ungültiger Updateserver: %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
"Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Unbekannter Befehl."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "Kann keine leeren Nachrichten versenden!"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -161,160 +161,160 @@ msgstr ""
"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
"oder du bist es selbst."
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "Anfrage den Kanal %s betreten zu dürfen."
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Name der Party fehlt."
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Name der Gilde fehlt."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Bitte gib einen Namen an."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)"
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "Nachricht schließt den Chat."
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "Enter aktiviert jetzt den Chat."
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Nachricht schließt jetzt den Chat."
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "Freund"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "unbeachtet"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "neutral"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "Spieler ist bereits %s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "Spieler erfolgreich %s!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "Spieler konnte nicht %s werden!"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "Spieler wurde nicht ignoriert!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "Spieler wird nicht länger ignoriert!"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "Spieler ist bereits gelöscht!"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "Spieler erfolgreich gelöscht!"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "Spieler konnte nicht gelöscht werden!"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr ""
@@ -745,12 +745,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Anwesend: %s ;%d Spieler sind anwesend."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Flüsternd zu %s: %s"
@@ -1252,8 +1252,8 @@ msgid "Need"
msgstr "Muss"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Warte auf Server"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1504,8 +1504,9 @@ msgid "Warp"
msgstr ""
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr ""
+#, fuzzy
+msgid "Clear outfit"
+msgstr "Ausrüstung anziehen"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1566,12 +1567,12 @@ msgid "Name: "
msgstr "Name:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr ""
@@ -4404,7 +4405,11 @@ msgstr ""
msgid " --safemode : Start game in safe mode"
msgstr ""
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr ""
@@ -5632,3 +5637,6 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Unbekannter Gegenstand"
+
+#~ msgid "Waiting for server"
+#~ msgstr "Warte auf Server"
diff --git a/po/es.po b/po/es.po
index 99d002656..cc3b62452 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,15 +5,15 @@
# Translators:
# Andrei Karas <akaras@inbox.ru>, 2011.
# Jumpy <antoinebcn@hotmail.com>, 2011.
-# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011.
+# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011, 2012.
# Nelson Martell <nelson6eeduardo65@gmail.com>, 2011.
# Nelson <nelson6eeduardo65@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
-"PO-Revision-Date: 2011-12-13 15:55+0000\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"PO-Revision-Date: 2012-01-05 21:19+0000\n"
"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
"manaplus/team/es/)\n"
@@ -45,47 +45,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configuración"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Rendimiento"
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Conectando al servidor"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Accediendo a la cuenta"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Cargando personajes"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,63 +95,63 @@ msgstr "Cambiando servidores del juego"
msgid "Error"
msgstr "Error"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Cambio de contraseña"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Cambio de Email"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Registro cancelado"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "¡%s no existe y no puede ser creado! Saliendo."
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Servidor de actualización inválido: %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "¡Error al crear la carpeta de actualizaciones!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Comando desconocido."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "¡No puedes enviar susurros vacíos!"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,160 +160,160 @@ msgstr ""
"¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
"existe, o eres tú."
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando la entrada del canal %s."
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Falta el nombre del grupo."
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Falta el nombre del Clan."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Por favor, especifique un nombre."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "Volver a alternar el chat."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "Mensaje cierra la charla."
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "Volver ahora a cambiar de chat."
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Mensaje ahora cierra el chat."
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "desatendido"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "neutral"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "¡Jugador ya es %s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "¡Jugador %s exitosamente!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "¡Jugador no pudo ser %s!"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "El jugador no estaba ignorado!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "¡El jugador ya no es ignorado!"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "¡Al jugador no se le puede dejar de ignorar!"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr "en la lista negra"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr "enemigo"
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "¡Jugador ya borrado!"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "¡Jugador borrado con éxito!"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "¡Jugador no pudo ser borrado!"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr "Tiempo de actividad del cliente: %s"
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d día"
msgstr[1] "%d días"
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr "tamaño de caché de fuente"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr "Tám. caché:"
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "Creado:"
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "Borrado:"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr "Imágenes de recurso:"
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr "Imágenes de recurso huérfano:"
@@ -744,12 +744,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jugadores estan presentes."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Susurrando a %s: %s"
@@ -1251,8 +1251,8 @@ msgid "Need"
msgstr "Necesitas"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Esperando al servidor"
+msgid "Stop waiting"
+msgstr "Dejar de esperar"
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1503,8 +1503,8 @@ msgid "Warp"
msgstr "Deformar"
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Cargar conjuntos antiguos"
+msgid "Clear outfit"
+msgstr "Limpiar vestimenta"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1565,12 +1565,12 @@ msgid "Name: "
msgstr "Nombre:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr "Comentario del jugador "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr "Comentario: "
@@ -4400,7 +4400,12 @@ msgstr " --screenshot-dir : Carpeta donde guardar los screenshots"
msgid " --safemode : Start game in safe mode"
msgstr " --safemode : Iniciar el juego en modo seguro"
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+" -T --tests : Comenzar a probar controladores y auto configurar"
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr " --no-opengl : Deshabilita OpenGL en esta sesion"
diff --git a/po/fi.po b/po/fi.po
index 77e0faebb..632c44a2c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"PO-Revision-Date: 2011-12-08 14:10+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fi\n"
@@ -41,47 +41,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Asetukset"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Kuva"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Kirjaudun sisään"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -91,63 +91,63 @@ msgstr "Vaihdan pelipalvelinta"
msgid "Error"
msgstr "Virhe"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Salasanan vaihto"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Sähköpostin vaihto"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Epäkelpo päivitysosoite: %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Tuntematon komento."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "Et voi lähettää tyhjiä kuiskauksia!"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -156,160 +156,160 @@ msgstr ""
"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
"käytit omaa nimeäsi."
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "Pyyntö liittyä kanavalle %s lähetetty."
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Ryhmän nimi puuttuu."
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Killan nimi puuttuu."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Anna nimi."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "Viesti sulkee keskustelun."
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Nyt viesti sulkee keskustelun."
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "ystävä"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "vaimennettu"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "neutraali"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "Pelaaja on jo %s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "Pelaaja on nyt %s."
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "Pelaajaa ei ollut jätetty huomiotta!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "Pelaaja huomioidaan taas."
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "Pelaaja on jo pyyhitty!"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "Pelaaja pyyhitty."
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr "Ohjelma ollut käynnissä: %s"
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d viikon"
msgstr[1] "%d viikkoa"
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d päivän"
msgstr[1] "%d päivää"
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d tunnin"
msgstr[1] "%d tuntia"
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuutin"
msgstr[1] "%d minuuttia"
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d sekunnin"
msgstr[1] "%d sekuntia"
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr "kirjasinvälimuistin koko"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr "Välimuistin koko:"
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "Luotu:"
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "Poistettu:"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr "Resurssikuvat:"
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr "Orvot resurssikuvat:"
@@ -741,12 +741,12 @@ msgstr "???"
msgid "Chat"
msgstr "Keskustelu"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Läsnä: %s; %d pelaajaa paikalla."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Kuiskaat pelaajalle %s: %s"
@@ -1248,8 +1248,8 @@ msgid "Need"
msgstr "Tarvitaan"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Odotetaan palvelinta"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1500,8 +1500,9 @@ msgid "Warp"
msgstr ""
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Lataa vanhat asut"
+#, fuzzy
+msgid "Clear outfit"
+msgstr "Pue asu"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1562,12 +1563,12 @@ msgid "Name: "
msgstr "Nimi: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr ""
@@ -4038,14 +4039,13 @@ msgid "(d) double normal + crazy"
msgstr "(d) tuplaa tavallinen + villi"
#: src/localplayer.cpp:1898
-#, fuzzy
msgid "(?) unknown move"
-msgstr "(?) tuntematon seuraaminen"
+msgstr ""
#: src/localplayer.cpp:1920
-#, fuzzy, c-format
+#, c-format
msgid "(%d) crazy move number %d"
-msgstr "(?) villiliike"
+msgstr ""
#: src/localplayer.cpp:1925
msgid "(a) custom crazy move"
@@ -4284,9 +4284,8 @@ msgid "Game modifiers are disabled"
msgstr "Pelimuokkaimet poissa käytöstä"
#: src/localplayer.cpp:2236
-#, fuzzy
msgid "Game modifiers are unknown"
-msgstr "Pelimuokkaimet käytössä"
+msgstr ""
#: src/localplayer.cpp:3752
msgid "Follow: "
@@ -4397,7 +4396,11 @@ msgstr " --screenshot-dir : Kuvankaappausten tallennushakemisto"
msgid " --safemode : Start game in safe mode"
msgstr " --safemode : Käynnistä peli vikasietotilassa"
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr " --no-opengl : Poista OpenGL käytöstä tämän session ajaksi"
@@ -5635,98 +5638,8 @@ msgstr "MP %+d"
msgid "Unknown item"
msgstr "Tuntematon tavara"
-#~ msgid "(?) move"
-#~ msgstr "(?) liiku"
-
-#~ msgid "(?) map view"
-#~ msgstr "(?) karttanäkymä"
-
-#~ msgid "(D) design camera mode"
-#~ msgstr "(D) suunnittelukamera"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(I)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
+#~ msgid "Waiting for server"
+#~ msgstr "Odotetaan palvelinta"
-#~ msgid "(O)"
-#~ msgstr "(O)"
+#~ msgid "Load old outfits"
+#~ msgstr "Lataa vanhat asut"
diff --git a/po/fr.po b/po/fr.po
index 81ee5867c..6c149df62 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
-"PO-Revision-Date: 2011-11-28 21:35+0000\n"
-"Last-Translator: reid <reidyaro@gmail.com>\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"PO-Revision-Date: 2012-01-05 20:43+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
"fr/)\n"
"Language: fr\n"
@@ -45,47 +45,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configuration"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vidéo"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr "Thèmes"
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Connexion au serveur"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Connexion"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Vous entrez dans un nouveau monde"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,64 +95,64 @@ msgstr "Changement de serveur de jeu"
msgid "Error"
msgstr "Erreur"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Changement de mot de passe"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Changer d'e-mail"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Désinscription réussie"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "A bientôt, revenez quand vous voudrez..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Site de mise à jour invalide : %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
"Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Commande inconnue."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "Vous ne pouvez pas envoyer de messages vides."
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -161,161 +161,161 @@ msgstr ""
"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
"\". Soit elle existe déjà, soit il s'agit de vous même."
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "Demande de rejoindre le canal %s."
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Le nom du groupe est manquant."
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Le nom de la guilde est manquant."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Veuillez indiquer un nom."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "Le message ferme la conversation."
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr ""
"La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Le message ferme maintenant la conversation."
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "ami"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "écarté"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "neutre"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "Joueur déjà %s !"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "Joueur %s avec succès!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "Le joueur n'a pas pu %s !"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "Le joueur n'était pas ignoré !"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "Le joueur n'est plus ignoré !"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr "sous liste noir"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr "ennemi"
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "Joueur déjà effacé !"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "Joueur éliminé avec succès !"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "le joueur n'a pas pu être effacé !"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr "Heure de lancement du client : %s"
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semaine"
msgstr[1] "%d semaines"
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d jour"
msgstr[1] "%d jours"
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d heure"
msgstr[1] "%d heures"
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minute"
msgstr[1] "%d minutes"
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d secondes"
msgstr[1] "%d secondes"
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr "Taille du cache de polices"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr "Dimension du cache :"
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "Créé : "
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "Effacé :"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr "Images des ressources :"
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr "Images des ressources non affectées :"
@@ -747,12 +747,12 @@ msgstr "???"
msgid "Chat"
msgstr "Conversation"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Présents : %s ; %d joueurs sont présents."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Message envoyé à %s : %s"
@@ -1254,8 +1254,8 @@ msgid "Need"
msgstr "Restant"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Attente du serveur"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1506,8 +1506,8 @@ msgid "Warp"
msgstr "Télétransportation"
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Charger les anciennes tenues"
+msgid "Clear outfit"
+msgstr ""
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1550,9 +1550,8 @@ msgid "Leave"
msgstr "Quitter"
#: src/gui/popupmenu.cpp:654
-#, fuzzy
msgid "Copy to clipboard"
-msgstr "Copier dans la conversation"
+msgstr ""
#: src/gui/popupmenu.cpp:849
msgid "Change guild position"
@@ -1569,12 +1568,12 @@ msgid "Name: "
msgstr "Nom : "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr "Le joueur commente "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr "Commentaire : "
@@ -2398,9 +2397,8 @@ msgid "Indonesian"
msgstr "Indonésien"
#: src/gui/setup_theme.cpp:153
-#, fuzzy
msgid "Polish"
-msgstr "Anglais"
+msgstr ""
#: src/gui/setup_theme.cpp:154
msgid "Japanese"
@@ -4426,7 +4424,11 @@ msgstr " --screenshot-dir : Répertoire à utiliser pour les imprime-écran
msgid " --safemode : Start game in safe mode"
msgstr " --safemode : Démarrer le jeu en mode sûr"
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr " --no-opengl : Désactive l'OpenGL pour cette session"
diff --git a/po/id.po b/po/id.po
index 1a8d3eb2a..e27acaa2c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
"PO-Revision-Date: 2011-11-11 21:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "l"
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Pengaturan"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Terhubung dengan server"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Masuk"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Memasuki arena permainan"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Pemilihan karakter"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "terhubung dengan server"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Pergantian server"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,63 +93,63 @@ msgstr "Pergantian server"
msgid "Error"
msgstr "Kesalahan"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Ubah sandi"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Perubahan email"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat"
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Gagal mengupdate host: %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "Gagal membuat direktori update!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Perintah tidak dikenal."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "Tidak dapat mengirimkan pesan tanpa nama"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,155 +158,155 @@ msgstr ""
"Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
"atau nama anda sendiri"
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "Meminta untuk masuk ke channel %s."
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Nama kelompok tidak dapat di temukan"
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Nama organisasi tidak ditemukan."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Tetapkan sebuah nama"
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "Kembalikan pengalihan obrolan"
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "Tutup pesan obrolan"
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "Kembalikan sekarang pengalihan obrolan"
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Pesan menutup obrolan"
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "Teman"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "Diabaikan"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "netral"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "Pemain telah %s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "Pemain telah berhasil %s!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "Pemain tidak bisa %s!"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "Pemain tidak diabaikan!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "Pemain tidak lagi diabaikan!"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "Pemain tidak dapat diabaikan"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "Pemain telah terhapus"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "Pemain telah berhasil dihapus"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "Pemain tidak dapat dihapus"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr "Ukuran jenis huruf cache"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr "Ukuran Cache:"
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "Buat"
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "Hapus"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr "Sumber gambar"
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr ""
@@ -737,12 +737,12 @@ msgstr "???"
msgid "Chat"
msgstr "Obrolan"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Kehadiran: %s; %d pemain yang hadir."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Berbisik ke %s: %s"
@@ -1242,8 +1242,8 @@ msgid "Need"
msgstr "Butuh"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Menunggu ke server"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1494,8 +1494,9 @@ msgid "Warp"
msgstr ""
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Memuat setelan lama"
+#, fuzzy
+msgid "Clear outfit"
+msgstr "Setelan saat bepergian"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1557,12 +1558,12 @@ msgid "Name: "
msgstr "Nama:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr "Komentar pemain"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr "komentar"
@@ -4380,7 +4381,11 @@ msgstr ""
msgid " --safemode : Start game in safe mode"
msgstr ""
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr ""
@@ -5601,6 +5606,12 @@ msgstr "MP %+d"
msgid "Unknown item"
msgstr ""
+#~ msgid "Waiting for server"
+#~ msgstr "Menunggu ke server"
+
+#~ msgid "Load old outfits"
+#~ msgstr "Memuat setelan lama"
+
#~ msgid "(D)"
#~ msgstr "(D)"
diff --git a/po/ja.po b/po/ja.po
index cec1b2b3f..5fef0b3ef 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@
#
# Translators:
# Andrei Karas <akaras@inbox.ru>, 2011.
-# <HarajukuCupcakes@gmail.com>, 2011.
+# <HarajukuCupcakes@gmail.com>, 2011, 2012.
# Necromonger <Necromong@inbox.ru>, 2011.
# <Necromong@inbox.ru>, 2011.
# sn0w75 <ibenrunnin@gmail.com>, 2011.
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
-"PO-Revision-Date: 2011-12-21 19:17+0000\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"PO-Revision-Date: 2012-01-04 22:59+0000\n"
"Last-Translator: Candy <HarajukuCupcakes@gmail.com>\n"
"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
"ja/)\n"
@@ -45,47 +45,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "設定"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "ビデオ"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr "テーマ"
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "サーバーに接続しています"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "ログインしています"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "ゲームの世界に移動しています"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "キャラクターを呼び出しています"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "ゲームサーバーに接続しています"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "サーバーを変更しています"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,63 +95,63 @@ msgstr "サーバーを変更しています"
msgid "Error"
msgstr "エラー"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "登録内容を呼び出しています"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "パスワード変更"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "パスワードを変更しました"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "メール変更"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "メールを変更しました"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "登録を解除しました"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "さようなら また会いましょう"
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%sは存在しない為、作成できません"
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "無効なアップデートホスト:%s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "更新フォルダの作成エラー"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr "エラー: %s は存在しない為、作成できません"
+msgstr "エラー: %s は存在しない為、作成できません"
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "不明なコマンド"
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
-msgstr "空のメッセージを送信することはできません"
+msgstr "空のささやきを送信することはできません"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,155 +160,155 @@ msgstr ""
"%sと言うメッセージタブの作成に失敗しました そのタブは既に開いている、もしく"
"は自分宛てです"
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "%sというチャンネルへの参加を要求しています。"
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "パーティ名がありません"
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "ギルド名がありません"
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "名前を教えてください"
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "改行キーでチャット入力ができます"
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "チャットを閉じます"
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "改行キーでチャット入力ができます"
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "チャットを閉じます"
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "友達"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "無視"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "中性"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
-msgstr "プレイヤーはもう%s"
+msgstr "プレイヤーは既に%s"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "プレイヤーは%sに成功しました"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
-msgstr "プレイヤーは%sできなかった"
+msgstr "プレイヤーを%sできなかった"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "プレイヤーを無視できませんでした"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "プレイヤーを無視解除しました"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "プレイヤーを無視解除できませんでした"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr "ブラックリスト化されています"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr "敵"
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "プレイヤーは削除されています"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "プレイヤーを削除しました"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "プレイヤーを削除できませんでした"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
-msgstr "クライアントの稼働時間:%s"
+msgstr "クライアントの稼働時間: %s"
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr ""
@@ -328,7 +328,7 @@ msgstr "デバッグ"
#: src/game.cpp:506
msgid "Screenshot saved as "
-msgstr "何も盗めませんでした"
+msgstr " としてスクリーンショットを保存しました"
#: src/game.cpp:514
msgid "Saving screenshot failed!"
@@ -344,7 +344,7 @@ msgstr "ネットワークエラー"
#: src/game.cpp:1268
msgid "Ignoring incoming trade requests"
-msgstr "全てのトレードリクエストを無視しました"
+msgstr "トレードリクエストを無効にしています"
#: src/game.cpp:1278
msgid "Accepting incoming trade requests"
@@ -504,12 +504,12 @@ msgstr "新しいメールアドレスを二回入力してください:"
#: src/gui/changeemaildialog.cpp:132
#, c-format
msgid "The new email address needs to be at least %d characters long."
-msgstr "ユーザ名は少なくとも%d文字以上でなくてはいけません"
+msgstr "メールアドレスは少なくとも%d文字以上でなくてはいけません"
#: src/gui/changeemaildialog.cpp:139
#, c-format
msgid "The new email address needs to be less than %d characters long."
-msgstr "ユーザ名は%d文字より短くなくてはいけません"
+msgstr "メールアドレスは%d文字以下でなくてはいけません"
#: src/gui/changeemaildialog.cpp:146
msgid "The email address entries mismatch."
@@ -541,7 +541,7 @@ msgstr "パスワードは少なくとも%d文字以上でなくてはいけま
#: src/gui/changepassworddialog.cpp:127
#, c-format
msgid "The new password needs to be less than %d characters long."
-msgstr "パスワードは%d文字より短くなくてはいけません"
+msgstr "パスワードは%d文字以下でなくてはいけません"
#: src/gui/changepassworddialog.cpp:134
msgid "The new password entries mismatch."
@@ -549,7 +549,7 @@ msgstr "新しいパスワードが一致しません"
#: src/gui/charcreatedialog.cpp:59
msgid "Create Character"
-msgstr "プレイヤーは%sできなかった"
+msgstr "キャラクター作成"
#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
@@ -636,7 +636,7 @@ msgstr "登録解除"
#: src/gui/charselectdialog.cpp:163
msgid "Change Email"
-msgstr "メールアドレスを変える"
+msgstr "メールアドレス変更"
#: src/gui/charselectdialog.cpp:256
msgid "Incorrect password"
@@ -658,7 +658,7 @@ msgstr "削除"
#: src/gui/charselectdialog.cpp:471
msgid "Choose"
-msgstr "選ぶ"
+msgstr "選択"
#: src/gui/charselectdialog.cpp:474
#, c-format
@@ -739,12 +739,12 @@ msgstr "???"
msgid "Chat"
msgstr "チャット"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "現在: %s; %d プレイヤーがいます"
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "%sにささやき中:%s"
@@ -770,7 +770,7 @@ msgstr "無視"
#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
-msgstr "地図"
+msgstr "マップ"
#: src/gui/debugwindow.cpp:73
msgid "Target"
@@ -812,7 +812,7 @@ msgstr ""
#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
-msgstr "マップの数:"
+msgstr "マップアクターの数:"
#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
@@ -932,14 +932,14 @@ msgstr "OK"
#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
msgid "Equipment"
-msgstr "装備"
+msgstr "装着品"
#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
#: src/gui/popupmenu.cpp:1945
msgid "Unequip"
-msgstr "外す"
+msgstr "取外す"
#: src/gui/helpwindow.cpp:43
msgid "Help"
@@ -968,7 +968,7 @@ msgstr "タイプ"
#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
-msgstr "アイテム"
+msgstr "インベントリー"
#: src/gui/inventorywindow.cpp:137
msgid "Slots:"
@@ -982,14 +982,14 @@ msgstr "フィルタ:"
#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
msgid "Equip"
-msgstr "装備する"
+msgstr "装着する"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
#: src/gui/popupmenu.cpp:1951
msgid "Use"
-msgstr "使う"
+msgstr "使用"
#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
@@ -1000,7 +1000,7 @@ msgstr "落とす..."
#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
msgid "Split"
-msgstr "分割する"
+msgstr "分割"
#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:588
@@ -1015,11 +1015,11 @@ msgstr "重量:"
#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
msgid "Store"
-msgstr "保存"
+msgstr "保管"
#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
msgid "Retrieve"
-msgstr "取り出す"
+msgstr "取出す"
#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
@@ -1033,19 +1033,19 @@ msgstr "全て"
#: src/gui/itemamountwindow.cpp:261
msgid "Select amount of items to trade."
-msgstr "トレードするアイテムの量を入力してください"
+msgstr "トレードするアイテムの数量を入力してください"
#: src/gui/itemamountwindow.cpp:264
msgid "Select amount of items to drop."
-msgstr "落とすアイテムの量を入力してください"
+msgstr "落とすアイテムの数量を入力してください"
#: src/gui/itemamountwindow.cpp:267
msgid "Select amount of items to store."
-msgstr "保管するアイテムの量を選択してください"
+msgstr "保管するアイテムの数量を入力してください"
#: src/gui/itemamountwindow.cpp:270
msgid "Select amount of items to retrieve."
-msgstr "取り出すアイテムの量を選択してください"
+msgstr "取出すアイテムの数量を入力してください"
#: src/gui/itemamountwindow.cpp:273
msgid "Select amount of items to split."
@@ -1065,7 +1065,7 @@ msgstr "不明"
#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
-msgstr "、 "
+msgstr ", "
#: src/gui/itempopup.cpp:193
#, c-format
@@ -1074,7 +1074,7 @@ msgstr "重力: %s"
#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
msgid "Kill stats"
-msgstr "XP統計"
+msgstr "キル統計"
#: src/gui/killstats.cpp:67
msgid "Reset stats"
@@ -1193,15 +1193,15 @@ msgstr "ユーザー名を記憶する"
#: src/gui/logindialog.cpp:111
msgid "Update:"
-msgstr "アップデート"
+msgstr "アップデート:"
#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
msgid "Register"
-msgstr "登録する"
+msgstr "登録"
#: src/gui/logindialog.cpp:122
msgid "Change Server"
-msgstr "サーバーを変える"
+msgstr "サーバー変更"
#: src/gui/ministatuswindow.cpp:59
msgid "health bar"
@@ -1244,12 +1244,12 @@ msgid "Need"
msgstr "必要"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "サーバからの応答を待っています…"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
-msgstr "次へ"
+msgstr "次"
#: src/gui/npcdialog.cpp:54
msgid "Submit"
@@ -1266,7 +1266,7 @@ msgstr "クリア"
#: src/gui/npcdialog.cpp:223
msgid "> Next"
-msgstr "> 次の"
+msgstr "> 次へ"
#: src/gui/npcpostdialog.cpp:48
msgid "To:"
@@ -1292,7 +1292,7 @@ msgstr "鍵: %s"
#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
-msgstr "最初に外す"
+msgstr "最初に取外す"
#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
@@ -1489,15 +1489,16 @@ msgstr ""
#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
msgid "Remove"
-msgstr "取り去る"
+msgstr "削除"
#: src/gui/popupmenu.cpp:573
msgid "Warp"
msgstr "ワープ"
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr ""
+#, fuzzy
+msgid "Clear outfit"
+msgstr "服を着る"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1537,7 +1538,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
msgid "Leave"
-msgstr "でる"
+msgstr "退会"
#: src/gui/popupmenu.cpp:654
msgid "Copy to clipboard"
@@ -1550,26 +1551,26 @@ msgstr "ギルドポジションを変更"
#. TRANSLATORS: number of chars in string should be near original
#: src/gui/popupmenu.cpp:1326
msgid "Rename map sign "
-msgstr ""
+msgstr " マップサインの名前を変更"
#. TRANSLATORS: number of chars in string should be near original
#: src/gui/popupmenu.cpp:1328
msgid "Name: "
-msgstr " 名前: "
+msgstr "名前: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr ""
#: src/gui/popupmenu.cpp:1776
msgid "Add to trade"
-msgstr "に貿易を足す"
+msgstr "トレードに追加"
#: src/gui/popupmenu.cpp:1780
msgid "Add to trade 10"
@@ -1602,15 +1603,15 @@ msgstr ""
#: src/gui/popupmenu.cpp:1833
msgid "Retrieve 10"
-msgstr "10 取る"
+msgstr "10 取出す"
#: src/gui/popupmenu.cpp:1834
msgid "Retrieve half"
-msgstr "半分取る"
+msgstr "半分取出す"
#: src/gui/popupmenu.cpp:1835
msgid "Retrieve all"
-msgstr "全部取る"
+msgstr "全部取出す"
#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
msgid "Load old item shortcuts"
@@ -1622,11 +1623,11 @@ msgstr "旧ドロップショートカットを読込む"
#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
msgid "Hide"
-msgstr " 隠す"
+msgstr " 非表示"
#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
msgid "Show"
-msgstr "見せる"
+msgstr "表示"
#: src/gui/popupmenu.cpp:2050
msgid "Reset yellow bar"
@@ -1652,11 +1653,11 @@ msgstr ""
#: src/gui/quitdialog.cpp:52
msgid "Switch server"
-msgstr "サーバーの変更"
+msgstr "サーバーを変更する"
#: src/gui/quitdialog.cpp:53
msgid "Switch character"
-msgstr "キャラクターを切り替える"
+msgstr "キャラクターを変更する"
#: src/gui/register.cpp:77
msgid "Confirm:"
@@ -1664,35 +1665,35 @@ msgstr "確認:"
#: src/gui/register.cpp:108
msgid "Email:"
-msgstr "Eメール:"
+msgstr "Eメール:"
#: src/gui/register.cpp:176
#, c-format
msgid "The username needs to be at least %d characters long."
-msgstr "ユーザ名は少なくとも%d文字以上長くなくてはいけません。"
+msgstr "ユーザー名は少なくとも%d文字以上長くなくてはいけません"
#: src/gui/register.cpp:184
#, c-format
msgid "The username needs to be less than %d characters long."
-msgstr "ユーザ名は%d文字より短くなくてはいけません。"
+msgstr "ユーザー名は%d文字以下でなくてはいけません"
#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
#, c-format
msgid "The password needs to be at least %d characters long."
-msgstr "パスワードは少なくとも%d文字以上長くなくてはいけません。"
+msgstr "パスワードは少なくとも%d文字以上長くなくてはいけません"
#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
#, c-format
msgid "The password needs to be less than %d characters long."
-msgstr "パスワードは%d文字より短くなくてはいけません。"
+msgstr "パスワードは%d文字以下でなくてはいけません"
#: src/gui/register.cpp:207
msgid "Passwords do not match."
-msgstr "パスワードが一致していません。"
+msgstr "パスワードが一致しません"
#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
-msgstr "サーバを選ぶ"
+msgstr "サーバを選択してください"
#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
@@ -1704,15 +1705,15 @@ msgstr "ポート:"
#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
-msgstr ""
+msgstr "同じIPをゲームサブサーバーでも使用する"
#: src/gui/serverdialog.cpp:271
msgid "Server type:"
-msgstr "サーバー形"
+msgstr "サーバータイプ:"
#: src/gui/serverdialog.cpp:295
msgid "Load"
-msgstr "読込む"
+msgstr "読込み"
#: src/gui/serverdialog.cpp:296
msgid "Connect"
@@ -1724,7 +1725,7 @@ msgstr "カスタムサーバー"
#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
-msgstr "サーバのアドレスとポート番号を両方入力してください。"
+msgstr "サーバのアドレスとポートを入力してください"
#: src/gui/serverdialog.cpp:560
#, c-format
@@ -1819,7 +1820,7 @@ msgstr ""
#: src/gui/setup_chat.cpp:66
msgid "Allow magic and GM commands in all chat tabs"
-msgstr "全てのタブで魔法とGMコマンドをログする"
+msgstr "全てのタブで呪文とGMコマンドをログする"
#: src/gui/setup_chat.cpp:70
msgid "Limits"
@@ -1843,7 +1844,7 @@ msgstr "チャットログを有効"
#: src/gui/setup_chat.cpp:84
msgid "Show chat history"
-msgstr "チャットログを表示"
+msgstr "チャット履歴を表示"
#: src/gui/setup_chat.cpp:88
msgid "Messages"
@@ -1863,7 +1864,7 @@ msgstr "ささやきををタブで表示する"
#: src/gui/setup_chat.cpp:99
msgid "Log magic messages in debug tab"
-msgstr "デバッグタブに魔法をログする"
+msgstr "デバッグタブに呪文をログする"
#: src/gui/setup_chat.cpp:102
msgid "Show server messages in debug tab"
@@ -1907,7 +1908,7 @@ msgstr "MVPメッセージを表示する"
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
-msgstr "色例"
+msgstr "色の例"
#: src/gui/setup_colors.cpp:75
msgid "Type:"
@@ -2034,7 +2035,7 @@ msgstr "モンスターのHPバーを表示する"
#: src/gui/setup_other.cpp:60
msgid "Cycle monster targets"
-msgstr "選択したモンスターを円で囲う"
+msgstr "選択したモンスターを円で表示"
#: src/gui/setup_other.cpp:66
msgid "Show warps particles"
@@ -2110,7 +2111,7 @@ msgstr "クイックスタッツを有効にする"
#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
-msgstr "選択したプレイヤーを円で囲う"
+msgstr "選択したプレイヤーを円で表示"
#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
@@ -2162,7 +2163,7 @@ msgstr "ギルドサポートを無効にしギルドボットを有効にする
#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
-msgstr "サーバー側のアタックを有効にする"
+msgstr "サーバーサイドアタックを有効にする"
#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
@@ -2314,7 +2315,7 @@ msgstr "敵"
#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
-msgstr "交換を承認する"
+msgstr "トレードを受付ける"
#: src/gui/setup_relations.cpp:242
msgid "Allow whispers"
@@ -2394,7 +2395,7 @@ msgstr "日本語"
#: src/gui/setup_theme.cpp:155
msgid "Dutch (Belgium/Flemish)"
-msgstr "ドイツ語 (ベルギー・フランドル)"
+msgstr "ドイツ語 (ベルギー/フランドル)"
#: src/gui/setup_theme.cpp:156
msgid "Portuguese"
@@ -2542,7 +2543,7 @@ msgstr "FPSリミット:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
-msgstr ""
+msgstr "Alt FPS リミット: "
#: src/gui/setup_video.cpp:321
msgid "Overhead text"
@@ -2558,7 +2559,7 @@ msgstr "環境FX"
#: src/gui/setup_video.cpp:324
msgid "Particle detail"
-msgstr "粒子の詳細"
+msgstr "パーティクルの詳細"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
@@ -2569,12 +2570,12 @@ msgstr "なし"
#: src/gui/setup_video.cpp:484
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "ウインドウモードでも前のモードの復元もまた失敗しました!"
+msgstr "ウインドウモード、また前モードの復元にも失敗しました"
#: src/gui/setup_video.cpp:490
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "フルスクリーンモードでも前のモードの復元もまた失敗しました!"
+msgstr "フルスクリーンモード、また前モードの復元にも失敗しました"
#: src/gui/setup_video.cpp:501
msgid "Switching to Full Screen"
@@ -2582,7 +2583,7 @@ msgstr "フルスクリーンに変更"
#: src/gui/setup_video.cpp:502
msgid "Restart needed for changes to take effect."
-msgstr "設定変更のため、再起動をしてください。"
+msgstr "設定変更の為、再起動をしてください"
#: src/gui/setup_video.cpp:514
msgid "Changing to OpenGL"
@@ -2594,27 +2595,27 @@ msgstr "OpenGLの設定を変更するため、再起動をしてください。
#: src/gui/setup_video.cpp:602
msgid "Custom resolution (example: 1024x768)"
-msgstr "カスタム解像度(例:1024 × 768)"
+msgstr "カスタム解像度 (例: 1024x768)"
#: src/gui/setup_video.cpp:603
msgid "Enter new resolution: "
-msgstr ""
+msgstr "解像度を入力して下さい: "
#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
msgid "Screen Resolution Changed"
-msgstr "スクリーンの解像度が変わりました。"
+msgstr "スクリーンの解像度を変更しました"
#: src/gui/setup_video.cpp:621
msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
+msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります"
#: src/gui/setup_video.cpp:654
msgid "Particle Effect Settings Changed."
-msgstr ""
+msgstr "パーティクル効果の設定を変更しました"
#: src/gui/setup_video.cpp:655
msgid "Changes will take effect on map change."
-msgstr "変化はマップがかわったときから影響します。"
+msgstr "変更はマップが変わった時に有効になります"
#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
@@ -2622,11 +2623,11 @@ msgstr "最大 (15)"
#: src/gui/shopwindow.cpp:118
msgid "Buy items"
-msgstr "商品を買う"
+msgstr "購入"
#: src/gui/shopwindow.cpp:119
msgid "Sell items"
-msgstr "商品を売る"
+msgstr "販売"
#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
#: src/gui/tradewindow.cpp:89
@@ -2635,11 +2636,11 @@ msgstr "追加"
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
-msgstr "発表する"
+msgstr "アナウンス"
#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
-msgstr ""
+msgstr "アナウンスにリンクを表示する"
#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
msgid "Auction"
@@ -2648,12 +2649,12 @@ msgstr "オークション"
#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
-msgstr "取引要求"
+msgstr "トレードをリクエスト"
#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%sが%s %sを希望しています。承認しますか?"
#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
@@ -2661,7 +2662,7 @@ msgstr "スキル"
#: src/gui/skilldialog.cpp:288
msgid "Up"
-msgstr "上げる"
+msgstr "上"
#: src/gui/skilldialog.cpp:341
#, c-format
@@ -2686,7 +2687,7 @@ msgstr "Lvl: %d"
#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
-msgstr "Lvl:%d (%+d)"
+msgstr "Lvl: %d (%+d)"
#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
@@ -2696,30 +2697,30 @@ msgstr "ギルド"
#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "ユーザー %sを、ギルド %sに招待しました"
#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
-msgstr ""
+msgstr "ギルド %sへ退会届を出しました"
#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
-msgstr ""
+msgstr "ギルドへメンバーを招待しました"
#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "ギルド %sに誰を招待しますか?"
#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
-msgstr "ギルドを残す?"
+msgstr "ギルドから退会しますか?"
#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
-msgstr ""
+msgstr "ギルド %sから本当に退会しますか?"
#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
@@ -2728,34 +2729,34 @@ msgstr "パーティー"
#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
-msgstr ""
+msgstr "ユーザー %s をパーティに招待しました"
#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
-msgstr ""
+msgstr "パーティ %sへ退会届を出しました"
#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
-msgstr ""
+msgstr "メンバーをパーティに招待しました"
#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "パーティ %sに誰を招待しますか?"
#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
-msgstr "パーティーを残す?"
+msgstr "パーティーから退会しますか?"
#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
-msgstr ""
+msgstr "パーティ %sから本当に退会しますか?"
#: src/gui/socialwindow.cpp:625
msgid "Nav"
-msgstr "航法"
+msgstr "ナビ"
#: src/gui/socialwindow.cpp:903
msgid "Atk"
@@ -2783,7 +2784,7 @@ msgstr "パーティを作る"
#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
-msgstr "ソシアル"
+msgstr "ソーシャル"
#: src/gui/socialwindow.cpp:1140
msgid "Invite"
@@ -2792,32 +2793,32 @@ msgstr "招待"
#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "%sからのパーティ招待を承認しました"
#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "%sからのパーティ招待を拒否しました"
#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "%sからのギルド招待を承認しました"
#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "%sからのギルド招待を拒否しました"
#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
-msgstr ""
+msgstr "ギルド %sを作成しました"
#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
-msgstr ""
+msgstr "パーティ %sを作成しました"
#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
@@ -2825,51 +2826,51 @@ msgstr "ギルド名"
#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
-msgstr "サーバーを選んでください。"
+msgstr "ギルド名を選んでください"
#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
-msgstr ""
+msgstr "ギルド招待を承認したが既に入会しています"
#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
-msgstr ""
+msgstr "%sがギルド %sへ招待しています"
#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
-msgstr "ギルド招待を受け入れ"
+msgstr "ギルド招待を受け入れる"
#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
-msgstr "パーティへの招待を受け取りましたが、もう既に存在しています。"
+msgstr "パーティ招待を承認したが既に入会しています"
#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "パーティに招待されました"
#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
-msgstr ""
+msgstr "パーティ %sに招待されました"
#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
-msgstr "%sはあなたをパーティに招待しました。"
+msgstr "%sはあなたをパーティに招待しました"
#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
-msgstr "%sはあなたを%sというパーティに招待しました。"
+msgstr "%sはあなたを%sというパーティに招待しました"
#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
-msgstr "パーティ招待を受け入れます。"
+msgstr "パーティ招待を受け入れます"
#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
-msgstr "パーティーを作成することはできません。もうパーティーに入っています。"
+msgstr "パーティーを作成することはできません。もうパーティーに入っています"
#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
@@ -2881,7 +2882,7 @@ msgstr "パーティ名を選んでください"
#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
msgid "Specials"
-msgstr "スペシアール"
+msgstr "スペシャル"
#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
#: src/gui/statuswindow.cpp:337
@@ -2893,7 +2894,7 @@ msgstr "レベル: %d"
#: src/gui/statuswindow.cpp:304
#, c-format
msgid "Money: %s"
-msgstr "GP:%s"
+msgstr "GP: %s"
#: src/gui/statuswindow.cpp:151
msgid "HP:"
@@ -2919,17 +2920,17 @@ msgstr "ジョブポイント:"
#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
#, c-format
msgid "Character points: %d"
-msgstr "キャラクターポイント: %d"
+msgstr "キャラクターポイント: %d"
#: src/gui/statuswindow.cpp:269
#, c-format
msgid "Level: %d (GM %d)"
-msgstr "レベル: %d (GM %d)"
+msgstr "レベル: %d (GM %d)"
#: src/gui/statuswindow.cpp:325
#, c-format
msgid "Correction points: %d"
-msgstr "修正点: %d"
+msgstr "修正点: %d"
#: src/gui/textcommandeditor.cpp:113
msgid "No Target"
@@ -2937,7 +2938,7 @@ msgstr "ターゲットなし"
#: src/gui/textcommandeditor.cpp:114
msgid "Allow Target"
-msgstr "ターゲットを許可する"
+msgstr "ターゲットを有効にする"
#: src/gui/textcommandeditor.cpp:115
msgid "Need Target"
@@ -2949,19 +2950,19 @@ msgstr "ジェネラル魔法"
#: src/gui/textcommandeditor.cpp:121
msgid "Life Magic"
-msgstr "命魔法"
+msgstr "ライフ魔法"
#: src/gui/textcommandeditor.cpp:122
msgid "War Magic"
-msgstr "戦争魔法"
+msgstr "ウォー魔法"
#: src/gui/textcommandeditor.cpp:123
msgid "Transmute Magic"
-msgstr "変わる魔法"
+msgstr "トランスミュート魔法"
#: src/gui/textcommandeditor.cpp:124
msgid "Nature Magic"
-msgstr "自然魔法"
+msgstr "ネイチャー魔法"
#: src/gui/textcommandeditor.cpp:125
msgid "Astral Magic"
@@ -2981,11 +2982,11 @@ msgstr "他"
#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
-msgstr "シンボル:"
+msgstr "シンボル:"
#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
-msgstr "コマンド:"
+msgstr "コマンド:"
#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
@@ -2993,27 +2994,27 @@ msgstr "コメント:"
#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
-msgstr "マナ:"
+msgstr "マナ:"
#: src/gui/textcommandeditor.cpp:209
msgid "Target Type:"
-msgstr "ターゲットタイプ:"
+msgstr "ターゲットタイプ:"
#: src/gui/textcommandeditor.cpp:215
msgid "Icon:"
-msgstr "アイコン"
+msgstr "アイコン:"
#: src/gui/textcommandeditor.cpp:221
msgid "Magic level:"
-msgstr "魔法レベル:"
+msgstr "魔法レベル:"
#: src/gui/textcommandeditor.cpp:227
msgid "Magic School:"
-msgstr "魔法学園"
+msgstr "魔法学園:"
#: src/gui/textcommandeditor.cpp:233
msgid "School level:"
-msgstr "学校レベル:"
+msgstr "学校レベル:"
#: src/gui/textcommandeditor.cpp:238
msgid "Save"
@@ -3021,23 +3022,23 @@ msgstr "セーブ"
#: src/gui/tradewindow.cpp:60
msgid "Propose trade"
-msgstr "交換の提案"
+msgstr "トレードを申請する"
#: src/gui/tradewindow.cpp:61
msgid "Confirmed. Waiting..."
-msgstr "確認しました。待っています…。"
+msgstr "確認中"
#: src/gui/tradewindow.cpp:62
msgid "Agree trade"
-msgstr "交換を了承する"
+msgstr "トレードを了承する"
#: src/gui/tradewindow.cpp:63
msgid "Agreed. Waiting..."
-msgstr "了承しました。待っています…。"
+msgstr "了承しました"
#: src/gui/tradewindow.cpp:66
msgid "Trade: You"
-msgstr "交換:あなたと"
+msgstr "交換:自分"
#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
@@ -3046,7 +3047,7 @@ msgstr "%sを手に入れた"
#: src/gui/tradewindow.cpp:112
msgid "You give:"
-msgstr "あげる物:"
+msgstr "トレードするアイテム:"
#: src/gui/tradewindow.cpp:116
msgid "Change"
@@ -3054,13 +3055,13 @@ msgstr "変更"
#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
-msgstr "現金不足です。"
+msgstr "現金不足です"
#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-"アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重"
-"複して追加することは出来ません!"
+"アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
+"加することは出来ません"
#: src/gui/unregisterdialog.cpp:54
#, c-format
@@ -3081,17 +3082,17 @@ msgstr "プレイ"
#: src/gui/updaterwindow.cpp:565
msgid "##1 The update process is incomplete."
-msgstr "##1 アップデートは完了していません。"
+msgstr "##1 アップデートは完了していません"
#. TRANSLATORS: Continues "you try again later.".
#: src/gui/updaterwindow.cpp:567
msgid "##1 It is strongly recommended that"
-msgstr "##1 とても推奨されます。"
+msgstr "##1 する事を強く推奨します"
#. TRANSLATORS: Begins "It is strongly recommended that".
#: src/gui/updaterwindow.cpp:569
msgid "##1 you try again later."
-msgstr ""
+msgstr "##1 しばらくたってからもう一度試してください"
#: src/gui/updaterwindow.cpp:745
msgid "Completed"
@@ -3115,7 +3116,7 @@ msgstr "無視された名前"
#: src/gui/userpalette.cpp:120
msgid "Erased Names"
-msgstr "消去名前"
+msgstr "削除した名前"
#: src/gui/userpalette.cpp:121
msgid "Other Players' Names"
@@ -3127,11 +3128,11 @@ msgstr "自分の名前"
#: src/gui/userpalette.cpp:123
msgid "GM Names"
-msgstr "ゲームマスター名"
+msgstr "GM名"
#: src/gui/userpalette.cpp:124
msgid "NPCs"
-msgstr "NPCたち"
+msgstr "NPC"
#: src/gui/userpalette.cpp:126
msgid "Monster HP bar"
@@ -3143,7 +3144,7 @@ msgstr "モンスターのHPバー(二番目の色)"
#: src/gui/userpalette.cpp:129
msgid "Party Members"
-msgstr "パティメンバー"
+msgstr "パーティメンバー"
#: src/gui/userpalette.cpp:130
msgid "Guild Members"
@@ -3179,7 +3180,7 @@ msgstr "モンスターはプレイヤーをヒット"
#: src/gui/userpalette.cpp:140
msgid "Other Player Hits Local Player"
-msgstr ""
+msgstr "他のプレイヤーがローカルプレイヤーを攻撃しました"
#: src/gui/userpalette.cpp:141
msgid "Critical Hit"
@@ -3187,15 +3188,15 @@ msgstr "クリティカルヒット"
#: src/gui/userpalette.cpp:143
msgid "Local Player Hits Monster"
-msgstr ""
+msgstr "ローカルプレイヤーがモンスターを攻撃しました"
#: src/gui/userpalette.cpp:145
msgid "Local Player Critical Hit"
-msgstr ""
+msgstr "ローカルプレイヤー 会心の一撃"
#: src/gui/userpalette.cpp:147
msgid "Local Player Miss"
-msgstr ""
+msgstr "ローカルプレイヤー ミス"
#: src/gui/userpalette.cpp:148
msgid "Misses"
@@ -3219,7 +3220,7 @@ msgstr ""
#: src/gui/userpalette.cpp:157
msgid "Walkable Highlight"
-msgstr "歩くハイライト"
+msgstr "歩道ハイライト"
#: src/gui/userpalette.cpp:159
msgid "Local Player Attack Range"
@@ -3235,19 +3236,19 @@ msgstr "モンスター攻撃範囲"
#: src/gui/userpalette.cpp:165
msgid "Home Place"
-msgstr "ホーム場所"
+msgstr "ホーム位置"
#: src/gui/userpalette.cpp:167
msgid "Home Place Border"
-msgstr ""
+msgstr "ホームボーダー"
#: src/gui/userpalette.cpp:169
msgid "Road Point"
-msgstr "ロードのポイント"
+msgstr "ロードポイント"
#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
msgid "Who Is Online - Updating"
-msgstr ""
+msgstr "オンラインリスト - アップデート中"
#: src/gui/whoisonline.cpp:111
msgid "Update"
@@ -3255,15 +3256,15 @@ msgstr "アップデート"
#: src/gui/whoisonline.cpp:194
msgid "Who Is Online - "
-msgstr ""
+msgstr "オンラインリスト - "
#: src/gui/whoisonline.cpp:577
msgid "Who Is Online - error"
-msgstr ""
+msgstr "オンラインリスト - エラー"
#: src/gui/whoisonline.cpp:611
msgid "Who Is Online - Update"
-msgstr ""
+msgstr "オンラインリスト - アップデート"
#: src/gui/widgets/battletab.cpp:45
msgid "Battle"
@@ -3303,7 +3304,7 @@ msgstr "コマンド: /topic <メッセージ>"
#: src/gui/widgets/channeltab.cpp:72
msgid "This command sets the topic to <message>."
-msgstr "このコマンドでは、トピックを設定します。"
+msgstr "このコマンドは、トピックを設定します"
#: src/gui/widgets/channeltab.cpp:76
msgid "Command: /quit"
@@ -3311,11 +3312,11 @@ msgstr "コマンド: /quit"
#: src/gui/widgets/channeltab.cpp:77
msgid "This command leaves the current channel."
-msgstr "このコマンドでは、現在いるチャンネルを去ります。"
+msgstr "このコマンドは、現在いるチャンネルを去ります"
#: src/gui/widgets/channeltab.cpp:78
msgid "If you're the last person in the channel, it will be deleted."
-msgstr "もしそのチャンネルの最後の人ならば、そのチャンネルは削除されます。"
+msgstr "チャンネルにユーザーがいない場合は削除されます"
#: src/gui/widgets/channeltab.cpp:83
msgid "Command: /op <nick>"
@@ -3323,7 +3324,7 @@ msgstr "コマンド: /op <ニックネーム>"
#: src/gui/widgets/channeltab.cpp:84
msgid "This command makes <nick> a channel operator."
-msgstr "このコマンドでは、入力したユーザーをチャンネルのオペレータとなる"
+msgstr "このコマンドは、入力したユーザーをチャンネルのオペレータに指定する"
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
@@ -3337,7 +3338,7 @@ msgstr ""
msgid "Channel operators can kick and op other users from the channel."
msgstr ""
"チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出す"
-"ことができます。"
+"ことができます"
#: src/gui/widgets/channeltab.cpp:92
msgid "Command: /kick <nick>"
@@ -3345,19 +3346,19 @@ msgstr "コマンド: /kick <ニックネーム>"
#: src/gui/widgets/channeltab.cpp:93
msgid "This command makes <nick> leave the channel."
-msgstr "このコマンドでは、ユーザをチャンネルから追い出すことができます。"
+msgstr "このコマンドでは、ユーザをチャンネルから追い出すことができます"
#: src/gui/widgets/channeltab.cpp:118
msgid "Need a user to op!"
-msgstr "オペレーターになる人が必要です!"
+msgstr "オペレーターになる人が必要です"
#: src/gui/widgets/channeltab.cpp:125
msgid "Need a user to kick!"
-msgstr "追い出すことができるメンバーが必要です!"
+msgstr "追い出すメンバーが必要です"
#: src/gui/widgets/chattab.cpp:151
msgid "Global announcement:"
-msgstr "アナウンス:"
+msgstr "グローバルアナウンス:"
#: src/gui/widgets/chattab.cpp:157
#, c-format
@@ -3376,7 +3377,7 @@ msgstr "コマンド: /invite <プレイヤー名>"
#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
msgid "This command invites <nick> to the guild you're in."
-msgstr "このコマンドでは、入力したプレイヤーを自分のギルドに招待します。"
+msgstr "このコマンドは、入力したプレイヤーを自分のギルドに招待します"
#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
#: src/net/ea/gui/partytab.cpp:90
@@ -3390,7 +3391,7 @@ msgstr ""
#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
#: src/net/ea/gui/partytab.cpp:69
msgid "/help > Display this help."
-msgstr "/helpでこのヘルプを表示する。"
+msgstr "/help > ヘルプメニューを表示"
#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
msgid "/invite > Invite a player to your guild"
@@ -3414,11 +3415,11 @@ msgstr "/ignore > 他のプレイヤーを無視する"
#: src/gui/widgets/whispertab.cpp:108
msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore はプレイヤー無視を解除をします"
#: src/gui/widgets/whispertab.cpp:109
msgid "/close > Close the whisper tab"
-msgstr "/closeでプライベートメッセージのタブを閉じます。"
+msgstr "/closeでささやきタブを閉じます"
#: src/gui/widgets/whispertab.cpp:119
msgid "Command: /close"
@@ -3426,28 +3427,27 @@ msgstr "コマンド: /close"
#: src/gui/widgets/whispertab.cpp:120
msgid "This command closes the current whisper tab."
-msgstr ""
-"このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
+msgstr "このコマンドでは、現在開いているプライベートメッセージのタブを閉じます"
#: src/gui/widgets/whispertab.cpp:124
msgid "Command: /ignore"
-msgstr "コマンド: /ignore"
+msgstr "コマンド: /ignore"
#: src/gui/widgets/whispertab.cpp:125
msgid "This command ignores the other player regardless of current relations."
-msgstr ""
+msgstr "このコマンドは全てのプレイヤーを無視します"
#: src/gui/widgets/whispertab.cpp:130
msgid "Command: /unignore <player>"
-msgstr "コマンド: /unignore <プレイヤー>"
+msgstr "コマンド: /unignore <プレイヤー>"
#: src/gui/widgets/whispertab.cpp:131
msgid "This command stops ignoring the other player if they are being ignored."
-msgstr ""
+msgstr "このコマンドはプレイヤー無視を解除します"
#: src/gui/windowmenu.cpp:65
msgid "BC"
-msgstr "ボット"
+msgstr "BC"
#: src/gui/windowmenu.cpp:65
msgid "Bot checker"
@@ -3455,15 +3455,15 @@ msgstr "ボットチェッカー"
#: src/gui/windowmenu.cpp:67
msgid "ONL"
-msgstr ""
+msgstr "ONL"
#: src/gui/windowmenu.cpp:67
msgid "Who is online"
-msgstr "誰がオンライン"
+msgstr "オンラインリスト"
#: src/gui/windowmenu.cpp:69
msgid "KS"
-msgstr ""
+msgstr "KS"
#: src/gui/windowmenu.cpp:71
msgid "Smilies"
@@ -3471,35 +3471,35 @@ msgstr ""
#: src/gui/windowmenu.cpp:73
msgid "STA"
-msgstr ""
+msgstr "STA"
#: src/gui/windowmenu.cpp:73
msgid "Status"
-msgstr "状態"
+msgstr "ステータス"
#: src/gui/windowmenu.cpp:74
msgid "EQU"
-msgstr ""
+msgstr "EQU"
#: src/gui/windowmenu.cpp:76
msgid "INV"
-msgstr ""
+msgstr "INV"
#: src/gui/windowmenu.cpp:81
msgid "SKI"
-msgstr ""
+msgstr "SKI"
#: src/gui/windowmenu.cpp:88
msgid "SPE"
-msgstr ""
+msgstr "SPE"
#: src/gui/windowmenu.cpp:93
msgid "SOC"
-msgstr ""
+msgstr "SOC"
#: src/gui/windowmenu.cpp:94
msgid "SH"
-msgstr ""
+msgstr "SH"
#: src/gui/windowmenu.cpp:94
msgid "Shortcuts"
@@ -3507,11 +3507,11 @@ msgstr "ショートカット"
#: src/gui/windowmenu.cpp:96
msgid "SP"
-msgstr ""
+msgstr "SP"
#: src/gui/windowmenu.cpp:97
msgid "DR"
-msgstr ""
+msgstr "DR"
#: src/gui/windowmenu.cpp:98
msgid "YK"
@@ -3523,7 +3523,7 @@ msgstr ""
#: src/gui/windowmenu.cpp:100
msgid "SET"
-msgstr ""
+msgstr "SET"
#: src/gui/worldselectdialog.cpp:77
msgid "Select World"
@@ -3535,15 +3535,15 @@ msgstr "ログインの変更"
#: src/gui/worldselectdialog.cpp:83
msgid "Choose World"
-msgstr "世界を選ぶ"
+msgstr "世界の選択"
#: src/inventory.cpp:251
msgid "Storage"
-msgstr "保存"
+msgstr "倉庫"
#: src/inventory.cpp:253
msgid "Cart"
-msgstr "荷馬車"
+msgstr "カート"
#: src/keyboardconfig.cpp:43
msgid "Basic Keys"
@@ -3551,43 +3551,43 @@ msgstr "標準キー"
#: src/keyboardconfig.cpp:44
msgid "Move Up"
-msgstr "上移動"
+msgstr "上へ移動"
#: src/keyboardconfig.cpp:45
msgid "Move Down"
-msgstr "下移動"
+msgstr "下へ移動"
#: src/keyboardconfig.cpp:46
msgid "Move Left"
-msgstr "左移動"
+msgstr "左へ移動"
#: src/keyboardconfig.cpp:47
msgid "Move Right"
-msgstr "右移動"
+msgstr "右へ移動"
#: src/keyboardconfig.cpp:50
msgid "Target & Attack"
-msgstr "ターゲットと攻撃"
+msgstr "ターゲット&攻撃"
#: src/keyboardconfig.cpp:52
msgid "Move to Target"
-msgstr "ターゲットに動く"
+msgstr "ターゲットまで移動"
#: src/keyboardconfig.cpp:54
msgid "Change Move to Target type"
-msgstr ""
+msgstr "ターゲットへ接近方法変更"
#: src/keyboardconfig.cpp:56
msgid "Move to Home location"
-msgstr "ホーム場所に動く"
+msgstr "ホーム位置まで移動"
#: src/keyboardconfig.cpp:58
msgid "Set home location"
-msgstr ""
+msgstr "ホーム位置変更"
#: src/keyboardconfig.cpp:60
msgid "Move to navigation point"
-msgstr ""
+msgstr "ナビゲーションポイントへ移動"
#: src/keyboardconfig.cpp:63
msgid "Stop Attack"
@@ -3607,7 +3607,7 @@ msgstr "NPCを狙う"
#: src/keyboardconfig.cpp:69
msgid "Target Player"
-msgstr "プレイヤーを狙う"
+msgstr "プレイヤーをターゲット"
#: src/keyboardconfig.cpp:71
msgid "Pickup"
@@ -3615,7 +3615,7 @@ msgstr "拾う"
#: src/keyboardconfig.cpp:72
msgid "Change Pickup Type"
-msgstr ""
+msgstr "拾い方を変更"
#: src/keyboardconfig.cpp:74
msgid "Hide Windows"
@@ -3631,11 +3631,11 @@ msgstr "スクリーンショット"
#: src/keyboardconfig.cpp:78
msgid "Enable/Disable Trading"
-msgstr "取引を可能/不可能にする"
+msgstr "取引を有効/無効にする"
#: src/keyboardconfig.cpp:80
msgid "Change Map View Mode"
-msgstr ""
+msgstr "マップビューモード変更"
#: src/keyboardconfig.cpp:82
msgid "Select OK"
@@ -3647,7 +3647,7 @@ msgstr "ショートカットキー"
#: src/keyboardconfig.cpp:86
msgid "Item Shortcuts Key"
-msgstr ""
+msgstr "アイテムショートカットキー"
#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
@@ -3674,15 +3674,15 @@ msgstr "ヘルプウィンドウ"
#: src/keyboardconfig.cpp:131
msgid "Status Window"
-msgstr "ステータス・ウィンドウ"
+msgstr "ステータスウィンドウ"
#: src/keyboardconfig.cpp:133
msgid "Inventory Window"
-msgstr "在庫ウィンドウ"
+msgstr "インベントリーウィンドウ"
#: src/keyboardconfig.cpp:135
msgid "Equipment Window"
-msgstr "装備ウィンドウ"
+msgstr "装着ウィンドウ"
#: src/keyboardconfig.cpp:137
msgid "Skill Window"
@@ -3690,7 +3690,7 @@ msgstr "スキルウィンドウ"
#: src/keyboardconfig.cpp:139
msgid "Minimap Window"
-msgstr "小さなマップウィンドウ"
+msgstr "ミニマップウィンドウ"
#: src/keyboardconfig.cpp:141
msgid "Chat Window"
@@ -3710,15 +3710,15 @@ msgstr "デバグウィンドウ"
#: src/keyboardconfig.cpp:149
msgid "Social Window"
-msgstr "ソシアルウインドウ"
+msgstr "ソーシャルウインドウ"
#: src/keyboardconfig.cpp:151
msgid "Emote Shortcut Window"
-msgstr "表情ショートカットウィンドウ"
+msgstr "スマイリーショートカットウィンドウ"
#: src/keyboardconfig.cpp:153
msgid "Outfits Window"
-msgstr "服ウインドウ"
+msgstr "服装ウインドウ"
#: src/keyboardconfig.cpp:155
msgid "Shop Window"
@@ -3738,11 +3738,11 @@ msgstr "コマンドウインドウ"
#: src/keyboardconfig.cpp:163
msgid "Bot Checker Window"
-msgstr ""
+msgstr "ボットチェッカーウィンドウ"
#: src/keyboardconfig.cpp:166
msgid "Who Is Online Window"
-msgstr "オンライン・ウザー・ウインドウ"
+msgstr "オンラインユーザーウインドウ"
#: src/keyboardconfig.cpp:168
msgid "Did you know Window"
@@ -3750,11 +3750,11 @@ msgstr ""
#: src/keyboardconfig.cpp:171
msgid "Previous Social Tab"
-msgstr ""
+msgstr "前ソーシャルタブ"
#: src/keyboardconfig.cpp:173
msgid "Next Social Tab"
-msgstr ""
+msgstr "次ソーシャルタブ"
#: src/keyboardconfig.cpp:175
msgid "Emotes Keys"
@@ -3817,11 +3817,11 @@ msgstr "トグルチャット"
#: src/keyboardconfig.cpp:280
msgid "Scroll Chat Up"
-msgstr "チャットを上にスクロールする"
+msgstr "チャットを上へスクロールする"
#: src/keyboardconfig.cpp:282
msgid "Scroll Chat Down"
-msgstr "チャットを下にスクロールする"
+msgstr "チャットを下へスクロールする"
#: src/keyboardconfig.cpp:284
msgid "Previous Chat Tab"
@@ -3845,11 +3845,11 @@ msgstr ""
#: src/keyboardconfig.cpp:295
msgid "Chat Auto Complete"
-msgstr ""
+msgstr "チャットオートコンプリート"
#: src/keyboardconfig.cpp:297
msgid "Deactivate Chat Input"
-msgstr ""
+msgstr "チャット入力無効"
#: src/keyboardconfig.cpp:299
msgid "Other Keys"
@@ -3865,47 +3865,47 @@ msgstr "インプット2無視"
#: src/keyboardconfig.cpp:304
msgid "Direct Up"
-msgstr "方向上"
+msgstr "上方向"
#: src/keyboardconfig.cpp:305
msgid "Direct Down"
-msgstr "方向下"
+msgstr "下方向"
#: src/keyboardconfig.cpp:307
msgid "Direct Left"
-msgstr "方向 左"
+msgstr "左方向"
#: src/keyboardconfig.cpp:308
msgid "Direct Right"
-msgstr "方向右"
+msgstr "右方向"
#: src/keyboardconfig.cpp:310
msgid "Crazy moves"
-msgstr "クレイジーに移動"
+msgstr "クレイジームーブ"
#: src/keyboardconfig.cpp:312
msgid "Change Crazy Move mode"
-msgstr ""
+msgstr "クレイジームーブモード変更"
#: src/keyboardconfig.cpp:314
msgid "Quick Drop N Items from 0 slot"
-msgstr ""
+msgstr "Nアイテムを 0スロットからクイックドロップ"
#: src/keyboardconfig.cpp:316
msgid "Quick Drop N Items"
-msgstr ""
+msgstr "Nアイテムをクイックドロップ"
#: src/keyboardconfig.cpp:318
msgid "Switch Quick Drop Counter"
-msgstr ""
+msgstr "クイックドロップカウンター変更"
#: src/keyboardconfig.cpp:320
msgid "Quick heal target or self"
-msgstr ""
+msgstr "ターゲット又は自分をHP回復させる"
#: src/keyboardconfig.cpp:322
msgid "Use #itenplz spell"
-msgstr "#itenplz は呪文を使う"
+msgstr "呪文 #itenplz を唱える"
#: src/keyboardconfig.cpp:324
msgid "Use magic attack"
@@ -3913,7 +3913,7 @@ msgstr "魔法攻撃を使用"
#: src/keyboardconfig.cpp:326
msgid "Switch magic attack"
-msgstr ""
+msgstr "マジックアタック変更"
#: src/keyboardconfig.cpp:329
msgid "Switch pvp attack"
@@ -3921,23 +3921,23 @@ msgstr "PvP攻撃変更"
#: src/keyboardconfig.cpp:330
msgid "Change move type"
-msgstr ""
+msgstr "ムーブタイプ変更"
#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
-msgstr ""
+msgstr "武器変更"
#: src/keyboardconfig.cpp:334
msgid "Change Attack Type"
-msgstr ""
+msgstr "攻撃方法変更"
#: src/keyboardconfig.cpp:336
msgid "Change Follow mode"
-msgstr ""
+msgstr "フォローモード変更"
#: src/keyboardconfig.cpp:338
msgid "Change Imitation mode"
-msgstr ""
+msgstr "真似モード変更"
#: src/keyboardconfig.cpp:341
msgid "Disable / Enable Game modifier keys"
@@ -3945,19 +3945,19 @@ msgstr ""
#: src/keyboardconfig.cpp:342
msgid "On / Off audio"
-msgstr "アウディオ オン/オフ"
+msgstr "オーディオ オン/オフ"
#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
-msgstr ""
+msgstr "AFKモードを有効 / 無効にする"
#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
-msgstr ""
+msgstr "右クリックをエミュレートする"
#: src/keyboardconfig.cpp:348
msgid "Toggle camera mode"
-msgstr ""
+msgstr "カメラモード変更"
#: src/keyboardconfig.cpp:350
msgid "Modifier key"
@@ -3969,10 +3969,12 @@ msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
+"\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
+"ん。"
#: src/localplayer.cpp:384
msgid "You were killed by "
-msgstr ""
+msgstr " によって殺されました"
#: src/localplayer.cpp:1438
msgid "Tried to pick up nonexistent item."
@@ -4008,7 +4010,7 @@ msgstr ""
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
+msgstr[0] "%d [@@%d|%s@@]を拾いました"
#: src/localplayer.cpp:1893
msgid "(D) default moves"
@@ -4105,7 +4107,7 @@ msgstr ""
#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
msgid "(?) attack"
-msgstr "(?) 襲う"
+msgstr "(?) 攻撃"
#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
msgid "(D) default attack"
@@ -4161,7 +4163,7 @@ msgstr ""
#: src/localplayer.cpp:2060
msgid "(?) pick up"
-msgstr "(?) 拾い上げる"
+msgstr "(?) 拾う"
#: src/localplayer.cpp:2073
msgid "(N) normal map view"
@@ -4241,11 +4243,11 @@ msgstr ""
#: src/localplayer.cpp:2146
msgid "(?) imitation"
-msgstr "(?) "
+msgstr "(?) 真似をする"
#: src/localplayer.cpp:2174
msgid "Away"
-msgstr "去って"
+msgstr "アウェイ"
#: src/localplayer.cpp:2193
msgid "(O) on keyboard"
@@ -4253,11 +4255,11 @@ msgstr ""
#: src/localplayer.cpp:2194
msgid "(A) away"
-msgstr "(A) "
+msgstr "(A) アウェイ"
#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
msgid "(?) away"
-msgstr "(?) 不在で"
+msgstr "(?) アウェイ"
#: src/localplayer.cpp:2208
msgid "(G) game camera mode"
@@ -4281,7 +4283,7 @@ msgstr ""
#: src/localplayer.cpp:3752
msgid "Follow: "
-msgstr "従う: "
+msgstr "フォロー: "
#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
msgid "Follow canceled"
@@ -4289,7 +4291,7 @@ msgstr ""
#: src/localplayer.cpp:3761
msgid "Imitation: "
-msgstr "擬い: "
+msgstr "真似: "
#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
msgid "Imitation canceled"
@@ -4297,7 +4299,7 @@ msgstr ""
#: src/localplayer.cpp:4119
msgid "You see "
-msgstr "あなた"
+msgstr " が見える"
#: src/main.cpp:47
msgid "manaplus [options] [manaplus-file]"
@@ -4321,111 +4323,117 @@ msgstr "オプション:"
#: src/main.cpp:54
msgid " -l --log-file : Log file to use"
-msgstr ""
+msgstr " -l --log-file : 使用するログファイル"
#: src/main.cpp:55
msgid " -L --chat-log-dir : Chat log dir to use"
-msgstr ""
+msgstr " -L --chat-log-dir : チャットログ場所"
#: src/main.cpp:56
msgid " -v --version : Display the version"
-msgstr ""
+msgstr " -v --version : バージョンを表示"
#: src/main.cpp:57
msgid " -h --help : Display this help"
-msgstr ""
+msgstr " -h --help : ヘルプメニュー表示"
#: src/main.cpp:58
msgid " -C --config-dir : Configuration directory to use"
-msgstr ""
+msgstr " -C --config-dir : 使用する設定ファイル"
#: src/main.cpp:59
msgid " -U --username : Login with this username"
-msgstr ""
+msgstr " -U --username : この名前でログインする"
#: src/main.cpp:60
msgid " -P --password : Login with this password"
-msgstr ""
+msgstr " -P --password : このパスワードでログインする"
#: src/main.cpp:61
msgid " -c --character : Login with this character"
-msgstr ""
+msgstr " -c --character : このキャラクターでログインする"
#: src/main.cpp:62
msgid " -s --server : Login server name or IP"
-msgstr ""
+msgstr " -s --server : ログインするサーバー又はIP"
#: src/main.cpp:63
msgid " -p --port : Login server port"
-msgstr ""
+msgstr " -p --port : ログインするサーバーポート"
#: src/main.cpp:64
msgid " --update-host : Use this update host"
-msgstr ""
+msgstr " --update-host : このアップデートホストを利用する"
#: src/main.cpp:65
msgid " -D --default : Choose default character server and character"
msgstr ""
+" -D --default : デフォルトで使用するキャラクターサーバーとキャラク"
+"ターを選択する"
#: src/main.cpp:67
msgid " -u --skip-update : Skip the update downloads"
-msgstr ""
+msgstr " -u --skip-update : アップデートをスキップする"
#: src/main.cpp:68
msgid " -d --data : Directory to load game data from"
-msgstr ""
+msgstr " -d --data : ゲームデータを読み込む場所"
#: src/main.cpp:70
msgid " -L --localdata-dir : Directory to use as local data directory"
-msgstr ""
+msgstr " -L --localdata-dir : ローカルデータディレクトリの場所"
#: src/main.cpp:72
msgid " --screenshot-dir : Directory to store screenshots"
-msgstr ""
+msgstr " --screenshot-dir : スクリーンショットの保存場所"
#: src/main.cpp:73
msgid " --safemode : Start game in safe mode"
+msgstr " --safemode : セーフモードでゲームを始める"
+
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
msgstr ""
-#: src/main.cpp:75
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
-msgstr ""
+msgstr " --openglエラー : OpenGLを今回のみ無効にする"
#: src/net/ea/buysellhandler.cpp:163
msgid "Nothing to sell."
-msgstr "売り物がございません。"
+msgstr "売るアイテムがありません"
#: src/net/ea/buysellhandler.cpp:171
msgid "Thanks for buying."
-msgstr "買ってくださり、ありがとうございました。"
+msgstr "ご購入ありがとうございました"
#: src/net/ea/buysellhandler.cpp:179
msgid "Unable to buy."
-msgstr "購買不可能"
+msgstr "購買できません"
#: src/net/ea/charserverhandler.cpp:66
msgid "Strength:"
-msgstr "筋力:"
+msgstr "Strength:"
#: src/net/ea/charserverhandler.cpp:67
msgid "Agility:"
-msgstr "素早さ:"
+msgstr "Agility:"
#: src/net/ea/charserverhandler.cpp:68
msgid "Vitality:"
-msgstr "体力:"
+msgstr "Vitality:"
#: src/net/ea/charserverhandler.cpp:69
msgid "Intelligence:"
-msgstr "知性:"
+msgstr "Intelligence:"
#: src/net/ea/charserverhandler.cpp:70
msgid "Dexterity:"
-msgstr "敏捷:"
+msgstr "Dexterity:"
#: src/net/ea/charserverhandler.cpp:71
msgid "Luck:"
-msgstr "運:"
+msgstr "Luck:"
#: src/net/ea/charserverhandler.cpp:115
msgid "Access denied. Most likely, there are too many players on this server."
@@ -4433,7 +4441,7 @@ msgstr ""
#: src/net/ea/charserverhandler.cpp:119
msgid "Cannot use this ID."
-msgstr "ID使用不可能。"
+msgstr "このIDは使用できません"
#: src/net/ea/charserverhandler.cpp:122
msgid "Unknown char-server failure."
@@ -4441,23 +4449,23 @@ msgstr ""
#: src/net/ea/charserverhandler.cpp:151
msgid "Failed to create character. Most likely the name is already taken."
-msgstr "キャラクター作成失敗。本名はのう使われている。"
+msgstr "キャラクター作成に失敗しました。この名前は既に使われています"
#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:240
msgid "Wrong name."
-msgstr "名前間違い"
+msgstr "名前が違います"
#: src/net/ea/charserverhandler.cpp:158
msgid "Incorrect stats."
-msgstr "不適切な統計。"
+msgstr "間違った統計"
#: src/net/ea/charserverhandler.cpp:161
msgid "Incorrect hair."
-msgstr "不適切な髪。"
+msgstr "間違った髪型"
#: src/net/ea/charserverhandler.cpp:164
msgid "Incorrect slot."
-msgstr "不適切なスロット。"
+msgstr "間違ったスロット"
#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
msgid "Info"
@@ -4465,18 +4473,18 @@ msgstr "情報"
#: src/net/ea/charserverhandler.cpp:179
msgid "Character deleted."
-msgstr "キャラクターを削除した。"
+msgstr "キャラクターを削除しました"
#: src/net/ea/charserverhandler.cpp:185
msgid "Failed to delete character."
-msgstr "キャラ削除失敗"
+msgstr "キャラクター削除に失敗しました"
#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
-msgstr "チャンネルはサポートされていない。"
+msgstr "チャンネルはサポートされていません"
#: src/net/ea/chathandler.cpp:129
#, c-format
@@ -4490,11 +4498,11 @@ msgstr ""
#: src/net/ea/chathandler.cpp:346
msgid "MVP player."
-msgstr "プレイヤー MVP"
+msgstr "MVPプレイヤー"
#: src/net/ea/chathandler.cpp:350
msgid "MVP player: "
-msgstr "プレイヤー MVP "
+msgstr "MVPプレイヤー: "
#: src/net/ea/chathandler.cpp:370
msgid "All whispers ignored."
@@ -4515,7 +4523,7 @@ msgstr "全てのささやきの無視解除に失敗しました"
#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
-msgstr "オンラインユーザー:%d"
+msgstr "オンラインユーザー: %d"
#: src/net/ea/gamehandler.cpp:99
msgid "Game"
@@ -4539,42 +4547,42 @@ msgstr ""
#: src/net/ea/guildhandler.cpp:103
msgid "Unknown server response."
-msgstr "不明なサーバーの応答。"
+msgstr "不明なサーバーの応答"
#: src/net/ea/guildhandler.cpp:180
#, c-format
msgid "Guild name: %s"
-msgstr "ギルド名:%s"
+msgstr "ギルド名: %s"
#: src/net/ea/guildhandler.cpp:182
#, c-format
msgid "Guild master: %s"
-msgstr "ギルドマスタ: %s"
+msgstr "ギルドマスター: %s"
#: src/net/ea/guildhandler.cpp:184
#, c-format
msgid "Guild level: %d"
-msgstr "ギルドレベル:%d"
+msgstr "ギルドレベル: %d"
#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Online members: %d"
-msgstr "オンラインウザー: %d"
+msgstr "オンラインユーザー: %d"
#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Max members: %d"
-msgstr "最大のメンバー: %d"
+msgstr "最大メンバー数: %d"
#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Average level: %d"
-msgstr "平均レベル: %d"
+msgstr "平均レベル: %d"
#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Guild exp: %d"
-msgstr "ギルド経験:%d"
+msgstr "ギルドExp: %d"
#: src/net/ea/guildhandler.cpp:192
#, c-format
@@ -4584,7 +4592,7 @@ msgstr ""
#: src/net/ea/guildhandler.cpp:194
#, c-format
msgid "Guild castle: %s"
-msgstr "ギルド城:%s"
+msgstr "ギルド城: %s"
#: src/net/ea/guildhandler.cpp:412
msgid "Could not inivte user to guild."
@@ -4622,47 +4630,47 @@ msgstr ""
#: src/net/ea/gui/partytab.cpp:70
msgid "/invite > Invite a player to your party"
-msgstr "/inviteでパーティにプレーヤーを招待する。"
+msgstr "/invite パーティにプレイヤーを招待する"
#: src/net/ea/gui/partytab.cpp:71
msgid "/leave > Leave the party you are in"
-msgstr "/leaveで既存のパーティから離れる。"
+msgstr "/leave パーティから退会する"
#: src/net/ea/gui/partytab.cpp:72
msgid "/kick > Kick some one from the party you are in"
-msgstr "/kickで既存のパーティから一人を追い出してみる。"
+msgstr "/kick パーティからメンバーを追出す"
#: src/net/ea/gui/partytab.cpp:73
msgid "/item > Show/change party item sharing options"
-msgstr "/item でパーティ内のアイテムシェアモードを表示および変更する。"
+msgstr "/item パーティ内でアイテム共有モードを表示/変更する"
#: src/net/ea/gui/partytab.cpp:74
msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp でパーティ内の経験分割モードを表示および変更する。"
+msgstr "/exp でパーティ内の経験シェアモードを表示/変更する"
#: src/net/ea/gui/partytab.cpp:84
msgid "This command invites <nick> to party with you."
-msgstr "このコマンドでは、入力したプレイヤーを自分のパーティーに招待します。"
+msgstr "このコマンドは、入力したプレイヤーを自分のパーティーに招待します"
#: src/net/ea/gui/partytab.cpp:91
msgid "This command causes the player to leave the party."
-msgstr "本コマンドではパティからプレイヤーを追い出させる。"
+msgstr "このコマンドはパーティからプレイヤーを追出します"
#: src/net/ea/gui/partytab.cpp:95
msgid "Command: /item <policy>"
-msgstr "コマンド: /item <ポリシ>"
+msgstr "コマンド: /item <ポリシー>"
#: src/net/ea/gui/partytab.cpp:97
msgid "This command changes the party's item sharing policy."
-msgstr "本コマンドでは、アイテム共有モードを変更する。"
+msgstr "このコマンドは、アイテム共有モードを変更する"
#: src/net/ea/gui/partytab.cpp:98
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-"<ポリシ>を有効するためには「1」、「yes」か「true」を設定ください。無効にす"
-"るために、「0」、「no」か「false」を設定ください。"
+"<ポリシー> アイテム共有モードを有効するためには \"1\", \"yes\", \"true\"、"
+"無効にするには\"0\", \"no\", \"false\"と入力して下さい"
#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /item"
@@ -4670,23 +4678,23 @@ msgstr "コマンド: /item"
#: src/net/ea/gui/partytab.cpp:102
msgid "This command displays the party's current item sharing policy."
-msgstr "本コマンドでは、アイテム共有モードを表示する。"
+msgstr "このコマンドは、アイテム共有モードを表示します"
#: src/net/ea/gui/partytab.cpp:107
msgid "Command: /exp <policy>"
-msgstr "コマンド: /exp <ポリシ>"
+msgstr "コマンド: /exp <ポリシー>"
#: src/net/ea/gui/partytab.cpp:108
msgid "This command changes the party's experience sharing policy."
-msgstr "本コマンドでは、経験分割モードを変更する。"
+msgstr "このコマンドは、経験シェアモードを変更します"
#: src/net/ea/gui/partytab.cpp:110
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にす"
-"る場合、「0」、「no」か「false」を設定ください。"
+"<ポリシー> 経験シェアモードを有効するためには \"1\", \"yes\", \"true\"、無"
+"効にするには\"0\", \"no\", \"false\"と入力して下さい"
#: src/net/ea/gui/partytab.cpp:113
msgid "Command: /exp"
@@ -4694,51 +4702,51 @@ msgstr "コマンド: /exp"
#: src/net/ea/gui/partytab.cpp:114
msgid "This command displays the party's current experience sharing policy."
-msgstr "本コマンドでは、パーティメンバー以内の経験分割方針を表示する。"
+msgstr "このコマンドは、パーティメンバーの経験シェアモードを表示します"
#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
msgid "Item sharing enabled."
-msgstr "アイテムシェア有効"
+msgstr "アイテム共有モード有効"
#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
msgid "Item sharing disabled."
-msgstr "アイテムシェア無効"
+msgstr "アイテム共有モード無効"
#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
msgid "Item sharing not possible."
-msgstr "アイテムシェア不可能"
+msgstr "アイテム共有モード不可能"
#: src/net/ea/gui/partytab.cpp:157
msgid "Item sharing unknown."
-msgstr "アイテムシェア不明"
+msgstr "アイテム共有モード不明"
#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
msgid "Experience sharing enabled."
-msgstr "経験シェア有効"
+msgstr "経験シェアモード有効"
#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
msgid "Experience sharing disabled."
-msgstr "経験シェア無効"
+msgstr "経験シェアモード無効"
#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
msgid "Experience sharing not possible."
-msgstr "経験シェア不可能"
+msgstr "経験シェアモード不可能"
#: src/net/ea/gui/partytab.cpp:196
msgid "Experience sharing unknown."
-msgstr "経験シェア不明"
+msgstr "経験シェアモード不明"
#: src/net/ea/inventoryhandler.cpp:404
msgid "Failed to use item."
-msgstr "アイテム使用失敗"
+msgstr "アイテム使用に失敗"
#: src/net/ea/inventoryhandler.cpp:572
msgid "Unable to equip."
-msgstr "装備不可能"
+msgstr "装着不可能"
#: src/net/ea/loginhandler.cpp:131
msgid "Account was not found. Please re-login."
-msgstr "アカウントが見つからなかった。再ログインをください。"
+msgstr "アカウントが見つかりませんでした。再度ログインして下さい"
#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
msgid "Old password incorrect."
@@ -4746,26 +4754,26 @@ msgstr ""
#: src/net/ea/loginhandler.cpp:137
msgid "New password too short."
-msgstr "新パスワードは短い過ぎます。"
+msgstr "新しいパスワードは文字数が足りません"
#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:246
#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
msgid "Unknown error."
-msgstr "不明エラー"
+msgstr "不明なエラー"
#: src/net/ea/loginhandler.cpp:208
msgid "Unregistered ID."
-msgstr "未登録なID。"
+msgstr "未登録なID"
#: src/net/ea/loginhandler.cpp:211
msgid "Wrong password."
-msgstr "入力したパスワードは間違っています。"
+msgstr "入力したパスワードは間違っています"
#: src/net/ea/loginhandler.cpp:214
msgid "Account expired."
-msgstr "アカウントの有効期限が切られた。"
+msgstr "アカウントの有効期限が切れました"
#: src/net/ea/loginhandler.cpp:217
msgid "Rejected from server."
@@ -4786,8 +4794,8 @@ msgid ""
"You have been temporarily banned from the game until %s.\n"
"Please contact the GM team via the forums."
msgstr ""
-"あなたは%sまでゲームからバーンされた。\n"
-"ゲームマスターたちにご連絡ください。"
+"あなたは%sまでゲームから追放されました。\n"
+"GMにご連絡下さい。"
#: src/net/ea/loginhandler.cpp:234
msgid "Server overpopulated."
@@ -4795,7 +4803,7 @@ msgstr ""
#: src/net/ea/loginhandler.cpp:237
msgid "This user name is already taken."
-msgstr "ユーザ名はもう使われている。"
+msgstr "ユーザ名は使用されています"
#: src/net/ea/loginhandler.cpp:243
msgid "Username permanently erased."
@@ -4855,23 +4863,23 @@ msgstr "不明なメンバーからの応答: %s"
#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
msgid "You are dead."
-msgstr "あなたは死にました。"
+msgstr "あなたは死にました"
#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
msgid "We regret to inform you that your character was killed in battle."
-msgstr "残念なお知らせですが、あなた様のキャラは戦闘中亡くなってしまいました。"
+msgstr "残念なお知らせですが、あなた様のキャラは戦闘中にお亡くなりになりました"
#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
msgid "You are not that alive anymore."
-msgstr "今から生きていない。"
+msgstr "既に死んでいる模様です"
#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "死神の冷たい手に魂が取られてしまった。"
+msgstr "死神の冷たい手に魂が取られてしまった"
#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
msgid "Game Over!"
-msgstr "ゲームオーバー!"
+msgstr "ゲームオーバー"
#: src/net/ea/playerhandler.cpp:102
msgid "Insert coin to continue."
@@ -4882,14 +4890,13 @@ msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr ""
-"ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに"
-"向かっただけ。"
+"あなたのキャラは本当は死んでないのよ。もっと素敵なところに向かっただけ。"
#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
-msgstr "喉で的の武器を潰す予定だったが…失敗した。"
+msgstr "敵の武器を潰す予定だったが…失敗した"
#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
msgid "I guess this did not run too well."
@@ -4897,24 +4904,24 @@ msgstr "あんまり上手くいかなかったぜー"
#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
msgid "Do you want your possessions identified?"
-msgstr "持ち物を確定して欲しい?"
+msgstr "遺体の持ち物を確定して欲しい?"
#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
msgid "Sadly, no trace of you was ever found..."
-msgstr "悲しさのあまり、痕跡でさえ見つからなかった。"
+msgstr "悲しいですがあなたの跡形さえも残っていません"
#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
msgid "Annihilated."
-msgstr "全滅された。"
+msgstr "全滅しちゃった"
#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
msgid "Looks like you got your head handed to you."
-msgstr "相手から自分の頭が渡されたみたい。"
+msgstr "敵から「忘れ物」って自分の頭を渡されました"
#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "もう一回倒された、水道管から死体を這ってみた後、新体を受け取ってみて"
+msgstr "またやっちゃったね。死体をドブに捨てたら新しいのもらえるかも"
#: src/net/ea/playerhandler.cpp:120
msgid "You're not dead yet. You're just resting."
@@ -4922,7 +4929,7 @@ msgstr "まだ死んでいません。一時休憩中です"
#: src/net/ea/playerhandler.cpp:121
msgid "You are no more."
-msgstr "あなたはもう存在していない"
+msgstr "あなたは無になった"
#: src/net/ea/playerhandler.cpp:122
msgid "You have ceased to be."
@@ -4938,7 +4945,7 @@ msgstr "あなたは死体になった"
#: src/net/ea/playerhandler.cpp:125
msgid "Bereft of life, you rest in peace."
-msgstr "命を失い天国に向かった。"
+msgstr "命を失い天国に向かった"
#: src/net/ea/playerhandler.cpp:126
msgid "If you weren't so animated, you'd be pushing up the daisies."
@@ -5000,7 +5007,7 @@ msgstr "スキルはこれ以上あがりません"
#: src/net/ea/playerhandler.cpp:623
msgid "Equip arrows first."
-msgstr "矢を先に装備してください"
+msgstr "矢を装着して下さい"
#: src/net/ea/specialhandler.cpp:143
msgid "Trade failed!"
@@ -5085,7 +5092,7 @@ msgstr "毒の影響はなかった"
#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
#, c-format
msgid "%s wants to trade with you, do you accept?"
-msgstr "%sはあなたと取引したいみたいが、応じる?"
+msgstr "%sはあなたにトレードを申請しています"
#: src/net/ea/tradehandler.cpp:135
msgid "Trading isn't possible. Trade partner is too far away."
@@ -5131,109 +5138,109 @@ msgstr "不明な理由でアイテム追加失敗"
#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
-msgstr "取引中止"
+msgstr "トレード中止"
#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
msgid "Trade completed."
-msgstr "取引完了"
+msgstr "トレード完了"
#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
msgid "Strength"
-msgstr "強さ"
+msgstr "Strength"
#: src/net/manaserv/attributes.cpp:167
#, c-format
msgid "Strength %+.1f"
-msgstr "強度 (str) %+.1f"
+msgstr "Strength %+.1f"
#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
msgid "Agility"
-msgstr "素早さ"
+msgstr "Agility"
#: src/net/manaserv/attributes.cpp:180
#, c-format
msgid "Agility %+.1f"
-msgstr "機敏さ (agi) %+.1f"
+msgstr "Agility %+.1f"
#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
msgid "Dexterity"
-msgstr "器用さ"
+msgstr "Dexterity"
#: src/net/manaserv/attributes.cpp:193
#, c-format
msgid "Dexterity %+.1f"
-msgstr "器用さ (dex) %+.1f"
+msgstr "Dexterity %+.1f"
#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
msgid "Vitality"
-msgstr "活力"
+msgstr "Vitality"
#: src/net/manaserv/attributes.cpp:206
#, c-format
msgid "Vitality %+.1f"
-msgstr "活気 (vit) %+.1f"
+msgstr "Vitality %+.1f"
#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
msgid "Intelligence"
-msgstr "知能"
+msgstr "Intelligence"
#: src/net/manaserv/attributes.cpp:219
#, c-format
msgid "Intelligence %+.1f"
-msgstr "知能 (int) %+.1f"
+msgstr "Intelligence %+.1f"
#: src/net/manaserv/attributes.cpp:225
msgid "Willpower"
-msgstr "気力"
+msgstr "Willpower"
#: src/net/manaserv/attributes.cpp:232
#, c-format
msgid "Willpower %+.1f"
-msgstr "意地 (wil) %+.1f"
+msgstr "Willpower %+.1f"
#: src/net/manaserv/beinghandler.cpp:337
msgid "Press OK to respawn."
-msgstr ""
+msgstr "蘇るにはOKを押して下さい"
#: src/net/manaserv/beinghandler.cpp:338
msgid "You Died"
-msgstr "死んでしまった。"
+msgstr "死んでしまった"
#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
msgid "Not logged in."
-msgstr ""
+msgstr "再度ログインして下さい"
#: src/net/manaserv/charhandler.cpp:148
msgid "No empty slot."
-msgstr ""
+msgstr "空スロットがありません"
#: src/net/manaserv/charhandler.cpp:151
msgid "Invalid name."
-msgstr "不当名前"
+msgstr "ユーザーネームが見つかりません"
#: src/net/manaserv/charhandler.cpp:154
msgid "Character's name already exists."
-msgstr "ユーザー名は既に存在している。"
+msgstr "ユーザーネームが削除されました"
#: src/net/manaserv/charhandler.cpp:157
msgid "Invalid hairstyle."
-msgstr "不当髪型"
+msgstr "髪型がダサいので失格"
#: src/net/manaserv/charhandler.cpp:160
msgid "Invalid hair color."
-msgstr ""
+msgstr "無効の髪色"
#: src/net/manaserv/charhandler.cpp:163
msgid "Invalid gender."
-msgstr "無効な性的。"
+msgstr "キャラの性別間違ってるんじゃない?"
#: src/net/manaserv/charhandler.cpp:166
msgid "Character's stats are too high."
-msgstr ""
+msgstr "キャラクターのステータスが高すぎます"
#: src/net/manaserv/charhandler.cpp:169
msgid "Character's stats are too low."
-msgstr ""
+msgstr "キャラクターのステータスが低すぎます"
#: src/net/manaserv/charhandler.cpp:172
#, c-format
@@ -5242,70 +5249,70 @@ msgstr ""
#: src/net/manaserv/charhandler.cpp:178
msgid "Invalid slot number."
-msgstr "無効場所の号"
+msgstr "スロットナンバーが無効です"
#: src/net/manaserv/charhandler.cpp:210
msgid "Player deleted."
-msgstr "プレイヤーは削除された。"
+msgstr "プレイヤーは削除されました"
#: src/net/manaserv/charhandler.cpp:222
msgid "Selection out of range."
-msgstr ""
+msgstr "ターゲットが遠すぎます"
#: src/net/manaserv/charhandler.cpp:225
#, c-format
msgid "Unknown error (%d)."
-msgstr "不明エラー (%d)。"
+msgstr "不明エラー (%d)"
#: src/net/manaserv/charhandler.cpp:261
msgid "No gameservers are available."
-msgstr "全サーバは現在フールである。"
+msgstr "利用できるゲームサーバーがありません"
#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
#: src/net/manaserv/guildhandler.cpp:265
#, c-format
msgid "Topic: %s"
-msgstr "トピック:%s"
+msgstr "トピック: %s"
#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
msgid "Players in this channel:"
-msgstr ""
+msgstr "このチャンネルにいるプレイヤー:"
#: src/net/manaserv/chathandler.cpp:208
msgid "Error joining channel."
-msgstr ""
+msgstr "チャンネルに参加できませんでした"
#: src/net/manaserv/chathandler.cpp:214
msgid "Listing channels."
-msgstr ""
+msgstr "チャンネルを表示しています"
#: src/net/manaserv/chathandler.cpp:226
msgid "End of channel list."
-msgstr ""
+msgstr "全てのチャンネルリスト"
#: src/net/manaserv/chathandler.cpp:299
#, c-format
msgid "%s entered the channel."
-msgstr ""
+msgstr "%sがチャンネルに参加しました"
#: src/net/manaserv/chathandler.cpp:304
#, c-format
msgid "%s left the channel."
-msgstr ""
+msgstr "%sがチャンネルから外出しました"
#: src/net/manaserv/chathandler.cpp:320
#, c-format
msgid "%s has set mode %s on user %s."
-msgstr ""
+msgstr "%sが%sに%sしました"
#: src/net/manaserv/chathandler.cpp:331
#, c-format
msgid "%s has kicked %s."
-msgstr "%s は%を蹴った %s"
+msgstr "%s は%を追出した %s"
#: src/net/manaserv/chathandler.cpp:337
msgid "Unknown channel event."
-msgstr ""
+msgstr "不明なチャンネルイベント"
#: src/net/manaserv/guildhandler.cpp:90
msgid "Error creating guild."
@@ -5317,7 +5324,7 @@ msgstr "招待送信成功"
#: src/net/manaserv/guildhandler.cpp:207
msgid "Member was promoted successfully."
-msgstr "本メンバーが無事に昇進された。"
+msgstr "本メンバーが無事に昇進されました"
#: src/net/manaserv/guildhandler.cpp:212
msgid "Failed to promote member."
@@ -5325,23 +5332,23 @@ msgstr "メンバー昇進失敗"
#: src/net/manaserv/loginhandler.cpp:93
msgid "Wrong magic_token."
-msgstr ""
+msgstr "間違ったマジックトークンです"
#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
msgid "Already logged in."
-msgstr "すでにログインしています。"
+msgstr "既にログインしています"
#: src/net/manaserv/loginhandler.cpp:99
msgid "Account banned."
-msgstr ""
+msgstr "アカウント停止されました"
#: src/net/manaserv/loginhandler.cpp:124
msgid "New password incorrect."
-msgstr ""
+msgstr "新しいパスワードが間違っています"
#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
msgid "Account not connected. Please login first."
-msgstr "アカウントが接続されていない。最初にログインしてください。"
+msgstr "アカウントが接続されていません。最初にログインしてください"
#: src/net/manaserv/loginhandler.cpp:156
msgid "New email address incorrect."
@@ -5370,7 +5377,7 @@ msgstr ""
#: src/net/manaserv/loginhandler.cpp:284
msgid "Account banned"
-msgstr "アカウントが禁止されて"
+msgstr "アカウントは追放されています"
#: src/net/manaserv/loginhandler.cpp:287
msgid "Login attempt too soon after previous attempt."
@@ -5378,15 +5385,15 @@ msgstr ""
#: src/net/manaserv/loginhandler.cpp:315
msgid "Wrong username, password or email address."
-msgstr "ユーザ名、パスワードかメールアドが間違ってる。"
+msgstr "ユーザ名、パスワード、またはメールアドレスが間違っています"
#: src/net/manaserv/loginhandler.cpp:318
msgid "Username already exists."
-msgstr "ユーザー名は既に存在している。"
+msgstr "既に使用されているユーザー名です"
#: src/net/manaserv/loginhandler.cpp:321
msgid "Email address already exists."
-msgstr "メールアドレスが既に存在している。"
+msgstr "既に使用されているメールアドレスです"
#: src/net/manaserv/loginhandler.cpp:324
msgid "You took too long with the captcha or your response was incorrect."
@@ -5394,30 +5401,30 @@ msgstr ""
#: src/net/manaserv/partyhandler.cpp:90
msgid "Joined party."
-msgstr "パーティに参加した。"
+msgstr "パーティに参加しました"
#: src/net/manaserv/partyhandler.cpp:108
#, c-format
msgid "%s joined the party."
-msgstr "%sがパーティに参加した。"
+msgstr "%sがパーティに参加しました"
#: src/net/manaserv/partyhandler.cpp:126
#, c-format
msgid "%s rejected your invite."
-msgstr "%sは招待を断った。"
+msgstr "%sは招待を断りました"
#: src/net/manaserv/tradehandler.cpp:107
msgid "Accepting incoming trade requests."
-msgstr "取引要求を受け取り中"
+msgstr "トレード申請を受付中"
#: src/net/manaserv/tradehandler.cpp:109
msgid "Ignoring incoming trade requests."
-msgstr "取引要求を無視にしている。"
+msgstr "トレード申請を無効中"
#: src/net/manaserv/tradehandler.cpp:146
#, c-format
msgid "Trading with %s"
-msgstr "%sと取引中"
+msgstr "%sとトレードします"
#: src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
@@ -5429,11 +5436,11 @@ msgstr "キック成功"
#: src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
-msgstr "売ってくださり、ありがとうございました。"
+msgstr "販売ありがとうございました。"
#: src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
-msgstr "売ること不可能"
+msgstr "販売できません"
#: src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
@@ -5446,36 +5453,36 @@ msgstr ""
#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
-msgstr "強さ %+d"
+msgstr "Strength %+d"
#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
-msgstr "俊敏さ%+d"
+msgstr "Agility %+d"
#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
-msgstr "活力 %+d"
+msgstr "Vitality %+d"
#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
-msgstr "知能 %+d"
+msgstr "Intelligence %+d"
#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
-msgstr "正確さ %+d"
+msgstr "Dexterity %+d"
#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
-msgstr "運 %+d"
+msgstr "Luck %+d"
#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
-msgstr "認証に失敗しました。"
+msgstr "認証に失敗しました"
#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
@@ -5495,7 +5502,7 @@ msgstr ""
#: src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
-msgstr "重複しログイン。"
+msgstr "重複ログイン"
#: src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
@@ -5503,38 +5510,38 @@ msgstr ""
#: src/net/tmwa/generalhandler.cpp:235
msgid "Got disconnected from server!"
-msgstr "サーバーから切断された。"
+msgstr "サーバーから切断されました"
#: src/net/tmwa/generalhandler.cpp:267
msgid "Luck"
-msgstr "運"
+msgstr "Luck"
#: src/net/tmwa/generalhandler.cpp:270
msgid "Defense"
-msgstr "防御"
+msgstr "Defense"
#: src/net/tmwa/generalhandler.cpp:271
msgid "M.Attack"
-msgstr "特攻撃"
+msgstr "M.Attack"
#: src/net/tmwa/generalhandler.cpp:272
msgid "M.Defense"
-msgstr "特防御"
+msgstr "M.Defense"
#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Accuracy"
-msgstr "% 精度"
+msgstr "% Accuracy"
#: src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Evade"
-msgstr "% 回避"
+msgstr "% Evade"
#: src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Critical"
-msgstr "% 危機"
+msgstr "% Critical"
#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Delay"
@@ -5558,7 +5565,7 @@ msgstr ""
#: src/net/tmwa/network.cpp:357
msgid "Unable to resolve host \""
-msgstr "ホスト名を解決できません。"
+msgstr "ホスト名を解決できません"
#: src/net/tmwa/network.cpp:427
msgid "Connection to server terminated. "
@@ -5567,7 +5574,7 @@ msgstr ""
#: src/net/tmwa/partyhandler.cpp:171
#, c-format
msgid "%s is not in your party!"
-msgstr "%sはパーティにはいない!"
+msgstr "%sはパーティのメンバーではありません"
#: src/playerrelations.cpp:461
msgid "Print '...'"
@@ -5575,15 +5582,15 @@ msgstr "'...'を表示する"
#: src/playerrelations.cpp:481
msgid "Blink name"
-msgstr "名前を瞬き"
+msgstr "名前を点灯させる"
#: src/playerrelations.cpp:525
msgid "Floating '...' bubble"
-msgstr "フローティング'...'バブル"
+msgstr "フローティング'...'吹出し"
#: src/playerrelations.cpp:528
msgid "Floating bubble"
-msgstr "フローティングバブル"
+msgstr "吹出し"
#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
@@ -5593,12 +5600,12 @@ msgstr "名前なし"
#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
-msgstr "攻撃 %+d"
+msgstr "Attack %+d"
#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
-msgstr "防御 %+d"
+msgstr "Defense %+d"
#: src/resources/itemdb.cpp:65
#, c-format
@@ -5613,3 +5620,6 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "不明なアイテム"
+
+#~ msgid "Waiting for server"
+#~ msgstr "サーバからの応答を待っています…"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index be4790342..71b8d1557 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,47 +40,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr ""
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr ""
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -90,223 +90,223 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr ""
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr ""
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr ""
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr ""
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr ""
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr ""
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr ""
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr ""
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr ""
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr ""
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr ""
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr ""
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr ""
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr ""
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr ""
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr ""
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr ""
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr ""
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr ""
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr ""
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr ""
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr ""
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr ""
@@ -736,12 +736,12 @@ msgstr ""
msgid "Chat"
msgstr ""
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -1243,7 +1243,7 @@ msgid "Need"
msgstr ""
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+msgid "Stop waiting"
msgstr ""
#: src/gui/npcdialog.cpp:52
@@ -1495,7 +1495,7 @@ msgid "Warp"
msgstr ""
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
+msgid "Clear outfit"
msgstr ""
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
@@ -1557,12 +1557,12 @@ msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr ""
@@ -4379,7 +4379,11 @@ msgstr ""
msgid " --safemode : Start game in safe mode"
msgstr ""
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 37bf68613..97d354580 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
"PO-Revision-Date: 2011-11-11 21:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
@@ -42,47 +42,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configureren"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Verbinden met server"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Inloggen"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Aanvragen personage"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -92,63 +92,63 @@ msgstr "Wijzigen spelservers"
msgid "Error"
msgstr "Fout"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Paswoord Wijziging"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Email Wijziging"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Ongeldige update host %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Onbekend commando."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "Kan geen lege berichten sturen!"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -157,160 +157,160 @@ msgstr ""
"Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
"bestaat, of het is jezelf."
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Groepsnaam ontbreekt."
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Guild-naam ontbreekt."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Gelieve een naam te specifiëren"
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "Ga terug naar chat"
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "Bericht sluit chat."
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "Ga nu terug naar chat."
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Bericht sluit nu chat."
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "vriend"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "genegeerd"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "neutraal"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "Speler reeds %s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "Speler succesvol %s!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "Speler kan niet %s zijn!"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "Speler is niet genegeerd!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "Speler niet langer genegeerd!"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "Speler kan niet worden genegeerd!"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "Speler reeds verwijderd!"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "Speler succesvol verwijderd!"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "Speler kan niet worden verwijderd!"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr "Client uptime: %s"
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d week"
msgstr[1] "%d weken"
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dag"
msgstr[1] "%d dagen"
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d uur"
msgstr[1] "%d uren"
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuut"
msgstr[1] "%d minuten"
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d seconde"
msgstr[1] "%d seconden"
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "Aangemaakt:"
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "Verwijdered:"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr ""
@@ -741,12 +741,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Aanwezig: %s; %d speler zijn aanwezig."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
@@ -1248,8 +1248,8 @@ msgid "Need"
msgstr "Nood"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Wachten op server"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1500,8 +1500,9 @@ msgid "Warp"
msgstr ""
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Inladen oude kleren"
+#, fuzzy
+msgid "Clear outfit"
+msgstr "Draag Kledij"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1563,12 +1564,12 @@ msgid "Name: "
msgstr "Naam: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr ""
@@ -4405,7 +4406,11 @@ msgstr " --screenshot-dir: Map te gebruiken om screenshots te bewaren"
msgid " --safemode : Start game in safe mode"
msgstr " --safemode : Start spel in veilige modus"
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr " --no-opengl : Zet OpenGL af voor deze sessie"
@@ -5647,6 +5652,12 @@ msgstr "Magie %+d"
msgid "Unknown item"
msgstr "Onbekend voorwerp"
+#~ msgid "Waiting for server"
+#~ msgstr "Wachten op server"
+
+#~ msgid "Load old outfits"
+#~ msgstr "Inladen oude kleren"
+
#~ msgid "(?) move"
#~ msgstr "(?) beweeg"
diff --git a/po/pl.po b/po/pl.po
index 10015c2c6..49b1c39c1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
-"PO-Revision-Date: 2011-12-22 06:19+0000\n"
-"Last-Translator: derpella <matwa@poczta.pl>\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"PO-Revision-Date: 2012-01-05 20:43+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/"
"pl/)\n"
"Language: pl\n"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Konfiguracja"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Wydajność programu"
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Obraz"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr "Skórki"
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Łączenie z serwerem"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Logowanie"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Wchodzenie do świata gry"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Sprawdzanie postaci"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Łączenie się z serwerem gry"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Zmiana serwera"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,63 +93,63 @@ msgstr "Zmiana serwera"
msgid "Error"
msgstr "Błąd"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Sprawdzanie szczegółów rejestracji"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Zmiana hasła"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Hasło zmienione z powodzeniem!"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Zmiana adresu e-mail"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Adres e-mail zmieniony z powodzeniem!"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Wyrejestrowano z powodzeniem"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Żegnaj, będziemy czekać na Twój powrót..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Nieprawidłowy serwer aktualizacji: %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Nieznane polecenie."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "Nie można wysłać pustych szeptów!"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -157,105 +157,105 @@ msgid ""
msgstr ""
"Nie można utworzyć zakładki szeptu dla \"%s\"! Już istnieje, albo to Ty."
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "Prośba o dołączenie do kanału %s."
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Brakuje nazwy grupy."
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Brak nazwy gildii."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Proszę wpisać prawidłową nazwę."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "Return włącza czat."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "Wiadomość zamyka czat."
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "Return od teraz włącza czat."
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Wiadomość od teraz zamyka czat."
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "znajomy"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "lekceważony"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "neutralny"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "Gracz jest już %s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "Gracz jest teraz %s!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "Gracz nie może być %s!"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "Gracz nie był ignorowany!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "Gracz już nie jest ignorowany!"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "Gracz nie może być odignorowany!"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr "dodany/a do czarnej listy"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr "wróg"
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "Gracz został usunięty!"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "Gracz usunięty z powodzeniem!"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "Gracz nie mógł zostać usunięty!"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr "Czas pracy programu: %s"
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -263,7 +263,7 @@ msgstr[0] "%d tydzień"
msgstr[1] "%d tygodni/e"
msgstr[2] "%d tygodni/e"
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -271,7 +271,7 @@ msgstr[0] "%d dzień"
msgstr[1] "%d dni"
msgstr[2] "%d dni"
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -279,7 +279,7 @@ msgstr[0] "%d godzina"
msgstr[1] "%d godzin/y"
msgstr[2] "%d godzin/y"
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -287,7 +287,7 @@ msgstr[0] "%d minuta"
msgstr[1] "%d minut/y"
msgstr[2] "%d minut/y"
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -295,27 +295,27 @@ msgstr[0] "%d sekunda"
msgstr[1] "%d sekund/y"
msgstr[2] "%d sekund/y"
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr "rozmiar cache czcionki"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr "Rozmiar cache:"
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "Stworzono:"
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "Usunięto:"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr "Obrazy źródłowe:"
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr "Osierocone obrazy źródłowe:"
@@ -745,12 +745,12 @@ msgstr "???"
msgid "Chat"
msgstr "Czat"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "%s obecny/a. %d graczy online."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Szepczesz do %s: %s"
@@ -1254,8 +1254,8 @@ msgid "Need"
msgstr "Potrzeba"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Oczekiwanie na serwer"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1506,8 +1506,8 @@ msgid "Warp"
msgstr "Teleport"
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Przywróć stare stroje"
+msgid "Clear outfit"
+msgstr ""
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1568,12 +1568,12 @@ msgid "Name: "
msgstr "Nick:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr "Komentarz gracza "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr "Komentarz: "
@@ -4400,7 +4400,11 @@ msgstr " --screenshot-dir : Katalog ze zrzutami ekranu"
msgid " --safemode : Start game in safe mode"
msgstr " --safemode : Rozpocznij grę w trybie bezpieczeństwa"
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr " --no-opengl : Wyłącz OpenGL w tej sesji"
diff --git a/po/pt.po b/po/pt.po
index 42f1a7f91..60b688895 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"PO-Revision-Date: 2011-12-08 14:10+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
"pt/)\n"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "l"
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,63 +93,63 @@ msgstr "Mudando servidores do jogo"
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,160 +158,160 @@ msgstr ""
"Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
"já existe ou é você mesmo."
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Por favor, especifique um nome."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "ignorado"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "neutro"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pode ser %s!"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "O jogador não está mais ignorado!"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador!"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr "Na Lista Negra"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "Jogador já apagado!"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "Jogador não pode ser apagado!"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr "Tamanho do cache de fonte"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr "Tamanho de Cache:"
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "Deletado:"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr "Recursos de imagens:"
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr "Recursos de imagens orfãos:"
@@ -742,12 +742,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -1249,8 +1249,8 @@ msgid "Need"
msgstr "Precisa"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Aguarde"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1501,8 +1501,9 @@ msgid "Warp"
msgstr "Urdidura"
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Carregar Antigas Roupas"
+#, fuzzy
+msgid "Clear outfit"
+msgstr "Vestir roupas"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1545,9 +1546,8 @@ msgid "Leave"
msgstr "Sair"
#: src/gui/popupmenu.cpp:654
-#, fuzzy
msgid "Copy to clipboard"
-msgstr "Copiar para o chat"
+msgstr ""
#: src/gui/popupmenu.cpp:849
msgid "Change guild position"
@@ -1564,12 +1564,12 @@ msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr "Comentário:"
@@ -4040,14 +4040,13 @@ msgid "(d) double normal + crazy"
msgstr "(d) dobro normal + louco"
#: src/localplayer.cpp:1898
-#, fuzzy
msgid "(?) unknown move"
-msgstr "(?) Seguir em modo desconhecido"
+msgstr ""
#: src/localplayer.cpp:1920
-#, fuzzy, c-format
+#, c-format
msgid "(%d) crazy move number %d"
-msgstr "(?) movimentos loucos"
+msgstr ""
#: src/localplayer.cpp:1925
msgid "(a) custom crazy move"
@@ -4286,9 +4285,8 @@ msgid "Game modifiers are disabled"
msgstr "Modificadores de jogo desativados"
#: src/localplayer.cpp:2236
-#, fuzzy
msgid "Game modifiers are unknown"
-msgstr "Modificadores de jogo ativados"
+msgstr ""
#: src/localplayer.cpp:3752
msgid "Follow: "
@@ -4402,7 +4400,11 @@ msgstr " --screenshot-dir : Diretório onde serão salvas as screenshots"
msgid " --safemode : Start game in safe mode"
msgstr " --safemode : Inicia o jogo em modo seguro"
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr " --no-opengl : Desabilita OpenGL nesta sessão"
@@ -5643,98 +5645,8 @@ msgstr "MP %+d"
msgid "Unknown item"
msgstr "Item desconhecido"
-#~ msgid "(?) move"
-#~ msgstr "(?) mover"
-
-#~ msgid "(?) map view"
-#~ msgstr "(?) Visualizador de mapa"
-
-#~ msgid "(D) design camera mode"
-#~ msgstr "(D) Modo de jogo câmera design"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(I)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(4)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
+#~ msgid "Waiting for server"
+#~ msgstr "Aguarde"
-#~ msgid "(O)"
-#~ msgstr "(O)"
+#~ msgid "Load old outfits"
+#~ msgstr "Carregar Antigas Roupas"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6895cd323..85dda848d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"PO-Revision-Date: 2011-12-08 14:10+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
"manaplus/team/pt_BR/)\n"
@@ -45,47 +45,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "por peso"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "por quantidade"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "por tipo"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Habilitar rolagem preguisoça "
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Rolagem preguiçosa"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,63 +95,63 @@ msgstr "Mudando servidores do jogo"
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,160 +160,160 @@ msgstr ""
"Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
"já existe ou é você mesmo."
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Por favor, especifique um nome."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "ignorado"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "neutro"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pode ser %s!"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "O jogador não está mais ignorado!"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador!"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr "Na Lista Negra"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "Jogador já apagado!"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "Jogador não pode ser apagado!"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr "Tamanho de fonte Cache"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr "Tamanho de cache:"
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "Deletado:"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr "Recursos de imagem:"
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr "Recurso de imagem orfão:"
@@ -744,12 +744,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -1251,8 +1251,8 @@ msgid "Need"
msgstr "Precisa"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Aguarde"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1503,8 +1503,9 @@ msgid "Warp"
msgstr "Urdidura"
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Carregar velhas roupas"
+#, fuzzy
+msgid "Clear outfit"
+msgstr "Vestir roupas"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1547,9 +1548,8 @@ msgid "Leave"
msgstr "Sair"
#: src/gui/popupmenu.cpp:654
-#, fuzzy
msgid "Copy to clipboard"
-msgstr "Copiar para chat"
+msgstr ""
#: src/gui/popupmenu.cpp:849
msgid "Change guild position"
@@ -1566,12 +1566,12 @@ msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr "Comentário:"
@@ -4042,14 +4042,13 @@ msgid "(d) double normal + crazy"
msgstr "(d) dobro normal + louco"
#: src/localplayer.cpp:1898
-#, fuzzy
msgid "(?) unknown move"
-msgstr "(?) Seguir em modo desconhecido"
+msgstr ""
#: src/localplayer.cpp:1920
-#, fuzzy, c-format
+#, c-format
msgid "(%d) crazy move number %d"
-msgstr "(?) Movimentos loucos"
+msgstr ""
#: src/localplayer.cpp:1925
msgid "(a) custom crazy move"
@@ -4288,9 +4287,8 @@ msgid "Game modifiers are disabled"
msgstr "Modificadores de jogo desativados"
#: src/localplayer.cpp:2236
-#, fuzzy
msgid "Game modifiers are unknown"
-msgstr "Modificadores de jogo desativados"
+msgstr ""
#: src/localplayer.cpp:3752
msgid "Follow: "
@@ -4404,7 +4402,11 @@ msgstr " --screenshot-dir : Diretório onde serão salvas as screenshots"
msgid " --safemode : Start game in safe mode"
msgstr " --safemode : Inicia o jogo em modo seguro"
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr " --no-opengl : Desabilita OpenGL nesta sessão"
@@ -5645,98 +5647,8 @@ msgstr "MP %+d"
msgid "Unknown item"
msgstr "Item desconhecido"
-#~ msgid "(?) move"
-#~ msgstr "(?) mover"
-
-#~ msgid "(?) map view"
-#~ msgstr "(?) Visualizador de mapa"
-
-#~ msgid "(D) design camera mode"
-#~ msgstr "(D) Modo de jogo câmera design"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(l)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
+#~ msgid "Waiting for server"
+#~ msgstr "Aguarde"
-#~ msgid "(O)"
-#~ msgstr "(O)"
+#~ msgid "Load old outfits"
+#~ msgstr "Carregar velhas roupas"
diff --git a/po/ru.po b/po/ru.po
index 0dd37e314..ba8643059 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Andrei Karas <akaras@inbox.ru>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011, 2012.
# Necromonger <Necromong@inbox.ru>, 2011.
# <Necromong@inbox.ru>, 2011.
# <reslayer@mail.ru>, 2011.
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
-"PO-Revision-Date: 2011-12-08 14:11+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"PO-Revision-Date: 2012-01-05 20:44+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
"ru/)\n"
"Language: ru\n"
@@ -45,47 +45,47 @@ msgstr "О"
msgid "I"
msgstr "Б"
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Настройка"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Производительность"
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Видео"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr "Темы"
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Авторизация"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Входим в игровой мир"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Получение списка персонажей"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Смена игрового сервера"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,63 +95,63 @@ msgstr "Смена игрового сервера"
msgid "Error"
msgstr "Ошибка"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Изменить Пароль"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Сменить Email"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email изменен!"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Регистрация удалена"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не существует, и не может быть создано! Выход."
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "Некорректный сервер обновлений: %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "Ошибка создания директории для обновлений!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "Неизвестная команда."
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "Нельзя отправлять пустые сообщения!"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,105 +160,105 @@ msgstr ""
"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
"уже создана, или этот игрок Вы сами."
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "Запрос на присоединение к каналу %s."
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Не указано название группы"
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "Не задано имя гильдии."
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "Пожалуйста, укажите имя"
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr "Enter переключает Вас на окно чата."
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "Сообщение закрывает чат."
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "Теперь Return переключает чат."
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "Теперь сообщение закрывает чат."
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "друг"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "пренебрегаемый"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "нейтральный"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "Игрок уже %s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "Игрок удачно %s!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "Игрок не может быть %s!"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "Игрок не был игнорируемым!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "Игрок больше не игнорируется!"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "Игрок не может быть удален из списка игнорирования!"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr "добавлен в черный список"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr "враг"
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "Игрок и так уже удален!"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "Игрок удален!"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "Игрок не может быть удален!"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr "Время работы клиента: %s"
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -266,7 +266,7 @@ msgstr[0] "%d неделя"
msgstr[1] "%d недели"
msgstr[2] "%d недель"
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -274,7 +274,7 @@ msgstr[0] "%d день"
msgstr[1] "%d дня"
msgstr[2] "%d дней"
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -282,7 +282,7 @@ msgstr[0] "%d час"
msgstr[1] "%d часа"
msgstr[2] "%d часов"
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -290,7 +290,7 @@ msgstr[0] "%d минута"
msgstr[1] "%d минуты"
msgstr[2] "%d минут"
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -298,27 +298,27 @@ msgstr[0] "%d секунда"
msgstr[1] "%d секунды"
msgstr[2] "%d секунд"
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr "размер кеша шрифта"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr "Размер кеша:"
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "Создано:"
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "Удалено:"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr "Изображений:"
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr "Удаленных изображений:"
@@ -750,12 +750,12 @@ msgstr "???"
msgid "Chat"
msgstr "Чат"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Присутствуют: %s; Всего %d игроков."
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
@@ -1259,8 +1259,8 @@ msgid "Need"
msgstr "Нужно"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Ожидание ответа от сервера"
+msgid "Stop waiting"
+msgstr "Остановить ожидание"
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1511,8 +1511,8 @@ msgid "Warp"
msgstr "Прыгнуть"
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Загрузить старые наряды"
+msgid "Clear outfit"
+msgstr "Очистить наряд"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1573,12 +1573,12 @@ msgid "Name: "
msgstr "Имя: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr "Комментарий "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr "Комментарий: "
@@ -4416,7 +4416,12 @@ msgstr " --screenshot-dir : Сохранять скриншоты в ука
msgid " --safemode : Start game in safe mode"
msgstr " --safemode : Запуск игры в безопасном режиме"
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+" -T --tests : Запускает проверку драйверов и автоконфигурацию"
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr " --no-opengl : Не использовать OpenGL для этой сессии"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 82793f544..ff3889043 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-24 14:37+0300\n"
+"POT-Creation-Date: 2012-01-05 23:31+0300\n"
"PO-Revision-Date: 2011-11-11 21:38+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "魔法攻击"
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "性能"
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "视频"
-#: src/client.cpp:895
+#: src/client.cpp:964
msgid "Themes"
msgstr "主题"
-#: src/client.cpp:977
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "魔法防御"
-#: src/client.cpp:1008
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "尝试捡起不存在的物品。"
-#: src/client.cpp:1041
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "捡起物品发生不存在的物品。"
-#: src/client.cpp:1142
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "请求角色"
-#: src/client.cpp:1173
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "连接到游戏服务器"
-#: src/client.cpp:1183
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "更改游戏服务器"
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,218 +93,218 @@ msgstr "更改游戏服务器"
msgid "Error"
msgstr "错误"
-#: src/client.cpp:1242
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "请求注册的详细信息"
-#: src/client.cpp:1268
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "密码更改"
-#: src/client.cpp:1269
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "更改密码成功!"
-#: src/client.cpp:1288
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "更改电子邮件"
-#: src/client.cpp:1289
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "更改电子邮件成功!"
-#: src/client.cpp:1309
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "注销成功"
-#: src/client.cpp:1310
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "再见,随时欢迎回来... ..."
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2060 src/client.cpp:2067
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s 不存在,并且无法创建!退出。"
-#: src/client.cpp:1685
+#: src/client.cpp:1766
#, c-format
msgid "Invalid update host: %s"
msgstr "无效的更新主机: %s"
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1800 src/client.cpp:1806
msgid "Error creating updates directory!"
msgstr "创建更新目录错误!"
-#: src/client.cpp:1746
+#: src/client.cpp:1827
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "错误:%s 不存在并且无法创建!退出。"
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
msgid "Unknown command."
msgstr "未知命令。"
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
msgid "Cannot send empty whispers!"
msgstr "无法发送空白密语!"
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr "无法同 \"%s\" 建立一个私人谈话标签页!或者已经存在,或者那就是自己。"
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
#, c-format
msgid "Requesting to join channel %s."
msgstr "请求加入频道%s。"
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "帮会名称缺失。"
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
msgid "Guild name is missing."
msgstr "公会名称是缺少的。"
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
msgid "Please specify a name."
msgstr "请指定一个名称。"
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
msgid "Message closes chat."
msgstr "讯息关闭聊天。"
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
msgid "Return now toggles chat."
msgstr "<回车>键现在切换聊天。"
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
msgid "Message now closes chat."
msgstr "讯息现在关闭聊天。"
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
msgid "friend"
msgstr "朋友"
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
msgid "disregarded"
msgstr "无视"
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
msgid "neutral"
msgstr "中性"
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
#, c-format
msgid "Player already %s!"
msgstr "玩家已经%s!"
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
#, c-format
msgid "Player successfully %s!"
msgstr "玩家成功%s!"
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
#, c-format
msgid "Player could not be %s!"
msgstr "玩家不能为 %s"
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
msgid "Player wasn't ignored!"
msgstr "是不能忽视的!"
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
msgid "Player no longer ignored!"
msgstr "玩家不再被忽略!"
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
msgid "Player could not be unignored!"
msgstr "玩家不能被忽略!"
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
msgid "Player already erased!"
msgstr "玩家已经被删除!"
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
msgid "Player successfully erased!"
msgstr "玩家成功删除!"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
msgid "Player could not be erased!"
msgstr "玩家无法删除!"
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
msgid "font cache size"
msgstr "字体缓存大小"
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
msgid "Created:"
msgstr "创建于:"
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
msgid "Deleted:"
msgstr "删除:"
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
msgid "Resource orphaned images:"
msgstr ""
@@ -734,12 +734,12 @@ msgstr "???"
msgid "Chat"
msgstr "聊天"
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
#, c-format
msgid "Whispering to %s: %s"
msgstr "对%s密语到:%s"
@@ -1239,8 +1239,8 @@ msgid "Need"
msgstr "需要"
#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "等待服务器中"
+msgid "Stop waiting"
+msgstr ""
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1491,8 +1491,9 @@ msgid "Warp"
msgstr ""
#: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr ""
+#, fuzzy
+msgid "Clear outfit"
+msgstr "装备套装"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1553,12 +1554,12 @@ msgid "Name: "
msgstr "名称:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1373
msgid "Player comment "
msgstr "玩家评论"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1375
msgid "Comment: "
msgstr "评论:"
@@ -4374,7 +4375,11 @@ msgstr ""
msgid " --safemode : Start game in safe mode"
msgstr ""
-#: src/main.cpp:75
+#: src/main.cpp:74
+msgid " -T --tests : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:77
msgid " --no-opengl : Disable OpenGL for this session"
msgstr ""
@@ -5601,6 +5606,9 @@ msgstr "MP %+d"
msgid "Unknown item"
msgstr "未知物品"
+#~ msgid "Waiting for server"
+#~ msgstr "等待服务器中"
+
#~ msgid "(D)"
#~ msgstr "(D)"