diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 5c5652ed7e0a82ad1b24bfb2dc8d30dcb4f10d5a..5c9554704fabb3c00a2454e5358983417e950ab8 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -44,6 +44,7 @@ import hudson.model.JobPropertyDescriptor;
 import hudson.model.ModelObject;
 import hudson.model.Node;
 import hudson.model.PageDecorator;
+import hudson.model.PaneStatusProperties;
 import hudson.model.ParameterDefinition;
 import hudson.model.ParameterDefinition.ParameterDescriptor;
 import hudson.model.Project;
@@ -134,6 +135,7 @@ import jenkins.model.ModelObjectWithContextMenu;
 
 import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
 import org.apache.commons.jelly.JellyContext;
+import org.apache.commons.jelly.JellyException;
 import org.apache.commons.jelly.JellyTagException;
 import org.apache.commons.jelly.Script;
 import org.apache.commons.jelly.XMLOutput;
@@ -142,10 +144,13 @@ import org.apache.commons.jexl.util.Introspector;
 import org.apache.commons.lang.StringUtils;
 import org.jvnet.tiger_types.Types;
 import org.kohsuke.stapler.Ancestor;
+import org.kohsuke.stapler.MetaClass;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.WebApp;
 import org.kohsuke.stapler.jelly.InternationalizedStringExpression.RawHtmlArgument;
+import org.kohsuke.stapler.jelly.JellyClassTearOff;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -580,6 +585,10 @@ public class Functions {
         return false;
     }
 
+    public static boolean isCollapsed(String paneId) {
+    	return PaneStatusProperties.forCurrentUser().isCollapsed(paneId);
+    }
+    
     /**
      * Finds the given object in the ancestor list and returns its URL.
      * This is used to determine the "current" URL assigned to the given object,
diff --git a/core/src/main/java/hudson/model/PaneStatusProperties.java b/core/src/main/java/hudson/model/PaneStatusProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..9f8be772279f2623ae959beec3488e606bc77959
--- /dev/null
+++ b/core/src/main/java/hudson/model/PaneStatusProperties.java
@@ -0,0 +1,98 @@
+package hudson.model;
+
+import static java.lang.String.format;
+import hudson.Extension;
+import hudson.util.PersistedList;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpSession;
+
+import org.kohsuke.stapler.Stapler;
+
+public class PaneStatusProperties extends UserProperty implements Saveable {
+	
+	private final PersistedList<String> collapsed = new PersistedList<String>(this);
+	
+	private static final PaneStatusProperties FALLBACK = new PaneStatusPropertiesSessionFallback();
+	
+	public boolean isCollapsed(String paneId) {
+		return collapsed.contains(paneId);
+	}
+	
+	/**
+	 * @param paneId panel name
+	 * @return the actual state of panel
+	 */
+	public boolean toggleCollapsed(String paneId) throws IOException {
+		if (collapsed.contains(paneId)) {
+			collapsed.remove(paneId);
+			return false;
+		} else {
+			collapsed.add(paneId);
+			return true;
+		}
+	}
+	
+	public void save() throws IOException {
+        user.save();
+    }
+	
+	private Object readResolve() {
+		collapsed.setOwner(this);
+		return this;
+	}
+	
+	@Extension
+	public static class DescriptorImpl extends UserPropertyDescriptor {
+
+		@Override
+		public UserProperty newInstance(User user) {
+			return new PaneStatusProperties();
+		}
+
+		@Override
+		public String getDisplayName() {
+			return null;
+		}
+		
+		@Override
+		public boolean isEnabled() {
+			return false;
+		}
+		
+	}
+	
+	private static class PaneStatusPropertiesSessionFallback extends PaneStatusProperties {
+		
+		private final String attribute = "jenkins_pane_%s_collapsed";
+		
+		@Override
+		public boolean isCollapsed(String paneId) {
+			final HttpSession session = Stapler.getCurrentRequest().getSession();
+		    return session.getAttribute(format(attribute, paneId)) != null;
+		}
+
+		@Override
+		public boolean toggleCollapsed(String paneId) {
+			final HttpSession session = Stapler.getCurrentRequest().getSession();
+		    final String property = format(attribute, paneId);
+			final Object collapsed = session.getAttribute(property);
+		    if (collapsed == null) {
+		        session.setAttribute(property, true);
+		        return true;
+		    }
+		    session.removeAttribute(property);
+		    return false;
+		}
+	}
+
+	public static PaneStatusProperties forCurrentUser() {
+		final User current = User.current();
+		if (current == null) {
+			return FALLBACK;
+		}
+		return current.getProperty(PaneStatusProperties.class);
+	}
+
+}
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 03ead6b7c3789204cd6c032c820ebbe01ac896d4..539db7ab5eb7430ddb393ba2411c5aeecd5feaf4 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -65,6 +65,7 @@ import hudson.model.LoadBalancer;
 import hudson.model.ManagementLink;
 import hudson.model.NoFingerprintMatch;
 import hudson.model.OverallLoadStatistics;
+import hudson.model.PaneStatusProperties;
 import hudson.model.Project;
 import hudson.model.Queue.FlyweightTask;
 import hudson.model.RestartListener;
@@ -2876,6 +2877,15 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
         return new HttpRedirect(".");
     }
 
+    public HttpResponse doToggleCollapse() throws ServletException, IOException {
+    	final StaplerRequest request = Stapler.getCurrentRequest();
+    	final String paneId = request.getParameter("paneId");
+    	
+    	PaneStatusProperties.forCurrentUser().toggleCollapsed(paneId);
+    	
+        return HttpResponses.forwardToPreviousPage();
+    }
+
     /**
      * Backward compatibility. Redirect to the thread dump.
      */
diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
index 968b0fd6329c2bb71dfa9183eaff6aa054ae032b..2f29d289e8ed0a245af17472bfec603ccb0e73a0 100644
--- a/core/src/main/resources/lib/hudson/executors.jelly
+++ b/core/src/main/resources/lib/hudson/executors.jelly
@@ -103,7 +103,8 @@ THE SOFTWARE.
   </d:taglib>
   <j:set var="computers" value="${attrs.computers?:app.computers}" />
     <l:pane width="3" id="executors"
-        title="&lt;a href='${rootURL}/computer/'>${%Build Executor Status}&lt;/a>">
+        title="&lt;a href='${rootURL}/computer/'>${%Build Executor Status}&lt;/a>"
+        collapsedText="${%Computers(computers.size() - 1, app.unlabeledLoad.computeTotalExecutors() - app.unlabeledLoad.computeIdleExecutors(), app.unlabeledLoad.computeTotalExecutors())}">
       <colgroup><col width="1*"/><col width="200*"/><col width="24"/></colgroup>
 
       <tr>
