summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/charcreatedialog.cpp4
-rw-r--r--src/gui/charselectdialog.cpp2
-rw-r--r--src/gui/chat.cpp1
-rw-r--r--src/gui/debugwindow.cpp2
-rw-r--r--src/gui/emoteshortcutcontainer.cpp2
-rw-r--r--src/gui/guildwindow.cpp10
-rw-r--r--src/gui/login.cpp2
-rw-r--r--src/gui/npcdialog.cpp3
-rw-r--r--src/gui/palette.cpp12
-rw-r--r--src/gui/popupmenu.cpp7
-rw-r--r--src/gui/recorder.cpp1
-rw-r--r--src/gui/setup_keyboard.cpp2
-rw-r--r--src/gui/setup_video.cpp16
-rw-r--r--src/gui/skilldialog.cpp13
-rw-r--r--src/gui/speechbubble.cpp2
-rw-r--r--src/gui/statuswindow.cpp4
-rw-r--r--src/gui/trade.cpp4
-rw-r--r--src/gui/updatewindow.cpp5
-rw-r--r--src/gui/widgets/channeltab.cpp9
-rw-r--r--src/gui/widgets/whispertab.cpp2
-rw-r--r--src/gui/windowmenu.cpp4
21 files changed, 61 insertions, 46 deletions
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index f679072d..e09eee55 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -70,10 +70,10 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
// TRANSLATORS: This is a narrow symbol used to denote 'previous'.
// You may change this symbol if your language uses another.
mPrevHairColorButton = new Button(_("<"), "prevcolor", this);
- mHairColorLabel = new Label(_("Hair Color:"));
+ mHairColorLabel = new Label(_("Hair color:"));
mNextHairStyleButton = new Button(_(">"), "nextstyle", this);
mPrevHairStyleButton = new Button(_("<"), "prevstyle", this);
- mHairStyleLabel = new Label(_("Hair Style:"));
+ mHairStyleLabel = new Label(_("Hair style:"));
mCreateButton = new Button(_("Create"), "create", this);
mCancelButton = new Button(_("Cancel"), "cancel", this);
mMale = new RadioButton(_("Male"), "gender");
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 1387bce5..69a627e1 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -118,7 +118,7 @@ CharSelectDialog::CharSelectDialog(LockedArray<LocalPlayer*> *charInfo,
mNameLabel = new Label(strprintf(_("Name: %s"), ""));
mLevelLabel = new Label(strprintf(_("Level: %d"), 0));
- mMoneyLabel = new Label(strprintf(_("Money: %d"), 0));
+ mMoneyLabel = new Label(strprintf(_("Money: %s"), ""));
// Control that shows the Player
mPlayerBox = new PlayerBox;
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index fa078983..c337d33b 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -40,6 +40,7 @@
#include "net/net.h"
#include "utils/dtor.h"
+#include "utils/gettext.h"
#include "utils/stringutils.h"
#include <guichan/focushandler.hpp>
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 1ddadba4..59c0f254 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -51,7 +51,7 @@ DebugWindow::DebugWindow():
mMapLabel = new Label(strprintf(_("Map: %s"), ""));
mMinimapLabel = new Label(strprintf(_("Minimap: %s"), ""));
mTileMouseLabel = new Label(strprintf(_("Tile: (%d, %d)"), 0, 0));
- mParticleCountLabel = new Label(strprintf(_("Particle Count: %d"), 0));
+ mParticleCountLabel = new Label(strprintf(_("Particle count: %d"), 0));
place(0, 0, mFPSLabel, 3);
place(3, 0, mTileMouseLabel);
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index 8e37be72..c087fc7e 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -39,8 +39,6 @@
#include "resources/resourcemanager.h"
#include "utils/dtor.h"
-#include "utils/gettext.h"
-#include "utils/stringutils.h"
static const int MAX_ITEMS = 12;
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 5b525b83..05af7780 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -114,7 +114,7 @@ void GuildWindow::action(const gcn::ActionEvent &event)
// Set focus so that guild name to be created can be typed.
mFocus = true;
guildDialog = new TextDialog(_("Guild Name"),
- _("Choose your guild's name"), this);
+ _("Choose your guild's name."), this);
guildDialog->setOKButtonActionId("CREATE_GUILD_OK");
guildDialog->addActionListener(this);
}
@@ -133,7 +133,7 @@ void GuildWindow::action(const gcn::ActionEvent &event)
if (guild)
{
Net::ChatServer::Guild::quitGuild(guild);
- localChatTab->chatLog(strprintf(_("Guild %s quit"),
+ localChatTab->chatLog(strprintf(_("Guild %s quit."),
mGuildTabs->getSelectedTab()->getCaption().c_str()), BY_SERVER);
}
}
@@ -150,7 +150,7 @@ void GuildWindow::action(const gcn::ActionEvent &event)
// Defocus dialog
mFocus = false;
- localChatTab->chatLog(strprintf(_("Creating Guild called %s"),
+ localChatTab->chatLog(strprintf(_("Creating guild called %s."),
name.c_str()), BY_SERVER);
guildDialog->scheduleDelete();
}
@@ -164,7 +164,7 @@ void GuildWindow::action(const gcn::ActionEvent &event)
// Defocus dialog
mFocus = false;
- localChatTab->chatLog(strprintf(_("Invited user %s"), name.c_str()), BY_SERVER);
+ localChatTab->chatLog(strprintf(_("Invited user %s."), name.c_str()), BY_SERVER);
inviteDialog->scheduleDelete();
}
else if (eventId == "yes")
@@ -240,7 +240,7 @@ short GuildWindow::getSelectedGuild()
void GuildWindow::openAcceptDialog(const std::string &inviterName,
const std::string &guildName)
{
- std::string msg = strprintf(_("%s has invited you to join the guild %s"),
+ std::string msg = strprintf(_("%s has invited you to join the guild %s."),
inviterName.c_str(), guildName.c_str());
localChatTab->chatLog(msg, BY_SERVER);
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 77f2e137..3b63eff1 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -70,7 +70,7 @@ LoginDialog::LoginDialog(LoginData *loginData):
mServerDropDown = new DropDown(mServerList);
#endif
- mKeepCheck = new CheckBox(_("Remember Username"), mLoginData->remember);
+ mKeepCheck = new CheckBox(_("Remember username"), mLoginData->remember);
mOkButton = new Button(_("OK"), "ok", this);
mCancelButton = new Button(_("Cancel"), "cancel", this);
mRegisterButton = new Button(_("Register"), "register", this);
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 186a99a9..1956ba85 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -156,7 +156,8 @@ void NpcDialog::action(const gcn::ActionEvent &event)
if (mActionState == NPC_ACTION_NEXT)
{
nextDialog();
- addText("\n> Next\n");
+ // TRANSLATORS: Please leave the \n sequences intact.
+ addText(_("\n> Next\n"));
}
else if (mActionState == NPC_ACTION_CLOSE)
{
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index ac04d9b5..a807dcd6 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -90,8 +90,8 @@ Palette::Palette() :
addColor(HIGHLIGHT, 0xebc873, STATIC, _("Highlight"), 'H');
addColor(TAB_HIGHLIGHT, 0xff0000, PULSE, indent + _("Tab Highlight"));
- addColor(SHOP_WARNING, 0x910000, STATIC, indent + _("Item too expensive"));
- addColor(ITEM_EQUIPPED, 0x000091, STATIC, indent + _("Item is equipped"));
+ addColor(SHOP_WARNING, 0x910000, STATIC, indent + _("Item Too Expensive"));
+ addColor(ITEM_EQUIPPED, 0x000091, STATIC, indent + _("Item Is Equipped"));
addColor(CHAT, 0x000000, STATIC, _("Chat"), 'C');
addColor(GM, 0xff0000, STATIC, indent + _("GM"), 'G');
@@ -115,10 +115,10 @@ Palette::Palette() :
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(ONEHAND, 0xf42a2a, STATIC, indent + _("One Handed Weapons"));
addColor(LEGS, 0x699900, STATIC, indent + _("Pants"));
addColor(FEET, 0xaa1d48, STATIC, indent + _("Shoes"));
- addColor(TWOHAND, 0xf46d0e, STATIC, indent + _("2 Handed Weapons"));
+ addColor(TWOHAND, 0xf46d0e, STATIC, indent + _("Two Handed Weapons"));
addColor(SHIELD, 0x9c2424, STATIC, indent + _("Shields"));
addColor(RING, 0x0000ff, STATIC, indent + _("Rings"));
addColor(NECKLACE, 0xff00ff, STATIC, indent + _("Necklaces"));
@@ -129,9 +129,9 @@ Palette::Palette() :
addColor(PICKUP_INFO, 0x28dc28, STATIC, indent + _("Pickup Notification"));
addColor(EXP_INFO, 0xffff00, STATIC, indent + _("Exp Notification"));
addColor(HIT_PLAYER_MONSTER, 0x0064ff, STATIC,
- indent + _("Player hits Monster"));
+ indent + _("Player Hits Monster"));
addColor(HIT_MONSTER_PLAYER, 0xff3232, STATIC,
- indent + _("Monster hits Player"));
+ indent + _("Monster Hits Player"));
addColor(HIT_CRITICAL, 0xff0000, RAINBOW, indent + _("Critical Hit"));
addColor(MISS, 0xffff00, STATIC, indent + _("Misses"));
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 3e3f0a78..0f0df756 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -84,8 +84,9 @@ void PopupMenu::showPopup(int x, int y, Being *being)
// Players can be traded with. Later also follow and
// add as buddy will be options in this menu.
mBrowserBox->addRow(strprintf("@@trade|%s@@",
- strprintf(_("Trade With %s"),
+ strprintf(_("Trade with %s"),
name.c_str()).c_str()));
+ // TRANSLATORS: Attacking a player.
mBrowserBox->addRow(strprintf("@@attack|%s@@",
strprintf(_("Attack %s"),
name.c_str()).c_str()));
@@ -109,7 +110,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
case PlayerRelation::DISREGARDED:
mBrowserBox->addRow(strprintf("@@unignore|%s@@",
- strprintf(_("Un-Ignore %s"),
+ strprintf(_("Unignore %s"),
name.c_str()).c_str()));
mBrowserBox->addRow(strprintf("@@ignore|%s@@",
strprintf(_("Completely ignore %s"),
@@ -118,7 +119,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
case PlayerRelation::IGNORED:
mBrowserBox->addRow(strprintf("@@unignore|%s@@",
- strprintf(_("Un-Ignore %s"),
+ strprintf(_("Unignore %s"),
name.c_str()).c_str()));
break;
}
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index 3307d904..b2679553 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -28,6 +28,7 @@
#include "gui/widgets/layout.h"
#include "gui/widgets/windowcontainer.h"
+#include "utils/gettext.h"
#include "utils/stringutils.h"
#include <physfs.h>
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 938c1c4e..d9117b8a 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -116,7 +116,7 @@ void Setup_Keyboard::apply()
if (keyboard.hasConflicts())
{
- new OkDialog(_("Key Conflict(s) Detected."),
+ new OkDialog(_("Key Conflict(s) Detected"),
_("Resolve them, or gameplay may result in strange "
"behaviour."));
}
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 903196c6..f21f20e0 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -194,13 +194,15 @@ Setup_Video::Setup_Video():
mParticleEffectsEnabled)),
mNameCheckBox(new CheckBox(_("Show own name"), mNameEnabled)),
mPickupNotifyLabel(new Label(_("Show pickup notification"))),
+ // TRANSLATORS: Refers to "Show own name"
mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
+ // TRANSLATORS: Refers to "Show own name"
mPickupParticleCheckBox(new CheckBox(_("as particle"),
mPickupParticleEnabled)),
mSpeechSlider(new Slider(0, 3)),
mSpeechLabel(new Label("")),
mAlphaSlider(new Slider(0.2, 1.0)),
- mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
+ mFpsCheckBox(new CheckBox(_("FPS limit:"))),
mFpsSlider(new Slider(10, 120)),
mFpsField(new TextField),
mOverlayDetail((int) config.getValue("OverlayDetail", 2)),
@@ -219,7 +221,7 @@ Setup_Video::Setup_Video():
speechLabel = new Label(_("Overhead text"));
alphaLabel = new Label(_("Gui opacity"));
overlayDetailLabel = new Label(_("Ambient FX"));
- particleDetailLabel = new Label(_("Particle Detail"));
+ particleDetailLabel = new Label(_("Particle detail"));
fontSizeLabel = new Label(_("Font size"));
mFontSizeDropDown = new DropDown(new FontSizeChoiceListModel);
@@ -372,7 +374,7 @@ void Setup_Video::apply()
}
else
{
- new OkDialog(_("Switching to full screen"),
+ new OkDialog(_("Switching to Full Screen"),
_("Restart needed for changes to take effect."));
}
#endif
@@ -385,7 +387,7 @@ void Setup_Video::apply()
config.setValue("opengl", mOpenGLCheckBox->isSelected());
// OpenGL can currently only be changed by restarting, notify user.
- new OkDialog(_("Changing OpenGL"),
+ new OkDialog(_("Changing to OpenGL"),
_("Applying change to OpenGL requires restart."));
}
@@ -448,12 +450,12 @@ void Setup_Video::action(const gcn::ActionEvent &event)
if (width != graphics->getWidth() || height != graphics->getHeight())
{
if (width < graphics->getWidth() || height < graphics->getHeight())
- new OkDialog(_("Screen resolution changed"),
+ new OkDialog(_("Screen Resolution Changed"),
_("Restart your client for the change to take effect.")
+ std::string("\n") +
_("Some windows may be moved to fit the lowered resolution."));
else
- new OkDialog(_("Screen resolution changed"),
+ new OkDialog(_("Screen Resolution Changed"),
_("Restart your client for the change to take effect."));
}
@@ -478,7 +480,7 @@ void Setup_Video::action(const gcn::ActionEvent &event)
mParticleEffectsCheckBox->isSelected());
if (engine)
{
- new OkDialog(_("Particle effect settings changed."),
+ new OkDialog(_("Particle Effect Settings Changed."),
_("Changes will take effect on map change."));
}
}
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 2f970184..a0bfaf53 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -340,9 +340,18 @@ void SkillEntry::update()
setVisible(true);
- std::string skillLevel("Lvl: " + toString(baseLevel));
+ std::string skillLevel;
+
if (effLevel != baseLevel)
- skillLevel += strprintf(" (%+d)", baseLevel - effLevel);
+ {
+ skillLevel = strprintf(_("Lvl: %d (%+d)"),
+ baseLevel, baseLevel - effLevel);
+ }
+ else
+ {
+ skillLevel = strprintf(_("Lvl: %d"), baseLevel);
+ }
+
mLevelLabel->setCaption(skillLevel);
std::pair<int, int> exp = player_node->getExperience(mInfo->id);
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 959e47ee..c2703327 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -28,8 +28,6 @@
#include "graphics.h"
-#include "utils/gettext.h"
-
#include <guichan/font.hpp>
#include <guichan/widgets/label.hpp>
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index f23f6e4f..6f5f72fa 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -223,11 +223,11 @@ std::string StatusWindow::update(int id)
#endif
else if (id == CHAR_POINTS)
{
- mCharacterPointsLabel->setCaption(strprintf(_("Character Points: %d"),
+ mCharacterPointsLabel->setCaption(strprintf(_("Character points: %d"),
player_node->getCharacterPoints()));
mCharacterPointsLabel->adjustSize();
- mCorrectionPointsLabel->setCaption(strprintf(_("Correction Points: %d"),
+ mCorrectionPointsLabel->setCaption(strprintf(_("Correction points: %d"),
player_node->getCorrectionPoints()));
mCorrectionPointsLabel->adjustSize();
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 77296e64..22eefc14 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -94,7 +94,7 @@ TradeWindow::TradeWindow():
ScrollArea *partnerScroll = new ScrollArea(mPartnerItemContainer);
partnerScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
- mMoneyLabel = new Label(strprintf(_("You get %s."), ""));
+ mMoneyLabel = new Label(strprintf(_("You get %s"), ""));
gcn::Label *mMoneyLabel2 = new Label(_("You give:"));
mMoneyField = new TextField;
@@ -130,7 +130,7 @@ TradeWindow::~TradeWindow()
void TradeWindow::setMoney(int amount)
{
- mMoneyLabel->setCaption(strprintf(_("You get %s."),
+ mMoneyLabel->setCaption(strprintf(_("You get %s"),
Units::formatCurrency(amount).c_str()));
mMoneyLabel->adjustSize();
}
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 6ea5e1ca..bb2128b4 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -444,10 +444,13 @@ void UpdaterWindow::logic()
}
mThread = NULL;
}
+ // TODO: Only send complete sentences to gettext
mBrowserBox->addRow("");
mBrowserBox->addRow(_("##1 The update process is incomplete."));
+ // TRANSLATORS: Continues "you try again later.".
mBrowserBox->addRow(_("##1 It is strongly recommended that"));
- mBrowserBox->addRow(_("##1 you try again later"));
+ // TRANSLATORS: Begins "It is strongly recommended that".
+ mBrowserBox->addRow(_("##1 you try again later."));
mBrowserBox->addRow(mCurlError);
mScrollArea->setVerticalScrollAmount(
mScrollArea->getVerticalMaxScroll());
diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp
index e3edbba0..8b055a22 100644
--- a/src/gui/widgets/channeltab.cpp
+++ b/src/gui/widgets/channeltab.cpp
@@ -72,23 +72,24 @@ bool ChannelTab::handleCommand(const std::string &type,
{
chatLog(_("Command: /quit"));
chatLog(_("This command leaves the current channel."));
- chatLog(_("If you're the last person in the channel, it will be deleted."));
+ chatLog(_("If you're the last person in the channel, "
+ "it will be deleted."));
}
else if (args == "op")
{
chatLog(_("Command: /op <nick>"));
chatLog(_("This command makes <nick> a channel operator."));
chatLog(_("If the <nick> has spaces in it, enclose it in "
- "double quotes (\")."));
+ "double quotes (\")."));
chatLog(_("Channel operators can kick and op other users "
- "from the channel."));
+ "from the channel."));
}
else if (args == "kick")
{
chatLog(_("Command: /kick <nick>"));
chatLog(_("This command makes <nick> leave the channel."));
chatLog(_("If the <nick> has spaces in it, enclose it in "
- "double quotes (\")."));
+ "double quotes (\")."));
}
else
return false;
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index bc0d54d0..5509a589 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -91,7 +91,7 @@ bool WhisperTab::handleCommand(const std::string &type,
{
chatLog(_("Command: /unignore <player>"));
chatLog(_("This command stops ignoring the other player if they "
- "are being ignored"));
+ "are being ignored."));
}
else
return false;
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 8964f072..96776617 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -62,7 +62,7 @@ WindowMenu::WindowMenu():
#ifdef TMWSERV_SUPPORT
N_("Magic"),
N_("Guilds"),
- N_("Buddys"),
+ N_("Buddies"),
#endif
N_("Shortcut"),
N_("Setup"),
@@ -138,7 +138,7 @@ void WindowMenu::action(const gcn::ActionEvent &event)
{
window = guildWindow;
}
- else if (event.getId() == "Buddys")
+ else if (event.getId() == "Buddies")
{
window = buddyWindow;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-30 17:29:41 +0000