upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 20:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2894

Browse Source 
(cherry-picked from commit 0f267d0ede3e8479e1e68a171e74b0cc420da51d)
This commit is contained in:
Celtic Minstrel 2018-04-14 17:40:05 -04:00
parent ef9c2b7e2c
commit 60d9bc27ae
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/core/editor/time-of-day.cfg
View File

@ -2,7 +2,8 @@
# Editor time-of-day schedule definitions
[editor_times]
name= _ "None"
#po: Describes a scenario in the editor that has not set a time of day schedule
name= _ "time of day^None"
id=empty
[/editor_times]

4
src/game_initialization/lobby_data.cpp
View File

@ -452,7 +452,7 @@ game_info::game_info(const config& game, const config& game_config, const std::v
} else if(shroud) {
vision = _("Shroud");
} else {
vision = _("none");
vision = _("vision^none");
}
if(game["mp_countdown"].to_bool()) {
@ -461,7 +461,7 @@ game_info::game_info(const config& game, const config& game_config, const std::v
<< game["mp_countdown_turn_bonus"].str() << "/"
<< game["mp_countdown_action_bonus"].str();
} else {
time_limit = _("none");
time_limit = _("time limit^none");
}
map_info = info_stream.str();

4
src/gui/dialogs/addon/manager.cpp
View File

@ -881,7 +881,7 @@ void addon_manager::on_addon_select(window& window)
find_widget<styled_widget>(parent, "dependencies", false).set_label(!info->depends.empty()
? make_display_dependencies(info->id, addons_, tracking_info_)
: _("None"));
: _("addon_dependencies^None"));
std::string languages;
@ -895,7 +895,7 @@ void addon_manager::on_addon_select(window& window)
}
}
find_widget<styled_widget>(parent, "translations", false).set_label(!languages.empty() ? languages : _("None"));
find_widget<styled_widget>(parent, "translations", false).set_label(!languages.empty() ? languages : _("translations^None"));
const std::string& feedback_url = info->feedback_url;

2
src/gui/dialogs/campaign_selection.cpp
View File

@ -271,7 +271,7 @@ void campaign_selection::pre_show(window& window)
connect_signal_notify_modified(mods_menu, std::bind(&campaign_selection::mod_toggled, this, std::ref(window)));
} else {
mods_menu.set_active(false);
mods_menu.set_label(_("None"));
mods_menu.set_label(_("active_modifications^None"));
}
campaign_selected(window);

2
src/gui/dialogs/multiplayer/lobby.cpp
View File

@ -456,7 +456,7 @@ void mp_lobby::adjust_game_row_contents(const mp::game_info& game, grid* grid, b
std::vector<std::string> mods = utils::split(game.mod_info);
if(mods.empty()) {
ss << _("None") << "\n";
ss << _("active_modifications^None") << "\n";
} else {
for(const std::string& mod : mods) {
ss << mod << "\n";

2
src/reports.cpp
View File

@ -889,7 +889,7 @@ static config unit_weapons(reports::context & rc, const unit *attacker, const ma
int base_damage = 0;
int num_blows = 0;
int chance_to_hit = 0;
t_string weapon_name = _("None");
t_string weapon_name = _("weapon^None");
color_t dmg_color = font::weapon_color;
if (context_unit_stats.weapon) {