diff --git a/core/src/main/resources/lib/hudson/executors.properties b/core/src/main/resources/lib/hudson/executors.properties
new file mode 100644
index 0000000000000000000000000000000000000000..76d77a195cdcf13709955ce7994004d210b73a99
--- /dev/null
+++ b/core/src/main/resources/lib/hudson/executors.properties
@@ -0,0 +1 @@
+Computers=master{0,choice,0#|1# + {0,number} computer ({1} of {2} executors)|1< + {0,number} computers ({1} of {2} executors)}
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/executors_pt_BR.properties b/core/src/main/resources/lib/hudson/executors_pt_BR.properties
index fc42883314df86a4fd9ebb5d29e72270a0536148..88b16bd387037060ce54e3887a284962fd5637a9 100644
--- a/core/src/main/resources/lib/hudson/executors_pt_BR.properties
+++ b/core/src/main/resources/lib/hudson/executors_pt_BR.properties
@@ -31,3 +31,4 @@ Status=Situa\u00E7\u00E3o
 Unknown\ Task=Tarefa n\u00e3o localizada
 suspended=suspenso
 Offline=desconectado
+Computers=mestre{0,choice,0#|1# + {0,number} computador ({1} de {2} executores)|1< + {0,number} computadores ({1} de {2} executores)}
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
index dc132804352d329504031ccd515942667d724a72..fb4054666e3a42ac6b3294d3b6781fbb3e967b24 100644
--- a/core/src/main/resources/lib/hudson/queue.jelly
+++ b/core/src/main/resources/lib/hudson/queue.jelly
@@ -34,7 +34,7 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
   <t:setIconSize/>
-  <l:pane title="${%Build Queue}" width="2" id="buildQueue">
+  <l:pane title="${%Build Queue(items.size())}" width="2" id="buildQueue">
     <j:if test="${app.quietingDown}">
       <tr>
         <td class="pane" colspan="2" style="white-space: normal;">
diff --git a/core/src/main/resources/lib/hudson/queue.properties b/core/src/main/resources/lib/hudson/queue.properties
index 12b7afc74ab0625bb74bf9815a73afdc7b3185e1..8c7ac2f13f4ab4a179d50a52ccfd39d05411e217 100644
--- a/core/src/main/resources/lib/hudson/queue.properties
+++ b/core/src/main/resources/lib/hudson/queue.properties
@@ -1 +1,2 @@
+Build\ Queue=Build Queue{0,choice,0#|0< ({0,number})}
 WaitingFor=Waiting for {0}
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/queue_ar.properties b/core/src/main/resources/lib/hudson/queue_ar.properties
index f02a97ccfc88de7133abb5cdafa7a662696e7bb8..2c22077af968de41810d991a895bcf08406e0667 100644
--- a/core/src/main/resources/lib/hudson/queue_ar.properties
+++ b/core/src/main/resources/lib/hudson/queue_ar.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u0637\u0627\u0628\u0648\u0631 \u0627\u0644\u0628\u0646\u0627\u0621
+Build\ Queue=\u0637\u0627\u0628\u0648\u0631 \u0627\u0644\u0628\u0646\u0627\u0621{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u0644\u0627 \u064A\u0648\u062C\u062F \u0623\u064A \u0628\u0646\u0627\u0621 \u0641\u064A \u0627\u0644\u0637\u0627\u0628\u0648\u0631.
 WaitingFor=\u0625\u0646\u062A\u0638\u0627\u0631 {0}
diff --git a/core/src/main/resources/lib/hudson/queue_be.properties b/core/src/main/resources/lib/hudson/queue_be.properties
index 482edab7c59b0c81aab804406f428981402fc6de..f861be6e1ddd1a2338702faf3ba6e7fbf322cd8b 100644
--- a/core/src/main/resources/lib/hudson/queue_be.properties
+++ b/core/src/main/resources/lib/hudson/queue_be.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=Build Warteschlange
+Build\ Queue=Build Warteschlange{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Keine Builds in der Warteschlange
diff --git a/core/src/main/resources/lib/hudson/queue_bg.properties b/core/src/main/resources/lib/hudson/queue_bg.properties
index 7507ca58f3d73efb43c62973150ad27eac689aa5..db5ba93fc825f80b2ee975a8e94a1ca4eee6b179 100644
--- a/core/src/main/resources/lib/hudson/queue_bg.properties
+++ b/core/src/main/resources/lib/hudson/queue_bg.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u041E\u043F\u0430\u0448\u043A\u0430 \u0437\u0430 \u0438\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435
+Build\ Queue=\u041E\u043F\u0430\u0448\u043A\u0430 \u0437\u0430 \u0438\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins \u0449\u0435 \u0441\u0435 \u0438\u0437\u043A\u043B\u044E\u0447\u0438. \u0414\u043E\u0431\u0430\u0432\u0435\u043D\u0438\u0442\u0435 \u0431\u0438\u043B\u0434\u043E\u0432\u0435 \u043D\u044F\u043C\u0430 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043F\u044A\u043B\u043D\u044F\u0442
 No\ builds\ in\ the\ queue.=\u041D\u044F\u043C\u0430 \u043A\u043E\u043C\u043F\u0438\u043B\u0430\u0446\u0438\u0438 \u0432 \u043E\u043F\u0430\u0448\u043A\u0430\u0442\u0430
 cancel=\u043E\u0442\u043A\u0430\u0437
diff --git a/core/src/main/resources/lib/hudson/queue_bn_IN.properties b/core/src/main/resources/lib/hudson/queue_bn_IN.properties
index 3e6f3a42f267baf8a634838c7ac18fa0b1c8a696..bd766f9f13bdb0df86f1cf564f7b6e18229e70f5 100644
--- a/core/src/main/resources/lib/hudson/queue_bn_IN.properties
+++ b/core/src/main/resources/lib/hudson/queue_bn_IN.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=e
+Build\ Queue=e{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=e
diff --git a/core/src/main/resources/lib/hudson/queue_ca.properties b/core/src/main/resources/lib/hudson/queue_ca.properties
index 623d6a464861708e788d4c92178f2e7666db3635..edeb8fd491aa0d0bdfec641dba7c0742ddf62b0b 100644
--- a/core/src/main/resources/lib/hudson/queue_ca.properties
+++ b/core/src/main/resources/lib/hudson/queue_ca.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Cua de muntatges
+Build\ Queue=Cua de muntatges{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=No hi ha muntatges a la cua
 WaitingFor=Esperant {0}
 WaitingSince=Esperant des de {0}
diff --git a/core/src/main/resources/lib/hudson/queue_cs.properties b/core/src/main/resources/lib/hudson/queue_cs.properties
index 72e24e602d7260a3cc16c7aed6b7cc0cd735883e..eb4339219ed5beef08ec0b9c61dfa01687e611a1 100644
--- a/core/src/main/resources/lib/hudson/queue_cs.properties
+++ b/core/src/main/resources/lib/hudson/queue_cs.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Fronta \u010Dekaj\u00EDc\u00EDch build\u016F
+Build\ Queue=Fronta \u010Dekaj\u00EDc\u00EDch build\u016F{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins bude brzy vypnut. \u017D\u00E1dn\u00E9 dal\u0161\u00ED \u00FAlohy nebudou provedeny.
 No\ builds\ in\ the\ queue.=\u017D\u00E1dn\u00E1 sestaven\u00ED ve front\u011B.
 WaitingFor=\u010Cek\u00E1 na {0}
diff --git a/core/src/main/resources/lib/hudson/queue_da.properties b/core/src/main/resources/lib/hudson/queue_da.properties
index 14f9a36ca184a7070bdfbbe1d1ceecb3ad8335f5..eb9ba8aac5a71df5b4c33986fb1481065f0e6e71 100644
--- a/core/src/main/resources/lib/hudson/queue_da.properties
+++ b/core/src/main/resources/lib/hudson/queue_da.properties
@@ -25,4 +25,4 @@ No\ builds\ in\ the\ queue.=Ingen job i k\u00F8en.
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins vil lukke ned, der vil ikke blive udf\u00f8rt flere byg.
 WaitingFor=afventer {0}
 cancel=annuller
-Build\ Queue=Job-k\u00F8
+Build\ Queue=Job-k\u00F8{0,choice,0#|0< ({0,number})}
diff --git a/core/src/main/resources/lib/hudson/queue_de.properties b/core/src/main/resources/lib/hudson/queue_de.properties
index c36389fb97bed574eef338f65351b267c39bcb62..6514869cb6eadde3db65dfb074e2fce363bc2156 100644
--- a/core/src/main/resources/lib/hudson/queue_de.properties
+++ b/core/src/main/resources/lib/hudson/queue_de.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Build Warteschlange
+Build\ Queue=Build Warteschlange{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Keine Builds geplant
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins fährt gerade herunter. Es werden keine weiteren Builds ausgeführt.
 cancel=Abbrechen
diff --git a/core/src/main/resources/lib/hudson/queue_el.properties b/core/src/main/resources/lib/hudson/queue_el.properties
index 224d3847b20bce9f059a73d73a3dee6caea55b38..3c73eb156cfd8e66b74750937f5ffd97c02eb961 100644
--- a/core/src/main/resources/lib/hudson/queue_el.properties
+++ b/core/src/main/resources/lib/hudson/queue_el.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u039F\u03C5\u03C1\u03AC \u03B4\u03B9\u03B5\u03C1\u03B3\u03B1\u03C3\u03B9\u03CE\u03BD 
+Build\ Queue=\u039F\u03C5\u03C1\u03AC \u03B4\u03B9\u03B5\u03C1\u03B3\u03B1\u03C3\u03B9\u03CE\u03BD{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u0394\u03B5\u03BD \u03C5\u03C0\u03AC\u03C1\u03C7\u03BF\u03C5\u03BD \u03B4\u03B9\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B5\u03C2 \u03B5\u03BD \u03B1\u03BD\u03B1\u03BC\u03BF\u03BD\u03AE
 WaitingFor=\u0391\u03BD\u03B1\u03BC\u03BF\u03BD\u03AE \u03B3\u03B9\u03B1 {0}
diff --git a/core/src/main/resources/lib/hudson/queue_eo.properties b/core/src/main/resources/lib/hudson/queue_eo.properties
index 2cd7d6be365da19449d883e08923d793cd56e90a..31e0f98e69bb443bb3444a2c4c2674ef5762a968 100644
--- a/core/src/main/resources/lib/hudson/queue_eo.properties
+++ b/core/src/main/resources/lib/hudson/queue_eo.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Konstrua atendovico
+Build\ Queue=Konstrua atendovico{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Neniuj konstruoj en la atendovico.
diff --git a/core/src/main/resources/lib/hudson/queue_es.properties b/core/src/main/resources/lib/hudson/queue_es.properties
index af53fa9acf6a1463870c6e3278b1516654b67edf..ed4816bebc63505bff643e2b35b560cb13609526 100644
--- a/core/src/main/resources/lib/hudson/queue_es.properties
+++ b/core/src/main/resources/lib/hudson/queue_es.properties
@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Trabajos en la cola
+Build\ Queue=Trabajos en la cola{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins va a ser apagado. No se procesarán nuevas tareas.
 cancel=cancelar
 No\ builds\ in\ the\ queue.=No hay trabajos en la cola
diff --git a/core/src/main/resources/lib/hudson/queue_es_AR.properties b/core/src/main/resources/lib/hudson/queue_es_AR.properties
index 462d63cdf14e9a4d67088a8f2b4465914eff5a46..c67ca1ceab9a3cc2f25c9d2c0afb42f141a74469 100644
--- a/core/src/main/resources/lib/hudson/queue_es_AR.properties
+++ b/core/src/main/resources/lib/hudson/queue_es_AR.properties
@@ -1,5 +1,5 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=Trabajos en cola
+Build\ Queue=Trabajos en cola{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=No hay trabajos en cola
 WaitingSince=Esperando desde {0}
diff --git a/core/src/main/resources/lib/hudson/queue_et.properties b/core/src/main/resources/lib/hudson/queue_et.properties
index 69eadf058f7f2645e53f98036a564c6647baee14..1c3c795c46d4862e0380ed627ab058ca09d78ebb 100644
--- a/core/src/main/resources/lib/hudson/queue_et.properties
+++ b/core/src/main/resources/lib/hudson/queue_et.properties
@@ -1,5 +1,5 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=Ehitus j\u00E4rjekord
+Build\ Queue=Ehitus j\u00E4rjekord{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Ehitamisi pole j\u00E4rjekorras
 WaitingFor=Ootan {0}
diff --git a/core/src/main/resources/lib/hudson/queue_eu.properties b/core/src/main/resources/lib/hudson/queue_eu.properties
index fc4d7aac68987f634c1616060d0d9ffa0d76afc8..7a6a20a84d1552ba47849805774421736dd74ae2 100644
--- a/core/src/main/resources/lib/hudson/queue_eu.properties
+++ b/core/src/main/resources/lib/hudson/queue_eu.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Lan ilara
+Build\ Queue=Lan ilara{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Ez dago lanik ilaran.
diff --git a/core/src/main/resources/lib/hudson/queue_fi.properties b/core/src/main/resources/lib/hudson/queue_fi.properties
index 458beace3c065e9bc4be633ccb93bb4ab22881f4..b87665dbd30572516d234faf1e2e1e36a2fb73d8 100644
--- a/core/src/main/resources/lib/hudson/queue_fi.properties
+++ b/core/src/main/resources/lib/hudson/queue_fi.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=K\u00E4\u00E4nn\u00F6sjono
+Build\ Queue=K\u00E4\u00E4nn\u00F6sjono{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkinsin alasajo alkaa pian. Enempi\u00E4 k\u00E4\u00E4nn\u00F6ksi\u00E4 ei nyt aloiteta.
 No\ builds\ in\ the\ queue.=Ei k\u00E4\u00E4nn\u00F6ksi\u00E4 jonossa.
 WaitingFor=Odottaa {0}
diff --git a/core/src/main/resources/lib/hudson/queue_fr.properties b/core/src/main/resources/lib/hudson/queue_fr.properties
index 9bca1b39f4d46e5cc9464448216eaa24eb2e2f12..d058ec58a10f8f65053327e41d1802ad94ff02fe 100644
--- a/core/src/main/resources/lib/hudson/queue_fr.properties
+++ b/core/src/main/resources/lib/hudson/queue_fr.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=File d\u2019attente des constructions
+Build\ Queue=File d\u2019attente des constructions{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=File d\u2019attente des constructions vide
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins est en cours de fermeture. Aucun nouveau build ne sera lancé.
 cancel=Annuler
diff --git a/core/src/main/resources/lib/hudson/queue_ga_IE.properties b/core/src/main/resources/lib/hudson/queue_ga_IE.properties
index 46e3a1ca9bfbc17bbd011ea47ea350b38b4337de..bbd6bf84895909bab57feeffeabdcebdd3d7e7e2 100644
--- a/core/src/main/resources/lib/hudson/queue_ga_IE.properties
+++ b/core/src/main/resources/lib/hudson/queue_ga_IE.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=T\u00F3g\u00E1il scuaine
+Build\ Queue=T\u00F3g\u00E1il scuaine{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Uimh T\u00F3gann sa scuaine.
diff --git a/core/src/main/resources/lib/hudson/queue_he.properties b/core/src/main/resources/lib/hudson/queue_he.properties
index 55ed4c11493ad349d435d2565a7cbab62d373cc1..b93d32060672129e5794586e6d2b66826d29c38d 100644
--- a/core/src/main/resources/lib/hudson/queue_he.properties
+++ b/core/src/main/resources/lib/hudson/queue_he.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u05EA\u05D5\u05E8 \u05D1\u05E0\u05D9\u05D5\u05EA
+Build\ Queue=\u05EA\u05D5\u05E8 \u05D1\u05E0\u05D9\u05D5\u05EA{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u05D0\u05D9\u05DF \u05D1\u05E0\u05D9\u05D5\u05EA \u05DE\u05DE\u05EA\u05D9\u05E0\u05D5\u05EA \u05D1\u05EA\u05D5\u05E8.
 WaitingFor=\u05DE\u05D7\u05DB\u05D4 \u05DC - {0}
 WaitingSince=\u05DE\u05DE\u05EA\u05D9\u05DF \u05DE\u05D0\u05D6 {0}
diff --git a/core/src/main/resources/lib/hudson/queue_hi_IN.properties b/core/src/main/resources/lib/hudson/queue_hi_IN.properties
index 2eb9e7c222bb0e969309652bfd43c5fb68af6eac..3c3f4d7fbd6dc7a0a33158807d43c83d4ad3dd99 100644
--- a/core/src/main/resources/lib/hudson/queue_hi_IN.properties
+++ b/core/src/main/resources/lib/hudson/queue_hi_IN.properties
@@ -1,6 +1,6 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=\u0928\u093F\u0930\u094D\u092E\u093E\u0923 \u0915\u0924\u093E\u0930
+Build\ Queue=\u0928\u093F\u0930\u094D\u092E\u093E\u0923 \u0915\u0924\u093E\u0930{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u0915\u0924\u093E\u0930 \u092E\u0947\u0902 \u090F\u0915 \u0928\u093F\u0930\u094D\u092E\u093E\u0923 \u092D\u0940 \u0928\u0939\u0940\u0902
 
 
diff --git a/core/src/main/resources/lib/hudson/queue_hu.properties b/core/src/main/resources/lib/hudson/queue_hu.properties
index 29a86fb569d320c221cc1366dbf3c5e15924bbce..8373c53bad53fe5330a24e017f5de1f58e933580 100644
--- a/core/src/main/resources/lib/hudson/queue_hu.properties
+++ b/core/src/main/resources/lib/hudson/queue_hu.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u00C9p\u00EDt\u00E9si Sor
+Build\ Queue=\u00C9p\u00EDt\u00E9si Sor{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=A Jenkins le\u00E1ll. Nem hajt v\u00E9gre t\u00F6bb build-et.
 No\ builds\ in\ the\ queue.=Nincs \u00FCtemezett build a sorban
 WaitingFor=V\u00E1rakoz\u00E1s {0}
diff --git a/core/src/main/resources/lib/hudson/queue_id.properties b/core/src/main/resources/lib/hudson/queue_id.properties
index 36859b17a1827a8aac97bdd426a3a02c6b1127ad..aa02cb57e9cc6760d88cf1ed243767d409930094 100644
--- a/core/src/main/resources/lib/hudson/queue_id.properties
+++ b/core/src/main/resources/lib/hudson/queue_id.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Antrian Pembangunan
+Build\ Queue=Antrian Pembangunan{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Tidak ada pembangunan di antrian
diff --git a/core/src/main/resources/lib/hudson/queue_is.properties b/core/src/main/resources/lib/hudson/queue_is.properties
index 9fefaa5f76e6c212210cb7b9220877b42630f641..05baacaaf595dc572f3f50911b539083fb4a5a38 100644
--- a/core/src/main/resources/lib/hudson/queue_is.properties
+++ b/core/src/main/resources/lib/hudson/queue_is.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Keyrslu r\u00F6\u00F0
+Build\ Queue=Keyrslu r\u00F6\u00F0{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Engar keyrslur b\u00ED\u00F0andi
diff --git a/core/src/main/resources/lib/hudson/queue_it.properties b/core/src/main/resources/lib/hudson/queue_it.properties
index c4f5d09e7f7a6820416b8b3f144018e1a1ed5c09..d30e42eb3d4cbbfd2912e0e56d814304b17395c8 100644
--- a/core/src/main/resources/lib/hudson/queue_it.properties
+++ b/core/src/main/resources/lib/hudson/queue_it.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Elenco build
+Build\ Queue=Elenco build{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins si spegner\u00E0 a breve. Nessuna nuova build verr\u00E0 eseguita.
 No\ builds\ in\ the\ queue.=Nessun Build In Coda.
 WaitingFor=In attesa di {0}
diff --git a/core/src/main/resources/lib/hudson/queue_ja.properties b/core/src/main/resources/lib/hudson/queue_ja.properties
index 94dc845b853a3c1bba9868a4b2ddf654dbd726a9..9612cac659d4d44825ff1d9be6f30126a399fbaa 100644
--- a/core/src/main/resources/lib/hudson/queue_ja.properties
+++ b/core/src/main/resources/lib/hudson/queue_ja.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u30d3\u30eb\u30c9\u30ad\u30e5\u30fc
+Build\ Queue=\u30d3\u30eb\u30c9\u30ad\u30e5\u30fc{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u30D3\u30EB\u30C9\u5F85\u3061
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=\
   Jenkins\u306f\u7d42\u4e86\u6e96\u5099\u4e2d\u306e\u305f\u3081\u30d3\u30eb\u30c9\u306f\u5b9f\u884c\u3055\u308c\u307e\u305b\u3093\u3002
diff --git a/core/src/main/resources/lib/hudson/queue_ka.properties b/core/src/main/resources/lib/hudson/queue_ka.properties
index 68505ebd91a1e3b2503e07a4350d65a770681c7a..7c0386d9b06fd64217155c7937468729f5d3ba5a 100644
--- a/core/src/main/resources/lib/hudson/queue_ka.properties
+++ b/core/src/main/resources/lib/hudson/queue_ka.properties
@@ -1,3 +1,3 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=\u10D1\u10D8\u10DA\u10D3\u10D8\u10E1 \u10E0\u10D8\u10D2\u10D8
+Build\ Queue=\u10D1\u10D8\u10DA\u10D3\u10D8\u10E1 \u10E0\u10D8\u10D2\u10D8{0,choice,0#|0< ({0,number})}
diff --git a/core/src/main/resources/lib/hudson/queue_kn.properties b/core/src/main/resources/lib/hudson/queue_kn.properties
index 735a8801e856054c6a916bba47c724bbe39d8c5e..064dfe7cc5d1a0468c291c1f62aac75f2930e615 100644
--- a/core/src/main/resources/lib/hudson/queue_kn.properties
+++ b/core/src/main/resources/lib/hudson/queue_kn.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=\u0CA8\u0CBF\u0CB0\u0CCD\u0CAE\u0CBE\u0CA3\u0CA6 \u0CB8\u0CB0\u0CA6\u0CBF \u0CB8\u0CBE\u0CB2\u0CC1
+Build\ Queue=\u0CA8\u0CBF\u0CB0\u0CCD\u0CAE\u0CBE\u0CA3\u0CA6 \u0CB8\u0CB0\u0CA6\u0CBF \u0CB8\u0CBE\u0CB2\u0CC1{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u0CB8\u0CB0\u0CA6\u0CBF \u0CB8\u0CBE\u0CB2\u0CBF\u0CA8\u0CB2\u0CCD\u0CB2\u0CBF \u0CA8\u0CBF\u0CB0\u0CCD\u0CAE\u0CBE\u0CA3\u0C97\u0CB3\u0CC1 \u0C87\u0CB2\u0CCD\u0CB2 
diff --git a/core/src/main/resources/lib/hudson/queue_ko.properties b/core/src/main/resources/lib/hudson/queue_ko.properties
index c859e75dbd09decc77369bfcaf7c50b0f33e3957..894f85b6df34124d4fc6d292b508180ea5ac1b70 100644
--- a/core/src/main/resources/lib/hudson/queue_ko.properties
+++ b/core/src/main/resources/lib/hudson/queue_ko.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\uBE4C\uB4DC \uB300\uAE30 \uBAA9\uB85D
+Build\ Queue=\uBE4C\uB4DC \uB300\uAE30 \uBAA9\uB85D{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=\
   Jenkins\uC774 \uC885\uB8CC \uC900\uBE44\uC911\uC774\uAE30 \uB54C\uBB38\uC5D0 \uBE4C\uB4DC\uB97C \uC2E4\uD589\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 WaitingFor={0} \uAE30\uB2E4\uB9AC\uB294 \uC911 
diff --git a/core/src/main/resources/lib/hudson/queue_lt.properties b/core/src/main/resources/lib/hudson/queue_lt.properties
index 54aeb73ab15510e29c2e2a4e2378b252819c6ad4..52e0d29ca909f6279144cf5782aae18539e6f175 100644
--- a/core/src/main/resources/lib/hudson/queue_lt.properties
+++ b/core/src/main/resources/lib/hudson/queue_lt.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=U\u017Eduo\u010Di\u0173 eil\u0117
+Build\ Queue=U\u017Eduo\u010Di\u0173 eil\u0117{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkinsas ruo\u0161iasi i\u0161jungimui. Nebus vykdomi jokie darbai.
 No\ builds\ in\ the\ queue.=U\u017Eduo\u010Di\u0173 eil\u0117 tu\u0161\u010Dia.
 cancel=nutraukti
diff --git a/core/src/main/resources/lib/hudson/queue_lv.properties b/core/src/main/resources/lib/hudson/queue_lv.properties
index a0797366b0f87abce66c55dde024f59b6ed26fe4..25278b34db8360c64c0b5539dcab88c41058aac7 100644
--- a/core/src/main/resources/lib/hudson/queue_lv.properties
+++ b/core/src/main/resources/lib/hudson/queue_lv.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=B\u016Bv\u0113jumu rinda
+Build\ Queue=B\u016Bv\u0113jumu rinda{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins tiks izsl\u0113gts. Turpm\u0101ki b\u016Bv\u0113jumi netiks izpild\u012Bti.
 No\ builds\ in\ the\ queue.=Rind\u0101 nav b\u016Bv\u0113jumu
 WaitingFor=Gaidu uz {0}
diff --git a/core/src/main/resources/lib/hudson/queue_mn.properties b/core/src/main/resources/lib/hudson/queue_mn.properties
index e5dc1b4af1cd3cbc76b28e8e914c4d0bb1d7ac7f..3e24ef723dda30d66c4bdb77bcf96a14c3f2f201 100644
--- a/core/src/main/resources/lib/hudson/queue_mn.properties
+++ b/core/src/main/resources/lib/hudson/queue_mn.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=\u0411\u0430\u0439\u0433\u0443\u0443\u043B\u0430\u0445 \u0436\u0430\u0433\u0441\u0430\u0430\u043B\u0442
+Build\ Queue=\u0411\u0430\u0439\u0433\u0443\u0443\u043B\u0430\u0445 \u0436\u0430\u0433\u0441\u0430\u0430\u043B\u0442{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u042D\u043D\u044D \u0436\u0430\u0433\u0441\u0430\u0430\u043B\u0442\u0430\u0434 \u0431\u0430\u0439\u0433\u0443\u0443\u043B\u0430\u043B\u0442 \u0430\u043B\u0433\u0430 \u0431\u0430\u0439\u043D\u0430. 
diff --git a/core/src/main/resources/lib/hudson/queue_mr.properties b/core/src/main/resources/lib/hudson/queue_mr.properties
index d01a6067a92f0c7348b934e9f71cb6dd4b635095..53a23c1a4b5275a6bd90b1afb132663cfeaf338a 100644
--- a/core/src/main/resources/lib/hudson/queue_mr.properties
+++ b/core/src/main/resources/lib/hudson/queue_mr.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u092C\u093F\u0932\u094D\u0921\u094D\u091A\u0940 \u0930\u093E\u0902\u0917
+Build\ Queue=\u092C\u093F\u0932\u094D\u0921\u094D\u091A\u0940 \u0930\u093E\u0902\u0917{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u0930\u093E\u0902\u0917\u0947\u092E\u0927\u0947 \u090F\u0915\u0939\u0940 \u092C\u093F\u0932\u094D\u0921 \u0928\u093E\u0939\u0940
 WaitingFor=\u092A\u094D\u0930\u0924\u0940\u0915\u094D\u0937\u0947\u0924
diff --git a/core/src/main/resources/lib/hudson/queue_nb_NO.properties b/core/src/main/resources/lib/hudson/queue_nb_NO.properties
index 5e5cb9b584a86d6c44367c6b32c4c33a2821a8d8..d1401ce41456c0452b9423b5a69ce8617dcd2167 100644
--- a/core/src/main/resources/lib/hudson/queue_nb_NO.properties
+++ b/core/src/main/resources/lib/hudson/queue_nb_NO.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Byggek\u00F8
+Build\ Queue=Byggek\u00F8{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Ingen bygg i k\u00F8en.
 WaitingFor=Venter p\u00E5 {0}
 cancel=avbryt
diff --git a/core/src/main/resources/lib/hudson/queue_nl.properties b/core/src/main/resources/lib/hudson/queue_nl.properties
index 555048c309270bd0bf5202b7a056cc72045288f5..bc899f475621d62610f4b813c17f17f301f497b0 100644
--- a/core/src/main/resources/lib/hudson/queue_nl.properties
+++ b/core/src/main/resources/lib/hudson/queue_nl.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Build-wachtrij
+Build\ Queue=Build-wachtrij{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Er staan geen projecten in de wachtrij.
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Er werd een signaal gestuurd om Jenkins zichzelf te laten afsluiten. Er zullen geen nieuwe bouwpogingen meer ondernomen worden.
 Unknown\ Task=Onbekende taak
diff --git a/core/src/main/resources/lib/hudson/queue_pl.properties b/core/src/main/resources/lib/hudson/queue_pl.properties
index f2a13d06bc917875d041ccb9d0bf4a7e0dff82a9..8d0ebf21913a08bd2479932b35017c4e1fc1d3b8 100644
--- a/core/src/main/resources/lib/hudson/queue_pl.properties
+++ b/core/src/main/resources/lib/hudson/queue_pl.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Kolejka Budowania
+Build\ Queue=Kolejka Budowania{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins przygotowuje si\u0119 do wy\u0142\u0105czenia. Uruchamianie  nast\u0119pnych kompilacji zosta\u0142o wstrzymane.
 No\ builds\ in\ the\ queue.=Nie ma build\u00F3w w kolejce
 WaitingFor=Czeka na {0}
diff --git a/core/src/main/resources/lib/hudson/queue_pt_BR.properties b/core/src/main/resources/lib/hudson/queue_pt_BR.properties
index 7b90e06be3257f4a07e460db95ff8826d9a4ad54..b823c5aefd5b8ed192b7c655641af3c82c638e26 100644
--- a/core/src/main/resources/lib/hudson/queue_pt_BR.properties
+++ b/core/src/main/resources/lib/hudson/queue_pt_BR.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Fila de Constru\u00E7\u00E3o
+Build\ Queue=Fila de Constru\u00E7\u00E3o{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Nenhuma constru\u00E7\u00E3o na fila.
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins est\u00e1 sendo desligado. Nenhuma constru\u00e7\u00e3o futura ser\u00e1 executada.
 WaitingFor=Aguardando por {0}
diff --git a/core/src/main/resources/lib/hudson/queue_pt_PT.properties b/core/src/main/resources/lib/hudson/queue_pt_PT.properties
index cd1b8a545b671233f3df797dde0f91362acd4823..a50c319f20c71497720f7b10b8973aea3f688b0c 100644
--- a/core/src/main/resources/lib/hudson/queue_pt_PT.properties
+++ b/core/src/main/resources/lib/hudson/queue_pt_PT.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Fila de Compila\u00E7\u00F5es
+Build\ Queue=Fila de Compila\u00E7\u00F5es{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=O Jenkins vai encerrar. Nenhum outro build ser\u00E1 levado a cabo.
 No\ builds\ in\ the\ queue.=Sem builds em espera.
 WaitingFor=\u00C0 espera de {0}
diff --git a/core/src/main/resources/lib/hudson/queue_ro.properties b/core/src/main/resources/lib/hudson/queue_ro.properties
index 09209ec89f104dfe2c682f6935f6e5ca109ebd00..fc2ab92ef282f84c91a587c8fb91782d94b10c96 100644
--- a/core/src/main/resources/lib/hudson/queue_ro.properties
+++ b/core/src/main/resources/lib/hudson/queue_ro.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Lista de asteptare
+Build\ Queue=Lista de asteptare{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Nu sunt build-uri in lista de asteptare
 WaitingFor=Astept {0}
 WaitingSince=Asteapta de 
diff --git a/core/src/main/resources/lib/hudson/queue_ru.properties b/core/src/main/resources/lib/hudson/queue_ru.properties
index 998765de318b7e46aee9da851d926536883ac935..a67a693434ea8245bf760f86c5a5917f930e510e 100644
--- a/core/src/main/resources/lib/hudson/queue_ru.properties
+++ b/core/src/main/resources/lib/hudson/queue_ru.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u041E\u0447\u0435\u0440\u0435\u0434\u044C \u0441\u0431\u043E\u0440\u043E\u043A.
+Build\ Queue=\u041E\u0447\u0435\u0440\u0435\u0434\u044C \u0441\u0431\u043E\u0440\u043E\u043A{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u041E\u0447\u0435\u0440\u0435\u0434\u044C \u0441\u0431\u043E\u0440\u043E\u043A \u043F\u0443\u0441\u0442\u0430
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins \u0433\u043e\u0442\u043e\u0432\u0438\u0442\u0441\u044f \u043a \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044e. \u0421\u0431\u043e\u0440\u043a\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0442\u044c\u0441\u044f \u043d\u0435 \u0431\u0443\u0434\u0443\u0442.
 WaitingFor=\u0416\u0434\u0451\u0442 {0}
diff --git a/core/src/main/resources/lib/hudson/queue_si.properties b/core/src/main/resources/lib/hudson/queue_si.properties
index 089853c4b92227a921a8f600a19916fd6d14bf0f..144a9ded80b4af740644005788529c1028be1c3b 100644
--- a/core/src/main/resources/lib/hudson/queue_si.properties
+++ b/core/src/main/resources/lib/hudson/queue_si.properties
@@ -1,5 +1,5 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=\u0DB4\u0DD0\u0D9A\u0DDA\u0DA2 \u0DB4\u0DDD\u0DBD\u0DD2\u0DB8 
+Build\ Queue=\u0DB4\u0DD0\u0D9A\u0DDA\u0DA2 \u0DB4\u0DDD\u0DBD\u0DD2\u0DB8{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u0DB4\u0DDD\u0DBD\u0DD2\u0DB8\u0DDA \u0DC3\u0DD1\u0DAF\u0DD3\u0DB8\u0D9A\u0DCA \u0DB1\u0DD0\u0DAD
 WaitingFor=\u0DC3\u0DD0\u0DAF\u0DD3\u0DB8\u0DA7 \u0D87\u0DAD\u0DD2 {0}
diff --git a/core/src/main/resources/lib/hudson/queue_sk.properties b/core/src/main/resources/lib/hudson/queue_sk.properties
index fce37b6f8b67bece8726aa744aaf9895c4c5594e..20753630a2908e966bb165adb43041cf720629f6 100644
--- a/core/src/main/resources/lib/hudson/queue_sk.properties
+++ b/core/src/main/resources/lib/hudson/queue_sk.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Rad behov
+Build\ Queue=Rad behov{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins bude vypnut\u00FD. \u017Diadne \u010Fal\u0161ie zostavenia sa nevykonaj\u00FA.
 No\ builds\ in\ the\ queue.=\u017Diadne zostavenia v rade.
 WaitingFor=\u010Cak\u00E1 sa na {0}
diff --git a/core/src/main/resources/lib/hudson/queue_sl.properties b/core/src/main/resources/lib/hudson/queue_sl.properties
index af794a15728888688bc307017217acc9f25f7c46..d6cabf9b46f542dc478f339c0f75507591b372bd 100644
--- a/core/src/main/resources/lib/hudson/queue_sl.properties
+++ b/core/src/main/resources/lib/hudson/queue_sl.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u010Cakalna vrsta
+Build\ Queue=\u010Cakalna vrsta{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u010Cakalna vrsta je prazna
 WaitingFor=\u010Cakam na
diff --git a/core/src/main/resources/lib/hudson/queue_sr.properties b/core/src/main/resources/lib/hudson/queue_sr.properties
index 2fc4d0511c8ab2a5097b92283e5f2a705afdc28d..6e99e6d2278417c39386ad69c0be7907c2efde0f 100644
--- a/core/src/main/resources/lib/hudson/queue_sr.properties
+++ b/core/src/main/resources/lib/hudson/queue_sr.properties
@@ -1,6 +1,6 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=Red Gradnje
+Build\ Queue=Red Gradnje{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=Nema zakazanih procesa
 WaitingFor=\u010Ceka se {0}
 WaitingSince=\u010Ceka od {0}
diff --git a/core/src/main/resources/lib/hudson/queue_sv_SE.properties b/core/src/main/resources/lib/hudson/queue_sv_SE.properties
index f82c3f273865e147d8a613fcd8cd7b054b286183..ee4967d15d5f0efc15dfb07ad974618358d1a423 100644
--- a/core/src/main/resources/lib/hudson/queue_sv_SE.properties
+++ b/core/src/main/resources/lib/hudson/queue_sv_SE.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Jobbk\u00F6
+Build\ Queue=Jobbk\u00F6{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins h\u00E5ller p\u00E5 att avslutas. Inga nya byggen kommer att utf\u00F6ras.
 No\ builds\ in\ the\ queue.=Inga k\u00F6ade byggen.
 Unknown\ Task=\u00D6kand uppgift
diff --git a/core/src/main/resources/lib/hudson/queue_ta.properties b/core/src/main/resources/lib/hudson/queue_ta.properties
index a7c7071020ac5577c060e9dc7f61ba26e8bbe728..c96b9eddbbe7ea662d0b898b11969b942a2a3440 100644
--- a/core/src/main/resources/lib/hudson/queue_ta.properties
+++ b/core/src/main/resources/lib/hudson/queue_ta.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=\u0B89\u0BB0\u0BC1\u0BB5\u0BBE\u0B95\u0BCD\u0B95\u0BAA\u0BCD\u0BAA\u0BA3\u0BBF \u0BB5\u0BB0\u0BBF\u0B9A\u0BC8
+Build\ Queue=\u0B89\u0BB0\u0BC1\u0BB5\u0BBE\u0B95\u0BCD\u0B95\u0BAA\u0BCD\u0BAA\u0BA3\u0BBF \u0BB5\u0BB0\u0BBF\u0B9A\u0BC8{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=\u0B89\u0BB0\u0BC1\u0BB5\u0BBE\u0B95\u0BCD\u0B95\u0BAA\u0BCD\u0BAA\u0BA3\u0BBF \u0B8E\u0BA4\u0BC1\u0BB5\u0BC1\u0BAE\u0BCD \u0B87\u0BB5\u0BCD\u0BB5\u0BB0\u0BBF\u0B9A\u0BC8\u0BAF\u0BBF\u0BB2\u0BCD \u0B87\u0BB2\u0BCD\u0BB2\u0BC8
diff --git a/core/src/main/resources/lib/hudson/queue_te.properties b/core/src/main/resources/lib/hudson/queue_te.properties
index df3a0761fdcdd40e951f671f52b182f1a6418d5b..947dd2920784c6ade8e805d0e4ef4fafb0d0e768 100644
--- a/core/src/main/resources/lib/hudson/queue_te.properties
+++ b/core/src/main/resources/lib/hudson/queue_te.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=\u0C28\u0C3F\u0C30\u0C4D\u0C2E\u0C3F\u0C02\u0C1A\u0C41 \u0C15\u0C4D\u0C30\u0C2E\u0C2E\u0C41
+Build\ Queue=\u0C28\u0C3F\u0C30\u0C4D\u0C2E\u0C3F\u0C02\u0C1A\u0C41 \u0C15\u0C4D\u0C30\u0C2E\u0C2E\u0C41{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=ee varusalo nirmanalu levu.
diff --git a/core/src/main/resources/lib/hudson/queue_th.properties b/core/src/main/resources/lib/hudson/queue_th.properties
index c625cf380c584bce4a6a2c1ffca64621e5776da4..0124e2854ab22694833116488e2c98127e293d1f 100644
--- a/core/src/main/resources/lib/hudson/queue_th.properties
+++ b/core/src/main/resources/lib/hudson/queue_th.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Build\ Queue=\u0E04\u0E34\u0E27
+Build\ Queue=\u0E04\u0E34\u0E27{0,choice,0#|0< ({0,number})}
 WaitingFor=\u0E23\u0E2D {0}
diff --git a/core/src/main/resources/lib/hudson/queue_tr.properties b/core/src/main/resources/lib/hudson/queue_tr.properties
index dc2612e3b2e68e0a6937dae848167ca99d7d4e77..1c13c2548ef2486e9680627bf52c51c58910d746 100644
--- a/core/src/main/resources/lib/hudson/queue_tr.properties
+++ b/core/src/main/resources/lib/hudson/queue_tr.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=Yap\u0131land\u0131rma Listesi
+Build\ Queue=Yap\u0131land\u0131rma Listesi{0,choice,0#|0< ({0,number})}
 No\ builds\ in\ the\ queue.=S\u0131rada bekleyen yap\u0131land\u0131rma yok.
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins\ kapat\u0131lacakt\u0131r.\ Bundan\ sonra\ ba\u015fka\ yap\u0131land\u0131rma\ ba\u015flat\u0131lmayacakt\u0131r.
 WaitingFor={0} bekleniyor
diff --git a/core/src/main/resources/lib/hudson/queue_uk.properties b/core/src/main/resources/lib/hudson/queue_uk.properties
index 9976db77849af94b870fe9752f34c166ddc13244..597c021d0f95e1176aa73a770853d494a65bbbc0 100644
--- a/core/src/main/resources/lib/hudson/queue_uk.properties
+++ b/core/src/main/resources/lib/hudson/queue_uk.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u0427\u0435\u0440\u0433\u0430 \u043F\u043E\u0431\u0443\u0434\u043E\u0432
+Build\ Queue=\u0427\u0435\u0440\u0433\u0430 \u043F\u043E\u0431\u0443\u0434\u043E\u0432{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=\u0414\u0436\u0435\u043D\u043A\u0456\u043D\u0441 \u0437\u0431\u0438\u0440\u0430\u0454\u0442\u044C\u0441\u044F \u0437\u0443\u043F\u0438\u043D\u044F\u0442\u0438\u0441\u044C. \u0414\u043E\u0434\u0430\u0442\u043A\u043E\u0432\u0456 \u0437\u0431\u0456\u0440\u043A\u0438 \u0437\u0430\u043F\u0443\u0441\u043A\u0430\u0442\u0438\u0441\u044F \u043D\u0435 \u0431\u0443\u0434\u0443\u0442\u044C.
 No\ builds\ in\ the\ queue.=\u041D\u0435\u043C\u0430\u0454 \u0437\u0431\u0456\u0440\u043E\u043A \u0443 \u0447\u0435\u0440\u0437\u0456
 WaitingFor=\u041E\u0447\u0456\u043A\u0443\u0454 \u043D\u0430 {0}
diff --git a/core/src/main/resources/lib/hudson/queue_zh_CN.properties b/core/src/main/resources/lib/hudson/queue_zh_CN.properties
index 6b3b2eacd01b860718294254ee4e7598fcf303f1..7aba6785bdd848ff2a6b3db672ad7ccf50042e39 100644
--- a/core/src/main/resources/lib/hudson/queue_zh_CN.properties
+++ b/core/src/main/resources/lib/hudson/queue_zh_CN.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u6784\u5EFA\u961F\u5217
+Build\ Queue=\u6784\u5EFA\u961F\u5217{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins \u5373\u5C06\u5173\u95ED\u3002\u5269\u4F59\u751F\u6210\u5C06\u4E0D\u4F1A\u88AB\u6267\u884C\u3002
 No\ builds\ in\ the\ queue.=\u961F\u5217\u4E2D\u6CA1\u6709\u6784\u5EFA\u4EFB\u52A1
 Unknown\ Task=\u672A\u77E5\u4EFB\u52A1
diff --git a/core/src/main/resources/lib/hudson/queue_zh_TW.properties b/core/src/main/resources/lib/hudson/queue_zh_TW.properties
index 2079cfd9cbaa08c7c243a7e161d825a3b05762b1..7e62c92f28bdef4d8f11fc2d010f9ceb650a5c2e 100644
--- a/core/src/main/resources/lib/hudson/queue_zh_TW.properties
+++ b/core/src/main/resources/lib/hudson/queue_zh_TW.properties
@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Build\ Queue=\u5efa\u7f6e\u4f47\u5217
+Build\ Queue=\u5efa\u7f6e\u4f47\u5217{0,choice,0#|0< ({0,number})}
 Jenkins\ is\ going\ to\ shut\ down.\ No\ further\ builds\ will\ be\ performed.=Jenkins \u5373\u5c07\u505c\u6a5f\uff0c\u4e0d\u6703\u518d\u57f7\u884c\u4efb\u4f55\u65b0\u7684\u5efa\u7f6e\u4f5c\u696d\u3002
 No\ builds\ in\ the\ queue.=\u4f47\u5217\u4e2d\u6c92\u6709\u5efa\u7f6e\u4f5c\u696d\u3002
 WaitingSince=\u5F9E {0} \u958B\u59CB\u7B49\u5F85
diff --git a/core/src/main/resources/lib/layout/pane.jelly b/core/src/main/resources/lib/layout/pane.jelly
index 45b9a24cea0ac7400168a5cb829b2006435a296c..b400ec5df88d5b93c6cc7db6d1edf0ed333bcff8 100644
--- a/core/src/main/resources/lib/layout/pane.jelly
+++ b/core/src/main/resources/lib/layout/pane.jelly
@@ -44,8 +44,27 @@ THE SOFTWARE.
   </st:documentation>
   <table class="pane" id="${attrs.id}">
     <tr><td class="pane-header" colspan="${width}">
+      <div>
       <j:out value="${title}"/>
+      <a class="collapse" href="${rootURL}/toggleCollapse?paneId=${attrs.id}" 
+         title="${h.isCollapsed(attrs.id) ? '%expand' : '%collapse'}">
+        <img src="${imagesURL}/16x16/${h.isCollapsed(attrs.id) ? 'expand' : 'collapse'}.png" 
+             class="icon16x16" 
+             alt="${h.isCollapsed(attrs.id) ? '%expand' : '%collapse'}" />
+      </a>
+      </div>
     </td></tr>
-    <d:invokeBody />
+    <j:choose>
+      <j:when test="${h.isCollapsed(attrs.id)}">
+        <tr>
+          <td class="pane" colspan="${width}">
+            ${attrs.collapsedText}
+          </td>
+        </tr>
+      </j:when>
+      <j:otherwise>
+        <d:invokeBody />
+      </j:otherwise>
+    </j:choose>
   </table>
 </j:jelly>
\ No newline at end of file
diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css
index a1372d05019c2aebc49c4564ec7dbf8b8bca9f02..cc686c217c20b60668ffc393a2f08da72ef0d099 100644
--- a/war/src/main/webapp/css/style.css
+++ b/war/src/main/webapp/css/style.css
@@ -321,6 +321,21 @@ td.pane-header {
   border-left: none;
   background-color: #f0f0f0;
   font-weight: bold;
+  padding-right: 24px;
+}
+
+td.pane-header > div {
+  position: relative;
+  padding-right: 24px;
+  width: 100%;
+  height: 100%;
+}
+
+td.pane-header > div > a.collapse {
+	float: right;
+	position: absolute;
+	right: 4px;
+	top: -1px;
 }
 
 th.pane {
diff --git a/war/src/main/webapp/images/16x16/collapse.png b/war/src/main/webapp/images/16x16/collapse.png
new file mode 100644
index 0000000000000000000000000000000000000000..68b119b9ea2d3a1368103dd4da5fdcc26c4ccebb
Binary files /dev/null and b/war/src/main/webapp/images/16x16/collapse.png differ
diff --git a/war/src/main/webapp/images/16x16/expand.png b/war/src/main/webapp/images/16x16/expand.png
new file mode 100644
index 0000000000000000000000000000000000000000..609cbf26f80d8af3462607f6caa948bd43eb984c
Binary files /dev/null and b/war/src/main/webapp/images/16x16/expand.png differ