diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-10-22 14:19:14 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-10-23 10:09:26 +0200 |
| commit | aadaae7ad2bfea0d1027f3da1fa0286653b580a2 (patch) | |
| tree | 5d13b06aabd89a9d293785c92231a691751f9965 /src | |
| parent | 5d555a7f4ffbfcbd8d112d682235865f616f4d1d (diff) | |
| download | mana-aadaae7ad2bfea0d1027f3da1fa0286653b580a2.tar.gz mana-aadaae7ad2bfea0d1027f3da1fa0286653b580a2.tar.bz2 mana-aadaae7ad2bfea0d1027f3da1fa0286653b580a2.tar.xz mana-aadaae7ad2bfea0d1027f3da1fa0286653b580a2.zip | |
Various small fixes to translatable strings
Mostly adjustments based on feedback from the Finnish translator.
Diffstat (limited to 'src')
| -rw-r--r-- | src/commandhandler.cpp | 2 | ||||
| -rw-r--r-- | src/game.cpp | 5 | ||||
| -rw-r--r-- | src/gui/setup_audio.cpp | 2 | ||||
| -rw-r--r-- | src/gui/setup_interface.cpp | 2 | ||||
| -rw-r--r-- | src/gui/socialwindow.cpp | 5 | ||||
| -rw-r--r-- | src/gui/tradewindow.cpp | 4 | ||||
| -rw-r--r-- | src/localplayer.cpp | 7 | ||||
| -rw-r--r-- | src/net/manaserv/charhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/manaserv/partyhandler.cpp | 13 | ||||
| -rw-r--r-- | src/net/tmwa/gui/guildtab.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/gui/partytab.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/network.cpp | 4 |
12 files changed, 25 insertions, 25 deletions
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index addb7367..9100c9e3 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -243,7 +243,7 @@ void CommandHandler::handleHelp(const std::string &args, ChatTab *tab) { tab->chatLog(_("Command: /query <nick>")); tab->chatLog(_("Command: /q <nick>")); - tab->chatLog(_("This command tries to make a tab for whispers between" + tab->chatLog(_("This command tries to make a tab for whispers between " "you and <nick>.")); } else if (args == "away") diff --git a/src/game.cpp b/src/game.cpp index b66e5253..d55d80dd 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -325,10 +325,7 @@ static bool saveScreenshot() if (success) { - std::ostringstream chatlogentry; - // TODO: Make it one complete gettext string below - chatlogentry << _("Screenshot saved as ") << filenameSuffix.str(); - SERVER_NOTICE(chatlogentry.str()) + SERVER_NOTICE(strprintf(_("Screenshot saved as %s"), filenameSuffix.str().c_str())) } else { diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index 56815e32..6d18e71f 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -47,7 +47,7 @@ Setup_Audio::Setup_Audio(): { setName(_("Audio")); - gcn::Label *sfxLabel = new Label(_("Sfx volume")); + gcn::Label *sfxLabel = new Label(_("SFX volume")); gcn::Label *notificationsLabel = new Label(_("Notifications volume")); gcn::Label *musicLabel = new Label(_("Music volume")); diff --git a/src/gui/setup_interface.cpp b/src/gui/setup_interface.cpp index ffb7b897..3801861b 100644 --- a/src/gui/setup_interface.cpp +++ b/src/gui/setup_interface.cpp @@ -109,7 +109,7 @@ Setup_Interface::Setup_Interface(): mShowMonsterDamageEnabled); speechLabel = new Label(_("Overhead text:")); - alphaLabel = new Label(_("Gui opacity")); + alphaLabel = new Label(_("GUI opacity")); fontSizeLabel = new Label(_("Font size:")); mFontSizeListModel = new FontSizeChoiceListModel; diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 79a0fd53..065d0b0a 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -593,8 +593,7 @@ void SocialWindow::showGuildInvite(const std::string &guildName, // check there isnt already an invite showing if (mGuildInvited != 0) { - SERVER_NOTICE(_("Received guild request, but one already " - "exists.")) + SERVER_NOTICE(_("Received guild request, but one already exists.")) return; } @@ -660,7 +659,7 @@ void SocialWindow::showPartyCreate() if (local_player->getParty()) { new OkDialog(_("Create Party"), - _("Cannot create party. You are already in a party"), + _("Cannot create party. You are already in a party."), true, this); return; } diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index 7094da26..2bcdecff 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -259,8 +259,8 @@ void TradeWindow::action(const gcn::ActionEvent &event) if (mMyInventory->contains(item)) { - SERVER_NOTICE(_("Failed adding item. You can not " - "overlap one kind of item on the window.")) + SERVER_NOTICE(_("Failed adding item. You cannot " + "overlap one kind of item on the window.")) return; } diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 43c54731..f2c1d33d 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -886,9 +886,10 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, int amount, { // TRANSLATORS: This sentence may be translated differently // for different grammatical numbers (singular, plural, ...) - SERVER_NOTICE(strprintf(ngettext("You picked up %d " - "[@@%d|%s@@].", "You picked up %d [@@%d|%s@@].", amount), - amount, itemInfo.id, itemInfo.name.c_str())) + SERVER_NOTICE(strprintf(ngettext("You picked up %d [@@%d|%s@@].", + "You picked up %d [@@%d|%s@@].", + amount), + amount, itemInfo.id, itemInfo.name.c_str())) } if (mMap && config.getBoolValue("showpickupparticle")) diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp index e7afa173..8a922e70 100644 --- a/src/net/manaserv/charhandler.cpp +++ b/src/net/manaserv/charhandler.cpp @@ -163,7 +163,7 @@ void CharHandler::handleCharacterCreateResponse(MessageIn &msg) errorMessage = _("Character's stats are too low."); break; case CREATE_ATTRIBUTES_OUT_OF_RANGE: - errorMessage = strprintf( _("At least one stat" + errorMessage = strprintf( _("At least one stat " "is out of the permitted range: (%u - %u)."), Attributes::getAttributeMinimum(), Attributes::getAttributeMaximum()); diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp index e0ee91a7..8f3618b5 100644 --- a/src/net/manaserv/partyhandler.cpp +++ b/src/net/manaserv/partyhandler.cpp @@ -121,12 +121,15 @@ void PartyHandler::handleMessage(MessageIn &msg) { std::string name = msg.readString(); std::string inviter = msg.readString(); - std::string s; - if (!inviter.empty()) - s = strprintf(_(" on invitation from %s"), inviter.c_str()); + std::string notice; - SERVER_NOTICE(strprintf(_("%s joined the party %s."), - name.c_str(), s.c_str())); + if (inviter.empty()) + notice = strprintf(_("%s joined the party."), name.c_str()); + else + notice = strprintf(_("%s joined the party on invitation from %s."), + name.c_str(), inviter.c_str()); + + SERVER_NOTICE(notice); if (name == local_player->getName()) local_player->setParty(mParty); diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index 9858028e..cd755067 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -53,7 +53,7 @@ void GuildTab::showHelp() chatLog(_("/help > Display this help.")); chatLog(_("/invite > Invite a player to your guild")); chatLog(_("/leave > Leave the guild you are in")); - chatLog(_("/kick > Kick some one from the guild you are in")); + chatLog(_("/kick > Kick someone from the guild you are in")); } bool GuildTab::handleCommand(const std::string &type, const std::string &args) diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 6f1e3b68..24a8cc3e 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -52,7 +52,7 @@ void PartyTab::showHelp() chatLog(_("/help > Display this help.")); chatLog(_("/invite > Invite a player to your party")); chatLog(_("/leave > Leave the party you are in")); - chatLog(_("/kick > Kick some one from the party you are in")); + chatLog(_("/kick > Kick someone from the party you are in")); chatLog(_("/item > Show/change party item sharing options")); chatLog(_("/exp > Show/change party experience sharing options")); } diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index a35d7ffe..5a2dd0d0 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -467,8 +467,8 @@ bool Network::realConnect() if (SDLNet_ResolveHost(&ipAddress, mServer.hostname.c_str(), mServer.port) == -1) { - std::string errorMessage = _("Unable to resolve host \"") + - mServer.hostname + "\""; + std::string errorMessage = strprintf(_("Unable to resolve host \"%s\""), + mServer.hostname.c_str()); setError(errorMessage); logger->log("SDLNet_ResolveHost: %s", errorMessage.c_str()); return false; |