summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/commandhandler.cpp6
-rw-r--r--src/gui/palette.cpp16
-rw-r--r--src/gui/popupmenu.cpp6
-rw-r--r--src/gui/skill.cpp4
-rw-r--r--src/net/ea/playerhandler.cpp2
5 files changed, 17 insertions, 17 deletions
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index ea0094c3..48da510f 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -140,7 +140,7 @@ void CommandHandler::handleHelp(const std::string &args, ChatTab *tab)
if (args == "")
{
tab->chatLog(_("-- Help --"));
- tab->chatLog(_("/help > Display this help."));
+ tab->chatLog(_("/help > Display this help"));
tab->chatLog(_("/where > Display map name"));
tab->chatLog(_("/who > Display number of online users"));
@@ -333,14 +333,14 @@ void CommandHandler::handleMsg(const std::string &args, ChatTab *tab)
chatWindow->whisper(recvnick, msg, true);
}
else
- tab->chatLog(_("Cannont send empty whispers!"), BY_SERVER);
+ tab->chatLog(_("Cannot send empty whispers!"), BY_SERVER);
}
void CommandHandler::handleQuery(const std::string &args, ChatTab *tab) {
if (chatWindow->addWhisperTab(args, true))
return;
- tab->chatLog(strprintf(_("Cannont create a whisper tab for nick '%s'!"
+ tab->chatLog(strprintf(_("Cannot create a whisper tab for nick '%s'! "
"It either already exists, or is you."), args.c_str()), BY_SERVER);
}
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 4c386f1f..897c7efd 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -101,24 +101,24 @@ Palette::Palette() :
addColor(HYPERLINK, 0xe50d0d, STATIC, indent + _("Hyperlink"), '<');
addColor(BEING, 0xffffff, STATIC, _("Being"));
- addColor(PC, 0xffffff, STATIC, indent + _("Other Player's Names"));
+ addColor(PC, 0xffffff, STATIC, indent + _("Other Players' Names"));
addColor(SELF, 0xff8040, STATIC, indent + _("Own Name"));
addColor(GM_NAME, 0x00ff00, STATIC, indent + _("GM Names"));
addColor(NPC, 0xc8c8ff, STATIC, indent + _("NPCs"));
addColor(MONSTER, 0xff4040, STATIC, indent + _("Monsters"));
addColor(UNKNOWN_ITEM, 0x000000, STATIC, _("Unknown Item Type"));
- addColor(GENERIC, 0x21a5b1, STATIC, indent + _("Generic"));
- addColor(HEAD, 0x527fa4, STATIC, indent + _("Hat"));
- addColor(USABLE, 0x268d24, STATIC, indent + _("Usable"));
- addColor(TORSO, 0xd12aa4, STATIC, indent + _("Shirt"));
+ addColor(GENERIC, 0x21a5b1, STATIC, indent + _("Generics"));
+ addColor(HEAD, 0x527fa4, STATIC, indent + _("Hats"));
+ addColor(USABLE, 0x268d24, STATIC, indent + _("Usables"));
+ addColor(TORSO, 0xd12aa4, STATIC, indent + _("Shirts"));
addColor(ONEHAND, 0xf42a2a, STATIC, indent + _("1 Handed Weapons"));
addColor(LEGS, 0x699900, STATIC, indent + _("Pants"));
addColor(FEET, 0xaa1d48, STATIC, indent + _("Shoes"));
addColor(TWOHAND, 0xf46d0e, STATIC, indent + _("2 Handed Weapons"));
- addColor(SHIELD, 0x9c2424, STATIC, indent + _("Shield"));
- addColor(RING, 0x0000ff, STATIC, indent + _("Ring"));
- addColor(NECKLACE, 0xff00ff, STATIC, indent + _("Necklace"));
+ addColor(SHIELD, 0x9c2424, STATIC, indent + _("Shields"));
+ addColor(RING, 0x0000ff, STATIC, indent + _("Rings"));
+ addColor(NECKLACE, 0xff00ff, STATIC, indent + _("Necklaces"));
addColor(ARMS, 0x9c24e8, STATIC, indent + _("Arms"));
addColor(AMMO, 0x8b6311, STATIC, indent + _("Ammo"));
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 94d39e78..2c820bab 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -152,8 +152,8 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
// Floor item can be picked up (single option, candidate for removal)
std::string name = ItemDB::get(mFloorItem->getItemId()).getName();
- mBrowserBox->addRow(strprintf(_("@@pickup|Pick Up %s@@"), name.c_str()));
- mBrowserBox->addRow(_("@@chat|Add to Chat@@"));
+ mBrowserBox->addRow(strprintf(_("@@pickup|Pick up %s@@"), name.c_str()));
+ mBrowserBox->addRow(_("@@chat|Add to chat@@"));
//browserBox->addRow("@@look|Look To@@");
mBrowserBox->addRow("##3---");
@@ -349,7 +349,7 @@ void PopupMenu::showPopup(int x, int y, Item *item)
if (!item->isEquipment())
mBrowserBox->addRow(_("@@split|Split@@"));
#endif
- mBrowserBox->addRow(_("@@chat|Add to Chat@@"));
+ mBrowserBox->addRow(_("@@chat|Add to chat@@"));
mBrowserBox->addRow("##3---");
mBrowserBox->addRow(_("@@cancel|Cancel@@"));
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 66ebc506..684a9ded 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -143,8 +143,8 @@ SkillDialog::SkillDialog():
ScrollArea *skillScrollArea = new ScrollArea(mTable);
mPointsLabel = new Label(strprintf(_("Skill points: %d"), 0));
- mIncButton = new Button(_("Up"), _("inc"), this);
- mUseButton = new Button(_("Use"), _("use"), this);
+ mIncButton = new Button(_("Up"), "inc", this);
+ mUseButton = new Button(_("Use"), "use", this);
mUseButton->setEnabled(false);
skillScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index c0c0fe20..55d54af8 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -111,7 +111,7 @@ static const char *randomDeathMessage()
N_("You are not that alive anymore."),
N_("The cold hands of the grim reaper are grabbing for your soul."),
N_("Game Over!"),
- N_("Insert coin to continue"),
+ N_("Insert coin to continue."),
N_("No, kids. Your character did not really die. It... "
"err... went to a better place."),
N_("Your plan of breaking your enemies weapon by "