widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/wui into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/wui/+merge/238246

Small fix for worker names in building window.
-- 
https://code.launchpad.net/~widelands-dev/widelands/wui/+merge/238246
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/wui into lp:widelands.

=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2014-09-18 18:52:34 +0000
+++ src/wui/buildingwindow.cc	2014-10-14 08:02:54 +0000
@@ -205,6 +205,7 @@
 						(capsbuttons, is_stopped ? "continue" : "stop", 0, 0, 34, 34,
 						 g_gr->images().get("pics/but4.png"),
 						 g_gr->images().get((is_stopped ? "pics/continue.png" : "pics/stop.png")),
+						 /** TRANSLATORS: Stop/Continue toggle button for production sites. */
 						 is_stopped ? _("Continue") : _("Stop"));
 				stopbtn->sigclicked.connect(boost::bind(&BuildingWindow::act_start_stop, boost::ref(*this)));
 				capsbuttons->add

=== modified file 'src/wui/productionsitewindow.cc'
--- src/wui/productionsitewindow.cc	2014-09-18 18:52:34 +0000
+++ src/wui/productionsitewindow.cc	2014-10-14 08:02:54 +0000
@@ -78,7 +78,7 @@
 		m_worker_table = new UI::Table<uintptr_t>(worker_box, 0, 0, 0, 100);
 		m_worker_caps = new UI::Box(worker_box, 0, 0, UI::Box::Horizontal);
 
-		m_worker_table->add_column(150, (ngettext
+		m_worker_table->add_column(210, (ngettext
 			("Worker", "Workers", productionsite().descr().nr_working_positions())
 		));
 		m_worker_table->add_column(60, _("Exp"));
@@ -185,8 +185,8 @@
 						(worker->descr().becomes())->descname());
 			} else {
 				// Worker is not upgradeable
-				er.set_string(1, "---");
-				er.set_string(2, "---");
+				er.set_string(1, "—");
+				er.set_string(2, "—");
 			}
 		} else if (request) {
 			const Widelands::WorkerDescr * desc =