Merge branch 'master' of github.com:supertuxkart/stk-code

This commit is contained in:
hiker 2014-12-03 10:41:22 +11:00
commit 8e8d7cfc19
3 changed files with 3 additions and 3 deletions

View File

@ -57,7 +57,7 @@ void CreateServerScreen::loadedFromFile()
m_name_widget = getWidget<TextBoxWidget>("name");
assert(m_name_widget != NULL);
m_name_widget->setText(PlayerManager::getCurrentOnlineUserName() + _("'s server"));
m_name_widget->setText(_("%s's server", PlayerManager::getCurrentOnlineUserName()));
m_max_players_widget = getWidget<SpinnerWidget>("max_players");
assert(m_max_players_widget != NULL);
m_max_players_widget->setValue(8);

View File

@ -155,7 +155,7 @@ void UserInfoDialog::sendFriendRequest()
true, false);
ProfileManager::get()->getProfileByID(id)->setRelationInfo(info);
OnlineProfileFriends::getInstance()->refreshFriendsList();
info_text = _("Friend request send!");
info_text = _("Friend request sent!");
}
else
{

View File

@ -899,7 +899,7 @@ void TrackObjectPresentationActionTrigger::onTriggerItemApproached(Item* who)
DeviceConfig* config = device->getConfiguration();
irr::core::stringw fire = config->getBindingAsString(PA_FIRE);
new TutorialMessageDialog(_("Press <B> to look behind, to fire the weapon with <%s> while pressing <B> to to fire behind!", fire),
new TutorialMessageDialog(_("Press <B> to look behind, and fire the weapon with <%s> while pressing <B> to fire behind!", fire),
true);
}
else if (m_action == "tutorial_nitro_collect")