Index: ps/trunk/binaries/data/mods/public/gui/session/ResearchProgress.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/ResearchProgress.js
+++ ps/trunk/binaries/data/mods/public/gui/session/ResearchProgress.js
@@ -117,4 +117,4 @@
ResearchProgressButton.prototype.CountdownFormat = markForTranslationWithContext("countdown format", "m:ss");
// Translation: String displayed when the research is paused. E.g. by being garrisoned or when not the first item in the queue.
-ResearchProgressButton.prototype.PausedResearchString = markForTranslation("(This item is paused.)");
+ResearchProgressButton.prototype.PausedResearchString = markForTranslation("This item is paused.");
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js
@@ -594,7 +594,7 @@
Engine.GetGUIObjectByName("unitQueuePausedIcon[" + data.i + "]").hidden = !queuedItem.paused;
if (queuedItem.paused)
// Translation: String displayed when the research is paused. E.g. by being garrisoned or when not the first item in the queue.
- data.button.tooltip += "\n" + translate("(This item is paused.)");
+ data.button.tooltip += "\n" + translate("This item is paused.");
}
if (template.icon)
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml
@@ -14,7 +14,7 @@
-
+
Index: ps/trunk/binaries/data/mods/public/simulation/components/Trainer.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Trainer.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Trainer.js
@@ -350,7 +350,13 @@
Trainer.prototype.Item.prototype.Pause = function()
{
- this.paused = true;
+ if (this.started)
+ this.paused = true;
+ else if (this.missingPopSpace)
+ {
+ delete this.missingPopSpace;
+ QueryOwnerInterface(this.trainer)?.UnBlockTraining();
+ }
};
Trainer.prototype.Item.prototype.Unpause = function()