From d43b496e6965310ede1e50cfb66a0abf521fd1a4 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Sat, 14 Apr 2018 17:40:05 -0400
Subject: [PATCH] Fix #2894

---
 data/core/editor/time-of-day.cfg       | 3 ++-
 src/game_initialization/lobby_data.cpp | 4 ++--
 src/gui/dialogs/addon/manager.cpp      | 4 ++--
 src/gui/dialogs/campaign_selection.cpp | 2 +-
 src/gui/dialogs/multiplayer/lobby.cpp  | 2 +-
 src/reports.cpp                        | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/data/core/editor/time-of-day.cfg b/data/core/editor/time-of-day.cfg
index 205a7dc7f932..0caf5d56c141 100644
--- a/data/core/editor/time-of-day.cfg
+++ b/data/core/editor/time-of-day.cfg
@@ -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]
 
diff --git a/src/game_initialization/lobby_data.cpp b/src/game_initialization/lobby_data.cpp
index eca8d47ce7c1..e5c325439d49 100644
--- a/src/game_initialization/lobby_data.cpp
+++ b/src/game_initialization/lobby_data.cpp
@@ -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();
diff --git a/src/gui/dialogs/addon/manager.cpp b/src/gui/dialogs/addon/manager.cpp
index 8dcc670356d9..29cd81beb2dd 100644
--- a/src/gui/dialogs/addon/manager.cpp
+++ b/src/gui/dialogs/addon/manager.cpp
@@ -882,7 +882,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;
 
@@ -896,7 +896,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;
 
diff --git a/src/gui/dialogs/campaign_selection.cpp b/src/gui/dialogs/campaign_selection.cpp
index ac96501666e5..51f58c7f7bfd 100644
--- a/src/gui/dialogs/campaign_selection.cpp
+++ b/src/gui/dialogs/campaign_selection.cpp
@@ -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);
diff --git a/src/gui/dialogs/multiplayer/lobby.cpp b/src/gui/dialogs/multiplayer/lobby.cpp
index f39537c61557..e3d313897239 100644
--- a/src/gui/dialogs/multiplayer/lobby.cpp
+++ b/src/gui/dialogs/multiplayer/lobby.cpp
@@ -463,7 +463,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";
diff --git a/src/reports.cpp b/src/reports.cpp
index 8ae9a1876c53..1869eb4b7354 100644
--- a/src/reports.cpp
+++ b/src/reports.cpp
@@ -890,7 +890,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) {