From ee6aea38c7d3dba0c4b6dab7f22f303dfbc14019 Mon Sep 17 00:00:00 2001
From: Kess Vargavind <vargavind@gmail.com>
Date: Thu, 21 May 2009 09:38:06 +0200
Subject: Fixed a few strings for better translation
Just a few notes that would help us translators immensly:
* Please do not split one sentence into several strings
* Please try to refrain from inserting extra spaces into the strings
(cherry picked from commit 9712489ef67f95d6a5fa1fc3102bb7c4ee6a1f59)
---
src/gui/charselectdialog.cpp | 2 +-
src/gui/itemamount.cpp | 24 ++++++++++++------------
src/gui/npcpostdialog.cpp | 9 +++++----
src/gui/okdialog.cpp | 2 +-
src/gui/partywindow.cpp | 16 +++++++++-------
src/gui/quitdialog.cpp | 2 +-
src/gui/serverdialog.cpp | 2 +-
src/gui/skill.cpp | 2 +-
src/gui/storagewindow.cpp | 2 +-
src/gui/trade.cpp | 2 +-
10 files changed, 33 insertions(+), 30 deletions(-)
(limited to 'src/gui')
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index f88fa733..4df0243b 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -107,7 +107,7 @@ CharSelectDialog::CharSelectDialog(LockedArray<LocalPlayer*> *charInfo,
mGender(gender)
#endif
{
- mSelectButton = new Button(_("Ok"), "ok", this);
+ mSelectButton = new Button(_("OK"), "ok", this);
mCancelButton = new Button(_("Cancel"), "cancel", this);
mPreviousButton = new Button(_("Previous"), "previous", this);
mNextButton = new Button(_("Next"), "next", this);
diff --git a/src/gui/itemamount.cpp b/src/gui/itemamount.cpp
index 252daf19..87df46c1 100644
--- a/src/gui/itemamount.cpp
+++ b/src/gui/itemamount.cpp
@@ -82,7 +82,7 @@ ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item,
// Slider
mItemAmountSlide = new Slider(1.0, mMax);
mItemAmountSlide->setHeight(10);
- mItemAmountSlide->setActionEventId("Slide");
+ mItemAmountSlide->setActionEventId("slide");
mItemAmountSlide->addActionListener(this);
//Item icon
@@ -90,11 +90,11 @@ ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item,
mItemIcon = new Icon(image);
// Buttons
- Button *minusButton = new Button("-", "Minus", this);
- Button *plusButton = new Button("+", "Plus", this);
- Button *okButton = new Button(_("Ok"), "Ok", this);
- Button *cancelButton = new Button(_("Cancel"), "Cancel", this);
- Button *addAllButton = new Button(_("All"), "All", this);
+ Button *minusButton = new Button("-", "minus", this);
+ Button *plusButton = new Button("+", "plus", this);
+ Button *okButton = new Button(_("Ok"), "ok", this);
+ Button *cancelButton = new Button(_("Cancel"), "cancel", this);
+ Button *addAllButton = new Button(_("All"), "all", this);
minusButton->adjustSize();
minusButton->setWidth(plusButton->getWidth());
@@ -168,27 +168,27 @@ void ItemAmountWindow::action(const gcn::ActionEvent &event)
{
int amount = mItemAmountTextField->getValue();
- if (event.getId() == "Cancel")
+ if (event.getId() == "cancel")
{
close();
}
- else if (event.getId() == "Plus" && amount < mMax)
+ else if (event.getId() == "plus" && amount < mMax)
{
amount++;
}
- else if (event.getId() == "Minus" && amount > 1)
+ else if (event.getId() == "minus" && amount > 1)
{
amount--;
}
- else if (event.getId() == "All")
+ else if (event.getId() == "all")
{
amount = mMax;
}
- else if (event.getId() == "Slide")
+ else if (event.getId() == "slide")
{
amount = static_cast<int>(mItemAmountSlide->getValue());
}
- else if (event.getId() == "Ok")
+ else if (event.getId() == "ok")
{
finish(mItem, amount, mUsage);
scheduleDelete();
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index 20123745..32dbe22c 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.cpp
@@ -41,7 +41,7 @@ NpcPostDialog::NpcPostDialog():
setContentSize(400, 180);
// create text field for receiver
- gcn::Label *senderText = new Label("To:");
+ gcn::Label *senderText = new Label(_("To:"));
senderText->setPosition(5, 5);
mSender = new TextField;
mSender->setPosition(senderText->getWidth() + 5, 5);
@@ -49,8 +49,8 @@ NpcPostDialog::NpcPostDialog():
// create button for sending
Button *sendButton = new Button(_("Send"), "send", this);
- sendButton->setPosition(400-sendButton->getWidth(),
- 170-sendButton->getHeight());
+ sendButton->setPosition(400 - sendButton->getWidth(),
+ 170 - sendButton->getHeight());
Button *cancelButton = new Button(_("Cancel"), "cancel", this);
cancelButton->setPosition(sendButton->getX() - (cancelButton->getWidth() + 2),
sendButton->getY());
@@ -82,7 +82,8 @@ void NpcPostDialog::action(const gcn::ActionEvent &event)
{
if (mSender->getText().empty() || mText->getText().empty())
{
- localChatTab->chatLog("Failed to send as sender or letter invalid");
+ localChatTab->chatLog(_("Failed to send as sender or letter "
+ "invalid."));
}
else
{
diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp
index 9da070eb..8982d528 100644
--- a/src/gui/okdialog.cpp
+++ b/src/gui/okdialog.cpp
@@ -39,7 +39,7 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
mTextBox->setOpaque(false);
mTextBox->setTextWrapped(msg, 260);
- gcn::Button *okButton = new Button(_("Ok"), "ok", this);
+ gcn::Button *okButton = new Button(_("OK"), "ok", this);
const int numRows = mTextBox->getNumberOfRows();
const int fontHeight = getFont()->getHeight();
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index 5e384413..f66ffaac 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -171,24 +171,24 @@ void PartyWindow::showPartyInvite(const std::string &inviter,
// check there isnt already an invite showing
if (mPartyInviter != "")
{
- localChatTab->chatLog("Received party request, but one already exists",
- BY_SERVER);
+ localChatTab->chatLog(_("Received party request, but one already "
+ "exists."), BY_SERVER);
return;
}
std::string msg;
// log invite
if (partyName.empty())
- msg = strprintf("%s has invited you to join their party",
+ msg = strprintf(N_("%s has invited you to join their party."),
inviter.c_str());
else
- msg = strprintf("%s has invited you to join the %s party",
+ msg = strprintf(N_("%s has invited you to join the %s party."),
inviter.c_str(), partyName.c_str());
localChatTab->chatLog(msg, BY_SERVER);
// show invite
- acceptDialog = new ConfirmDialog("Accept Party Invite", msg, this);
+ acceptDialog = new ConfirmDialog(_("Accept Party Invite"), msg, this);
acceptDialog->addActionListener(this);
mPartyInviter = inviter;
@@ -201,13 +201,15 @@ void PartyWindow::action(const gcn::ActionEvent &event)
// check if they accepted the invite
if (eventId == "yes")
{
- localChatTab->chatLog("Accepted invite from " + mPartyInviter);
+ localChatTab->chatLog(strprintf(_("Accepted invite from %s."),
+ mPartyInviter.c_str()));
Net::getPartyHandler()->inviteResponse(mPartyInviter, true);
mPartyInviter = "";
}
else if (eventId == "no")
{
- localChatTab->chatLog("Rejected invite from " + mPartyInviter);
+ localChatTab->chatLog(strprintf(_("Rejected invite from %s."),
+ mPartyInviter.c_str()));
Net::getPartyHandler()->inviteResponse(mPartyInviter, false);
mPartyInviter = "";
}
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index e506aea3..98657001 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -36,7 +36,7 @@ QuitDialog::QuitDialog(bool* quitGame, QuitDialog** pointerToMe):
mForceQuit = new RadioButton(_("Quit"), "quitdialog");
mSwitchAccountServer = new RadioButton(_("Switch server"), "quitdialog");
mSwitchCharacter = new RadioButton(_("Switch character"), "quitdialog");
- mOkButton = new Button(_("Ok"), "ok", this);
+ mOkButton = new Button(_("OK"), "ok", this);
mCancelButton = new Button(_("Cancel"), "cancel", this);
setContentSize(200, 91);
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index a3dfdeae..5d08a2ec 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -100,7 +100,7 @@ ServerDialog::ServerDialog(LoginData *loginData):
mMostUsedServersDropDown = new DropDown(mMostUsedServersListModel);
- mOkButton = new Button(_("Ok"), "connect", this);
+ mOkButton = new Button(_("OK"), "connect", this);
mCancelButton = new Button(_("Cancel"), "cancel", this);
mServerNameField->setActionEventId("connect");
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 3a4fb75c..7698098c 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -41,7 +41,7 @@
#include "utils/stringutils.h"
#include "utils/xml.h"
-static const char *SKILLS_FILE = _("skills.xml");
+static const char *SKILLS_FILE = "skills.xml";
struct SkillInfo
{
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index 593a49a3..91224359 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -75,7 +75,7 @@ StorageWindow::StorageWindow(int invSize):
mUsedSlots = player_node->getStorage()->getNumberOfSlotsUsed();
- mSlotsLabel = new Label(_("Slots: "));
+ mSlotsLabel = new Label(_("Slots:"));
mSlotsBar = new ProgressBar(0.0f, 100, 20, gcn::Color(225, 200, 25));
mSlotsBar->setText(strprintf("%d/%d", mUsedSlots, mMaxSlots));
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 1e7faa97..3abb985e 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -308,7 +308,7 @@ void TradeWindow::action(const gcn::ActionEvent &event)
int curMoney = player_node->getMoney();
if(v > curMoney)
{
- localChatTab->chatLog(_("You don't have enough money"), BY_SERVER);
+ localChatTab->chatLog(_("You don't have enough money."), BY_SERVER);
v = curMoney;
}
Net::getTradeHandler()->setMoney(v);
--
cgit v1.2.3-70-g09d2