summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/chatrecv.cpp5
-rw-r--r--src/net/eathena/generalhandler.cpp30
-rw-r--r--src/net/eathena/generalrecv.cpp29
-rw-r--r--src/net/eathena/mailrecv.cpp1
-rw-r--r--src/net/eathena/petrecv.cpp5
-rw-r--r--src/net/eathena/skillrecv.cpp14
-rw-r--r--src/net/tmwa/generalhandler.cpp12
7 files changed, 89 insertions, 7 deletions
diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp
index f1e30c9c6..5846d36c6 100644
--- a/src/net/eathena/chatrecv.cpp
+++ b/src/net/eathena/chatrecv.cpp
@@ -132,18 +132,23 @@ void ChatRecv::processFormatMessage(Net::MessageIn &msg)
switch (msgId)
{
case 1334:
+ // TRANSLATORS: error message
chatMsg = _("Can't cast skill in this area.");
break;
case 1335:
+ // TRANSLATORS: error message
chatMsg = _("Can't use item in this area.");
break;
case 1773:
+ // TRANSLATORS: error message
chatMsg = _("Can't equip. Wrong level.");
break;
case 1774:
+ // TRANSLATORS: error message
chatMsg = _("Can't use. Wrong level.");
break;
case 1923:
+ // TRANSLATORS: error message
chatMsg = _("Work in progress."); // busy with npc
break;
default:
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index ed5a7ce03..cdc2b2673 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -119,11 +119,17 @@ GeneralHandler::GeneralHandler() :
generalHandler = this;
std::vector<ItemDB::Stat> stats;
+ // TRANSLATORS: player stat
stats.push_back(ItemDB::Stat("str", _("Strength %s")));
+ // TRANSLATORS: player stat
stats.push_back(ItemDB::Stat("agi", _("Agility %s")));
+ // TRANSLATORS: player stat
stats.push_back(ItemDB::Stat("vit", _("Vitality %s")));
+ // TRANSLATORS: player stat
stats.push_back(ItemDB::Stat("int", _("Intelligence %s")));
+ // TRANSLATORS: player stat
stats.push_back(ItemDB::Stat("dex", _("Dexterity %s")));
+ // TRANSLATORS: player stat
stats.push_back(ItemDB::Stat("luck", _("Luck %s")));
ItemDB::setStatsList(stats);
@@ -182,9 +188,14 @@ void GeneralHandler::flushNetwork()
if (Network::mInstance->getState() == Network::NET_ERROR)
{
if (!Network::mInstance->getError().empty())
+ {
errorMessage = Network::mInstance->getError();
+ }
else
+ {
+ // TRANSLATORS: error message
errorMessage = _("Got disconnected from server!");
+ }
client->setState(State::ERROR);
}
@@ -208,33 +219,52 @@ void GeneralHandler::gameStarted() const
statusWindow->clearAttributes();
statusWindow->addAttribute(Attributes::STR,
+ // TRANSLATORS: player stat
_("Strength"), "str", Modifiable_true);
statusWindow->addAttribute(Attributes::AGI,
+ // TRANSLATORS: player stat
_("Agility"), "agi", Modifiable_true);
statusWindow->addAttribute(Attributes::VIT,
+ // TRANSLATORS: player stat
_("Vitality"), "vit", Modifiable_true);
statusWindow->addAttribute(Attributes::INT,
+ // TRANSLATORS: player stat
_("Intelligence"), "int", Modifiable_true);
statusWindow->addAttribute(Attributes::DEX,
+ // TRANSLATORS: player stat
_("Dexterity"), "dex", Modifiable_true);
statusWindow->addAttribute(Attributes::LUK,
+ // TRANSLATORS: player stat
_("Luck"), "luk", Modifiable_true);
+ // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::ATK, _("Attack"));
+ // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::DEF, _("Defense"));
+ // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::MATK, _("M.Attack"));
+ // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::MDEF, _("M.Defense"));
+ // TRANSLATORS: player stat
// xgettext:no-c-format
statusWindow->addAttribute(Attributes::HIT, _("% Accuracy"));
+ // TRANSLATORS: player stat
// xgettext:no-c-format
statusWindow->addAttribute(Attributes::FLEE, _("% Evade"));
+ // TRANSLATORS: player stat
// xgettext:no-c-format
statusWindow->addAttribute(Attributes::CRIT, _("% Critical"));
+ // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::ATTACK_DELAY, _("Attack Delay"));
+ // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::WALK_SPEED, _("Walk Delay"));
+ // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::ATTACK_RANGE, _("Attack Range"));
+ // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::ATTACK_SPEED, _("Damage per sec."));
+ // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::KARMA, _("Karma"));
+ // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::MANNER, _("Manner"));
}
diff --git a/src/net/eathena/generalrecv.cpp b/src/net/eathena/generalrecv.cpp
index 3b67b32e2..48e079d09 100644
--- a/src/net/eathena/generalrecv.cpp
+++ b/src/net/eathena/generalrecv.cpp
@@ -45,94 +45,122 @@ void GeneralRecv::processConnectionProblem(Net::MessageIn &msg)
switch (code)
{
case 0:
+ // TRANSLATORS: error message
errorMessage = _("Authentication failed.");
break;
case 1:
+ // TRANSLATORS: error message
errorMessage = _("No servers available.");
break;
case 2:
if (client->getState() == State::GAME)
{
+ // TRANSLATORS: error message
errorMessage = _("Someone else is trying to use "
"this account.");
}
else
{
+ // TRANSLATORS: error message
errorMessage = _("This account is already logged in.");
}
break;
case 3:
+ // TRANSLATORS: error message
errorMessage = _("Speed hack detected.");
break;
case 4:
+ // TRANSLATORS: error message
errorMessage = _("Server full.");
break;
case 5:
+ // TRANSLATORS: error message
errorMessage = _("Sorry, you are underaged.");
break;
case 8:
+ // TRANSLATORS: error message
errorMessage = _("Duplicated login.");
break;
case 9:
+ // TRANSLATORS: error message
errorMessage = _("To many connections from same ip.");
break;
case 10:
+ // TRANSLATORS: error message
errorMessage = _("Not paid for this time.");
break;
case 11:
+ // TRANSLATORS: error message
errorMessage = _("Pay suspended.");
break;
case 12:
+ // TRANSLATORS: error message
errorMessage = _("Pay changed.");
break;
case 13:
+ // TRANSLATORS: error message
errorMessage = _("Pay wrong ip.");
break;
case 14:
+ // TRANSLATORS: error message
errorMessage = _("Pay game room.");
break;
case 15:
+ // TRANSLATORS: error message
errorMessage = _("Disconnect forced by GM.");
break;
case 16:
case 17:
+ // TRANSLATORS: error message
errorMessage = _("Ban japan refuse.");
break;
case 18:
+ // TRANSLATORS: error message
errorMessage = _("Remained other account.");
break;
case 100:
+ // TRANSLATORS: error message
errorMessage = _("Ip unfair.");
break;
case 101:
+ // TRANSLATORS: error message
errorMessage = _("Ip count all.");
break;
case 102:
+ // TRANSLATORS: error message
errorMessage = _("Ip count.");
break;
case 103:
case 104:
+ // TRANSLATORS: error message
errorMessage = _("Memory.");
break;
case 105:
+ // TRANSLATORS: error message
errorMessage = _("Han valid.");
break;
case 106:
+ // TRANSLATORS: error message
errorMessage = _("Ip limited access.");
break;
case 107:
+ // TRANSLATORS: error message
errorMessage = _("Over characters list.");
break;
case 108:
+ // TRANSLATORS: error message
errorMessage = _("Ip blocked.");
break;
case 109:
+ // TRANSLATORS: error message
errorMessage = _("Invalid password count.");
break;
case 110:
+ // TRANSLATORS: error message
errorMessage = _("Not allowed race.");
break;
default:
+ // TRANSLATORS: error message
errorMessage = _("Unknown connection error.");
break;
}
@@ -143,6 +171,7 @@ void GeneralRecv::processMapNotFound(Net::MessageIn &msg)
{
const int sz = msg.readInt16("len") - 4;
msg.readString(sz, "map name?");
+ // TRANSLATORS: error message
errorMessage = _("Map not found");
client->setState(State::ERROR);
}
diff --git a/src/net/eathena/mailrecv.cpp b/src/net/eathena/mailrecv.cpp
index 77bd3e4a9..1198968ac 100644
--- a/src/net/eathena/mailrecv.cpp
+++ b/src/net/eathena/mailrecv.cpp
@@ -144,6 +144,7 @@ void MailRecv::processNewMail(Net::MessageIn &msg)
const std::string subj = msg.readString(40, "title");
const std::string sender = msg.readString(24, "sender name");
NotifyManager::notify(NotifyTypes::NEW_MAIL,
+ // TRANSLATORS: mail message notification
strprintf(_("You have new mail from %s with subject %s"),
sender.c_str(), subj.c_str()));
mailHandler->refresh();
diff --git a/src/net/eathena/petrecv.cpp b/src/net/eathena/petrecv.cpp
index 5f82e8a9d..284ada80b 100644
--- a/src/net/eathena/petrecv.cpp
+++ b/src/net/eathena/petrecv.cpp
@@ -64,9 +64,12 @@ void PetRecv::processPetMessage(Net::MessageIn &msg)
{
if (localChatTab && localPlayer)
{
+ // TRANSLATORS: user's pet
std::string nick = strprintf(_("%s's pet"),
localPlayer->getName().c_str());
- localChatTab->chatLog(nick, strprintf("hungry level %d", hungry));
+ localChatTab->chatLog(nick,
+ // TRANSLATORS: pet hungry level
+ strprintf(_("hungry level %d"), hungry));
}
PetInfo *const info = PlayerInfo::getPet();
if (!info || info->id != id)
diff --git a/src/net/eathena/skillrecv.cpp b/src/net/eathena/skillrecv.cpp
index 26ce946cc..214cd88d9 100644
--- a/src/net/eathena/skillrecv.cpp
+++ b/src/net/eathena/skillrecv.cpp
@@ -220,17 +220,27 @@ void SkillRecv::processSkillFailed(Net::MessageIn &msg)
SkillInfo *const info = skillDialog->getSkill(bskill);
if (info)
+ {
txt = info->errorText;
+ }
else
+ {
+ // TRANSLATORS: skill error message
txt = strprintf(_("Unknown skill error: %d"), bskill);
+ }
}
else
{
SkillInfo *const info = skillDialog->getSkill(skillId);
if (info)
+ {
txt = info->errorText + ".";
+ }
else
+ {
+ // TRANSLATORS: skill error message
txt = strprintf(_("Unknown skill error: %d."), skillId);
+ }
}
txt.append(" ");
@@ -292,11 +302,13 @@ void SkillRecv::processSkillFailed(Net::MessageIn &msg)
const ItemInfo &info = ItemDB::get(itemId);
if (amount == 1)
{
+ // TRANSLATORS: skill error message
txt.append(strprintf(_("Need equipment %s."),
info.getLink().c_str()));
}
else
{
+ // TRANSLATORS: skill error message
txt.append(strprintf(_("Need equipment %s and amount %d"),
info.getLink().c_str(),
amount));
@@ -310,11 +322,13 @@ void SkillRecv::processSkillFailed(Net::MessageIn &msg)
const ItemInfo &info = ItemDB::get(itemId);
if (amount == 1)
{
+ // TRANSLATORS: skill error message
txt.append(strprintf(_("Need item %s."),
info.getLink().c_str()));
}
else
{
+ // TRANSLATORS: skill error message
txt.append(strprintf(_("Need item %s and amount %d"),
info.getLink().c_str(),
amount));
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 300110742..72b533b9f 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -229,23 +229,23 @@ void GeneralHandler::gameStarted() const
// protection against double addition attributes.
statusWindow->clearAttributes();
- // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::STR,
+ // TRANSLATORS: player stat
_("Strength"), "str", Modifiable_true);
- // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::AGI,
+ // TRANSLATORS: player stat
_("Agility"), "agi", Modifiable_true);
- // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::VIT,
+ // TRANSLATORS: player stat
_("Vitality"), "vit", Modifiable_true);
- // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::INT,
+ // TRANSLATORS: player stat
_("Intelligence"), "int", Modifiable_true);
- // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::DEX,
+ // TRANSLATORS: player stat
_("Dexterity"), "dex", Modifiable_true);
- // TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::LUK,
+ // TRANSLATORS: player stat
_("Luck"), "luk", Modifiable_true);
// TRANSLATORS: player stat
statusWindow->addAttribute(Attributes::ATK, _("Attack"));