summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-22 15:48:23 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-22 15:48:23 +0300
commit10e6403739611bdc0ea06cf0ed55a0674f111100 (patch)
tree7c5c97dbe23b39b84bf23bcf99e565ddac32b838 /src
parent797733823a46e1423334c3c693f0071286bac2a7 (diff)
downloadManaVerse-10e6403739611bdc0ea06cf0ed55a0674f111100.tar.gz
ManaVerse-10e6403739611bdc0ea06cf0ed55a0674f111100.tar.bz2
ManaVerse-10e6403739611bdc0ea06cf0ed55a0674f111100.tar.xz
ManaVerse-10e6403739611bdc0ea06cf0ed55a0674f111100.zip
Some typo fixes and add comments for translators.
Diffstat (limited to 'src')
-rw-r--r--src/gui/debugwindow.cpp9
-rw-r--r--src/gui/npcdialog.cpp1
-rw-r--r--src/gui/popupmenu.cpp2
-rw-r--r--src/gui/shopwindow.cpp4
-rw-r--r--src/gui/windowmenu.cpp2
-rw-r--r--src/mumblemanager.cpp8
-rw-r--r--src/net/tmwa/partyhandler.cpp4
-rw-r--r--src/net/tmwa/playerhandler.cpp2
-rw-r--r--src/net/tmwa/tradehandler.cpp2
9 files changed, 18 insertions, 16 deletions
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index ddd2bc7db..b3e19e3e5 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -133,12 +133,13 @@ MapDebugTab::MapDebugTab() :
mMusicFileLabel = new Label(strprintf(_("Music:")));
mMapLabel = new Label(strprintf(_("Map:")));
mMinimapLabel = new Label(strprintf(_("Minimap:")));
- mTileMouseLabel = new Label(strprintf(_("Cursor: (%d, %d)"), 0, 0));
+ mTileMouseLabel = new Label(strprintf("%s (%d, %d)", _("Cursor:"), 0, 0));
mXYLabel = new Label(strprintf("%s (?,?)", _("Player Position:")));
- mParticleCountLabel = new Label(strprintf(_("Particle count: %d"), 88888));
- mMapActorCountLabel = new Label(strprintf(
- _("Map actors count: %d"), 88888));
+ mParticleCountLabel = new Label(strprintf("%s %d",
+ _("Particle count:"), 88888));
+ mMapActorCountLabel = new Label(strprintf("%s %d",
+ _("Map actors count:"), 88888));
mUpdateTime = 0;
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index af89a6881..a6a3f085e 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -205,7 +205,6 @@ void NpcDialog::action(const gcn::ActionEvent &event)
return;
nextDialog();
- // TRANSLATORS: Please leave the \n sequences intact.
addText(_("> Next"), false);
}
else if (mActionState == NPC_ACTION_CLOSE)
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 7063d9ce4..88ae0e376 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -1112,7 +1112,9 @@ void PopupMenu::handleLink(const std::string &link,
else if (link == "rename map" && mMapItem)
{
mRenameListener.setMapItem(mMapItem);
+ // TRANSLATORS: number of chars in string should be near original
mDialog = new TextDialog(_("Rename map sign "),
+ // TRANSLATORS: number of chars in string should be near original
_("Name: "));
mRenameListener.setDialog(mDialog);
mDialog->setText(mMapItem->getComment());
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 72553ea01..81710dda3 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -683,7 +683,7 @@ void ShopWindow::processRequest(std::string nick, std::string data, int mode)
if (!item2 || item2->getQuantity() < amount
|| !findShopItem(mTradeItem, SELL))
{
- sendMessage(nick, "error: Cant sell this item ", true);
+ sendMessage(nick, "error: Can't sell this item ", true);
return;
}
msg = "buy";
@@ -693,7 +693,7 @@ void ShopWindow::processRequest(std::string nick, std::string data, int mode)
{
if (!findShopItem(mTradeItem, BUY))
{
- sendMessage(nick, "error: Cant buy this item ", true);
+ sendMessage(nick, "error: Can't buy this item ", true);
return;
}
msg = "sell";
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 5a7b700d7..5e93d5c69 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -65,7 +65,7 @@ WindowMenu::WindowMenu():
KeyboardConfig::KEY_NO_VALUE);
addButton(N_("KS"), _("Kill stats"), x, h,
KeyboardConfig::KEY_WINDOW_KILLS);
- addButton(":-)", _("Smiles"), x, h,
+ addButton(":-)", _("Smilies"), x, h,
KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT);
addButton(N_("STA"), _("Status"), x, h, KeyboardConfig::KEY_WINDOW_STATUS);
addButton(N_("EQU"), _("Equipment"), x, h,
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index fa09908d6..aecb28bc0 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -84,7 +84,7 @@ void MumbleManager::init()
FALSE, L"MumbleLink");
if (hMapObject == NULL)
{
- logger->log1("MumbleManager::init cant open MumbleLink");
+ logger->log1("MumbleManager::init can't open MumbleLink");
return;
}
@@ -95,7 +95,7 @@ void MumbleManager::init()
{
CloseHandle(hMapObject);
hMapObject = NULL;
- logger->log1("MumbleManager::init cant map MumbleLink");
+ logger->log1("MumbleManager::init can't map MumbleLink");
return;
}
#elif defined __FreeBSD__ || defined __DragonFly__
@@ -107,7 +107,7 @@ void MumbleManager::init()
if (shmfd < 0)
{
- logger->log1("MumbleManager::init cant open shared memory MumbleLink");
+ logger->log1("MumbleManager::init can't open shared memory MumbleLink");
return;
}
@@ -117,7 +117,7 @@ void MumbleManager::init()
if (mLinkedMem == reinterpret_cast<void *>(-1))
{
mLinkedMem = NULL;
- logger->log1("MumbleManager::init cant map MumbleLink");
+ logger->log1("MumbleManager::init can't map MumbleLink");
return;
}
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 10d2a20f0..aff5f1f4a 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -138,7 +138,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
if (partyTab && names.find(nick) == names.end())
{
partyTab->chatLog(strprintf(
- _("%s has join your party."),
+ _("%s has joined your party."),
nick.c_str()), BY_SERVER);
}
}
@@ -189,7 +189,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
break;
case 3:
partyTab->chatLog(strprintf(
- _("%s cant joid your party because party is "
+ _("%s can't joid your party because party is "
"full."), nick.c_str()), BY_SERVER);
break;
default:
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 4a9926cfd..385c7ca15 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -349,7 +349,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
weightNoticeTime = cur_time + 10;
weightNotice = new OkDialog(_("Message"),
_("You are carrying less than "
- "half your weight. You are "
+ "half your weight. You "
"can regain health."), false);
weightNotice->addActionListener(
&weightListener);
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index cc7ad6e27..19c32bd71 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -256,7 +256,7 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
case 3:
// Add item failed - non tradable item
SERVER_NOTICE(_("Failed adding item. You "
- "cant trade this item."))
+ "can't trade this item."))
break;
default:
SERVER_NOTICE(_("Failed adding item for "