Skip to content

Commit

Permalink
Revert "fixup user displayed strings", this broke the stringfreeze
Browse files Browse the repository at this point in the history
This reverts commit 6d79c41.

Breaking the stringfreeze was not agreed on. What I said was:
20140413 18:54:49< Ivanovic> just add it to the list of 1.12.1 changes

Meaning: wait with this change until 1.12.0 is released and the first
bugfix release is being worked on
  • Loading branch information
ivanovic committed Apr 21, 2014
1 parent 24758c5 commit 1397f83
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/multiplayer_lobby.cpp
Expand Up @@ -873,14 +873,14 @@ lobby::lobby(game_display& disp, const config& cfg, chat& c, config& gamelist) :
search_string_(preferences::fi_text())
{
std::vector<std::string> replay_options_strings_;
replay_options_strings_.push_back(_("Normal replays"));
replay_options_strings_.push_back(_("Normal"));
replay_options_strings_.push_back(_("Quick replays"));
replay_options_strings_.push_back(_("Enter game blindfolded"));
replay_options_strings_.push_back(_("Enter blindfolded"));

replay_options_.set_items(replay_options_strings_);

std::string help_string1 = _("Skip quickly to the active turn when observing");
std::string help_string2 = _("Do not show the map until given control of a side");
std::string help_string2 = _("Do not show replay turns");
replay_options_.set_help_string(help_string1 + " / " + help_string2);

replay_options_.set_selected(0);
Expand Down
4 changes: 2 additions & 2 deletions src/playmp_controller.cpp
Expand Up @@ -659,7 +659,7 @@ bool playmp_controller::can_execute_command(const hotkey::hotkey_command& cmd, i

void playmp_controller::do_idle_notification()
{
resources::screen->add_chat_message(time(NULL), "", 0,
_ ("This side is in an idle state. To proceed with the game, it must be assigned to another controller. You may use :droid, :control or :give_control for example."),
resources::screen->add_chat_message(time(NULL), "Wesnoth", 0,
"This side is in an idle state. To proceed with the game, the host must assign it to another controller.",
events::chat_handler::MESSAGE_PUBLIC, false);
}

0 comments on commit 1397f83

Please sign in to comment.