diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index f9dcb936544d2d0dec96071bbcc21c22f786fcba..9f74f42b20647bba4d770e2dcec9ddffbdd9008f 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -851,6 +851,10 @@ public class Functions {
         return JobPropertyDescriptor.getPropertyDescriptors(clazz);
     }
 
+    public static List<JobPropertyDescriptor> getJobPropertyDescriptors(Job job) {
+        return DescriptorVisibilityFilter.apply(job, JobPropertyDescriptor.getPropertyDescriptors(job.getClass()));
+    }
+
     public static List<Descriptor<BuildWrapper>> getBuildWrapperDescriptors(AbstractProject<?,?> project) {
         return BuildWrappers.getFor(project);
     }
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 5e7d56183ad082d441d2b9cd2522a7de3e98d2b7..767329db2ca321de487204fcac28eaf0177f90e4 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -26,6 +26,7 @@ package hudson.model;
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import hudson.BulkChange;
 
 import hudson.EnvVars;
 import hudson.Extension;
@@ -104,6 +105,7 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 import static javax.servlet.http.HttpServletResponse.*;
+import jenkins.model.BuildDiscarderProperty;
 import jenkins.model.ModelObjectWithChildren;
 import jenkins.model.RunIdMigrator;
 import jenkins.model.lazy.LazyBuildMixIn;
@@ -147,6 +149,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      */
     private transient volatile boolean holdOffBuildUntilUserSave;
 
+    /** @deprecated Replaced by {@link BuildDiscarderProperty} */
     private volatile BuildDiscarder logRotator;
 
     /**
@@ -424,15 +427,24 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
     }
 
     /**
-     * Returns the configured build discarder for this job, or null if none.
+     * Returns the configured build discarder for this job, via {@link BuildDiscarderProperty}, or null if none.
      */
     public BuildDiscarder getBuildDiscarder() {
-        return logRotator;
+        BuildDiscarderProperty prop = getProperty(BuildDiscarderProperty.class);
+        return prop != null ? prop.getStrategy() : /* settings compatibility */ logRotator;
     }
 
     public void setBuildDiscarder(BuildDiscarder bd) throws IOException {
-        this.logRotator = bd;
-        save();
+        BulkChange bc = new BulkChange(this);
+        try {
+            removeProperty(BuildDiscarderProperty.class);
+            if (bd != null) {
+                addProperty(new BuildDiscarderProperty(bd));
+            }
+            bc.commit();
+        } finally {
+            bc.abort();
+        }
     }
 
     /**
@@ -444,9 +456,8 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      */
     @Deprecated
     public LogRotator getLogRotator() {
-        if (logRotator instanceof LogRotator)
-            return (LogRotator) logRotator;
-        return null;
+        BuildDiscarder buildDiscarder = getBuildDiscarder();
+        return buildDiscarder instanceof LogRotator ? (LogRotator) buildDiscarder : null;
     }
 
     /**
@@ -1185,11 +1196,6 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
         try {
             setDisplayName(json.optString("displayNameOrNull"));
 
-            if (json.optBoolean("logrotate"))
-                logRotator = req.bindJSON(BuildDiscarder.class, json.optJSONObject("buildDiscarder"));
-            else
-                logRotator = null;
-
             DescribableList<JobProperty<?>, JobPropertyDescriptor> t = new DescribableList<JobProperty<?>, JobPropertyDescriptor>(NOOP,getAllProperties());
             JSONObject jsonProperties = json.optJSONObject("properties");
             if (jsonProperties != null) {
diff --git a/core/src/main/java/jenkins/model/BuildDiscarderProperty.java b/core/src/main/java/jenkins/model/BuildDiscarderProperty.java
new file mode 100644
index 0000000000000000000000000000000000000000..11b4623007cc4a0ecb8afa9c7b4d9ede42d9cc5a
--- /dev/null
+++ b/core/src/main/java/jenkins/model/BuildDiscarderProperty.java
@@ -0,0 +1,78 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2015 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.model;
+
+import hudson.Extension;
+import hudson.model.Descriptor;
+import hudson.model.DescriptorVisibilityFilter;
+import hudson.model.Items;
+import hudson.model.Job;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+/**
+ * Defines a {@link BuildDiscarder}.
+ */
+public class BuildDiscarderProperty extends OptionalJobProperty<Job<?,?>> {
+
+    private final BuildDiscarder strategy;
+
+    @DataBoundConstructor
+    public BuildDiscarderProperty(BuildDiscarder strategy) {
+        this.strategy = strategy;
+    }
+
+    public BuildDiscarder getStrategy() {
+        return strategy;
+    }
+
+    @Extension
+    public static class DescriptorImpl extends OptionalJobPropertyDescriptor {
+
+        @Override
+        public String getDisplayName() {
+            return Messages.BuildDiscarderProperty_displayName();
+        }
+
+        static {
+            Items.XSTREAM2.addCompatibilityAlias("org.jenkinsci.plugins.workflow.job.properties.BuildDiscarderProperty", BuildDiscarderProperty.class);
+        }
+
+    }
+
+    @Extension
+    public static class ConditionallyHidden extends DescriptorVisibilityFilter {
+
+        @SuppressWarnings("rawtypes")
+        @Override
+        public boolean filter(Object context, Descriptor descriptor) {
+            if (descriptor instanceof DescriptorImpl && context instanceof Job) {
+                return ((Job) context).supportsLogRotator();
+            }
+            return true;
+        }
+
+    }
+
+}
diff --git a/core/src/main/resources/hudson/model/Job/configure.jelly b/core/src/main/resources/hudson/model/Job/configure.jelly
index afe44da1bd374befb5c4130690570ccb5afc823f..ec2a5b68397f7c8884782e2ef29e03f02d2d0d0c 100644
--- a/core/src/main/resources/hudson/model/Job/configure.jelly
+++ b/core/src/main/resources/hudson/model/Job/configure.jelly
@@ -45,17 +45,7 @@ THE SOFTWARE.
           <f:textarea name="description" value="${it.description}" codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription"/>
         </f:entry>
 
-        <j:if test="${it.supportsLogRotator()}">
-          <!-- log rotator -->
-          <f:optionalBlock name="logrotate"
-            help="/help/project-config/log-rotation.html"
-            title="${%Discard Old Builds}" checked="${it.buildDiscarder!=null}" inline="true">
-            <f:dropdownDescriptorSelector field="buildDiscarder" title="${%Strategy}"/>
-          </f:optionalBlock>
-        </j:if>
-
-        <!-- job property configurations. This should have been <f:descriptorList> -->
-        <f:descriptorList field="properties" descriptors="${h.getJobPropertyDescriptors(it.getClass())}" forceRowSet="true" />
+        <f:descriptorList field="properties" descriptors="${h.getJobPropertyDescriptors(it)}" forceRowSet="true"/>
 
         <!-- additional entries from derived classes -->
         <st:include page="configure-entries.jelly" />
diff --git a/core/src/main/resources/hudson/model/Job/configure_bg.properties b/core/src/main/resources/hudson/model/Job/configure_bg.properties
index 5d8f2e70290e730c5c17a2606ed3b2fb62d2f2b4..ce529367c73812f6c6f02c42d70e458401cc4a97 100644
--- a/core/src/main/resources/hudson/model/Job/configure_bg.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_bg.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
-Discard\ Old\ Builds=\u041F\u0440\u0435\u043D\u0435\u0431\u0440\u0435\u0433\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u0442\u0430\u0440\u0438\u0442\u0435 \u0431\u0438\u043B\u0434\u043E\u0432\u0435
 LOADING=\u0417\u0430\u0440\u0435\u0436\u0434\u0430\u043D\u0435
 Save=\u0417\u0430\u043F\u0438\u0448\u0438
 name=\u0438\u043C\u0435
diff --git a/core/src/main/resources/hudson/model/Job/configure_cs.properties b/core/src/main/resources/hudson/model/Job/configure_cs.properties
index a3242e7567da4b4ce04638638af87a0938029a90..c898b2bb2828ae9fee62e4a304ac8ebe1fcb76e9 100644
--- a/core/src/main/resources/hudson/model/Job/configure_cs.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_cs.properties
@@ -1,6 +1,5 @@
 # This file is under the MIT License by authors
 
 Description=Popis
-Discard\ Old\ Builds=Zahodit star\u00E9 sestaven\u00ED
 LOADING=Nahr\u00E1v\u00E1n\u00ED
 name=jm\u00E9no
diff --git a/core/src/main/resources/hudson/model/Job/configure_da.properties b/core/src/main/resources/hudson/model/Job/configure_da.properties
index fa65b1a3d76999aa0ba224b4709cffdc1bd37e2d..52acd6704606d304f2650dbc028811ea44293af5 100644
--- a/core/src/main/resources/hudson/model/Job/configure_da.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_da.properties
@@ -22,7 +22,6 @@
 
 Strategy=Strategi
 name={0} navn
-Discard\ Old\ Builds=Fjern Gamle Byg
 Save=Gem
 LOADING=INDL\u00c6SER
 Description=Beskrivelse
diff --git a/core/src/main/resources/hudson/model/Job/configure_de.properties b/core/src/main/resources/hudson/model/Job/configure_de.properties
index 553598aa9f0cfc43250ddf7b12c67f8ab5677d7b..6112e05e9a298b36b2f12aa3372c77510b922461 100644
--- a/core/src/main/resources/hudson/model/Job/configure_de.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_de.properties
@@ -23,6 +23,5 @@
 Strategy=Strategie
 name={0}name
 Description=Beschreibung
-Discard\ Old\ Builds=Alte Builds verwerfen
 Save=Speichern
 LOADING=LADE DATEN
diff --git a/core/src/main/resources/hudson/model/Job/configure_es.properties b/core/src/main/resources/hudson/model/Job/configure_es.properties
index fe6860662559eda2151fe0f0ab3cd89a631c2c11..6c3bdab63a43f000273e2dce4f0bb298469c533a 100644
--- a/core/src/main/resources/hudson/model/Job/configure_es.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_es.properties
@@ -22,7 +22,6 @@
 
 Strategy=Estrategia
 name={0} nombre
-Discard\ Old\ Builds=Desechar ejecuciones antiguas
 Save=Guardar
 Description=Descripción
 LOADING=CARGANDO
diff --git a/core/src/main/resources/hudson/model/Job/configure_es_AR.properties b/core/src/main/resources/hudson/model/Job/configure_es_AR.properties
index 48a45961759ca16ee1dd42e6c11e22c3576a236e..9f83c8326196542d97c8d719bc7c46e595792f0f 100644
--- a/core/src/main/resources/hudson/model/Job/configure_es_AR.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_es_AR.properties
@@ -1,6 +1,5 @@
 # This file is under the MIT License by authors
 
 Description=Descripci\u00F3n
-Discard\ Old\ Builds=Descargar build antiguos
 LOADING=CARGANDO
 name={0} nombre
diff --git a/core/src/main/resources/hudson/model/Job/configure_et.properties b/core/src/main/resources/hudson/model/Job/configure_et.properties
index b128ff63ca5b08783f053b7f17d518cb83df9654..9014e9008a021c4afc3f99b1ffef908e89fb5f54 100644
--- a/core/src/main/resources/hudson/model/Job/configure_et.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_et.properties
@@ -1,6 +1,5 @@
 # This file is under the MIT License by authors
 
 Description=Kirjeldus
-Discard\ Old\ Builds=Eemalda vanad bildid
 LOADING=Laen
 name={0} nimi
diff --git a/core/src/main/resources/hudson/model/Job/configure_fi.properties b/core/src/main/resources/hudson/model/Job/configure_fi.properties
index bfb65f20a1c5bf6bc6d90c95af1ed6231322c0d3..03769c1d17c4644ee2f20ec3b703c36d939176c0 100644
--- a/core/src/main/resources/hudson/model/Job/configure_fi.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_fi.properties
@@ -21,5 +21,4 @@
 # THE SOFTWARE.
 
 Description=Kuvaus
-Discard\ Old\ Builds=H\u00E4vit\u00E4 vanhat k\u00E4\u00E4nn\u00F6kset
 Save=Tallenna
diff --git a/core/src/main/resources/hudson/model/Job/configure_fr.properties b/core/src/main/resources/hudson/model/Job/configure_fr.properties
index 264d85c33f4e01bc0f610bf8cd351bfb52682741..252a92d8af0280f5216132d7a3936b563b6e9ea3 100644
--- a/core/src/main/resources/hudson/model/Job/configure_fr.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_fr.properties
@@ -22,7 +22,6 @@
 
 name=Nom du {0}
 Description=Description
-Discard\ Old\ Builds=Supprimer les anciens builds
 Save=Sauver
 LOADING=CHARGEMENT
 Strategy=Strat\u00E9gie
diff --git a/core/src/main/resources/hudson/model/Job/configure_he.properties b/core/src/main/resources/hudson/model/Job/configure_he.properties
index bf8a3c763b0727b8d9337f89b9b2d6dff41b2164..1f1a76f0de19ddcb9f5c6fe73086ebe9f1131ab9 100644
--- a/core/src/main/resources/hudson/model/Job/configure_he.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_he.properties
@@ -1,6 +1,5 @@
 # This file is under the MIT License by authors
 
 Description=\u05EA\u05D0\u05D5\u05E8
-Discard\ Old\ Builds=\u05D4\u05E9\u05DE\u05D3 \u05D1\u05E0\u05D9\u05D5\u05EA \u05D9\u05E9\u05E0\u05D5\u05EA
 LOADING=\u05D8\u05D5\u05E2\u05DF
 name=\u05E9\u05DD {0}
diff --git a/core/src/main/resources/hudson/model/Job/configure_hu.properties b/core/src/main/resources/hudson/model/Job/configure_hu.properties
index b8c94eb8719da7858f64d8170b17dd24f42a1ae9..885ae20793d853efa8e0052b027b690aed0a0e53 100644
--- a/core/src/main/resources/hudson/model/Job/configure_hu.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_hu.properties
@@ -1,7 +1,6 @@
 # This file is under the MIT License by authors
 
 Description=Le\u00EDr\u00E1s
-Discard\ Old\ Builds=R\u00E9gi \u00E9p\u00EDt\u00E9sek t\u00F6rl\u00E9se
 LOADING=BET\u00D6LT\u00C9S
 Strategy=Strat\u00E9gia
 name={0} n\u00E9v
diff --git a/core/src/main/resources/hudson/model/Job/configure_it.properties b/core/src/main/resources/hudson/model/Job/configure_it.properties
index f60881e74bc20e3c3aa4ad0ade64ce78da556514..516070295cd0cab3c363d9a3e9bcf09b92fe29d6 100644
--- a/core/src/main/resources/hudson/model/Job/configure_it.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_it.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Description=Descrizione
-Discard\ Old\ Builds=Elimina Build Precedenti
 LOADING=CARICAMENTO
 Save=Salva
 Strategy=Strategia
diff --git a/core/src/main/resources/hudson/model/Job/configure_ja.properties b/core/src/main/resources/hudson/model/Job/configure_ja.properties
index 6e5c2ee080959707df3b437b2f4447244d344072..8a94d9d2037b2f4d0efba71627bab41376b414f4 100644
--- a/core/src/main/resources/hudson/model/Job/configure_ja.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_ja.properties
@@ -22,7 +22,6 @@
 
 name={0}\u540d
 Description=\u8aac\u660e
-Discard\ Old\ Builds=\u53e4\u3044\u30d3\u30eb\u30c9\u306e\u7834\u68c4
 Save=\u4fdd\u5b58
 LOADING=\u30ed\u30fc\u30c9\u4e2d...
-Strategy=\u65b9\u91dd
\ No newline at end of file
+Strategy=\u65b9\u91dd
diff --git a/core/src/main/resources/hudson/model/Job/configure_ko.properties b/core/src/main/resources/hudson/model/Job/configure_ko.properties
index 6e4b97f731333666cf10f75ace4fe8163ea07d33..e232a25de0a816d751e443cb5ba184e706cb1c71 100644
--- a/core/src/main/resources/hudson/model/Job/configure_ko.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_ko.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Description=\uC124\uBA85
-Discard\ Old\ Builds=\uC624\uB798\uB41C \uBE4C\uB4DC \uC0AD\uC81C
 LOADING=\uBD88\uB7EC\uC624\uB294 \uC911
 Save=\uC800\uC7A5
 Strategy=\uC804\uB7B5
diff --git a/core/src/main/resources/hudson/model/Job/configure_lt.properties b/core/src/main/resources/hudson/model/Job/configure_lt.properties
index b594bec592a19975fa64165b227ea0b5b6eb1a38..fa183c864c97f0a0fa70767b842fd2e481ae59f7 100644
--- a/core/src/main/resources/hudson/model/Job/configure_lt.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_lt.properties
@@ -1,7 +1,6 @@
 # This file is under the MIT License by authors
 
 Description=Apra\u0161ymas
-Discard\ Old\ Builds=Pa\u0161alinti senus darbus
 LOADING=\u012EKELIAMA
 Save=\u012Era\u0161yti
 Strategy=Strategija
diff --git a/core/src/main/resources/hudson/model/Job/configure_lv.properties b/core/src/main/resources/hudson/model/Job/configure_lv.properties
index b5608a91ae718fbed3734f715477d19c07a31e11..130eafbf90a4a3e541965df980082cec9f7ae215 100644
--- a/core/src/main/resources/hudson/model/Job/configure_lv.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_lv.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Description=Apraksts
-Discard\ Old\ Builds=Dz\u0113st vecos b\u016Bv\u0113jumus
 LOADING=IEL\u0100D\u0112
 Save=Saglab\u0101t
 name={0} nosaukums
diff --git a/core/src/main/resources/hudson/model/Job/configure_nb_NO.properties b/core/src/main/resources/hudson/model/Job/configure_nb_NO.properties
index 06330e0c48b3b4a0eda2408dc48f776f9b3816aa..9b6ee83290bca22933766e5f3356ff156d89c683 100644
--- a/core/src/main/resources/hudson/model/Job/configure_nb_NO.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_nb_NO.properties
@@ -21,6 +21,5 @@
 # THE SOFTWARE.
 
 Description=Beskrivelse
-Discard\ Old\ Builds=Slett gamle bygg
 LOADING=LASTER
 name={0} navn
diff --git a/core/src/main/resources/hudson/model/Job/configure_nl.properties b/core/src/main/resources/hudson/model/Job/configure_nl.properties
index 332107a25516863719d16b7d1e3297779ccfa74b..bdec1d286a9af2bf37edf0017154911e22242b1b 100644
--- a/core/src/main/resources/hudson/model/Job/configure_nl.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_nl.properties
@@ -23,6 +23,5 @@
 Strategy=Strategie
 name={0} naam
 Description=Omschrijving
-Discard\ Old\ Builds=Oude builds automatisch verwijderen
 LOADING=LADEN
 Save=Opslaan
diff --git a/core/src/main/resources/hudson/model/Job/configure_pl.properties b/core/src/main/resources/hudson/model/Job/configure_pl.properties
index d71bd2df454f20248acca854916fdd3b84dccd10..11394275e7a0d5c5b6f130b4bd6bed54afe57cfb 100644
--- a/core/src/main/resources/hudson/model/Job/configure_pl.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_pl.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Description=Opis
-Discard\ Old\ Builds=Porzu\u0107 stare buildy
 LOADING=\u0141ADOWANIE
 Save=Zapisz
 Strategy=Strategia
diff --git a/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties b/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties
index 32d486e561bf255ed4f13dbc29944e1d7ba43d53..19b04234431c27473cd3f5e97e525b8ea627a6f2 100644
--- a/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_pt_BR.properties
@@ -23,6 +23,5 @@
 Strategy=Estrat\u00E9gia
 name=Nome do {0}
 Description=Descri\u00e7\u00e3o
-Discard\ Old\ Builds=Descartar builds antigos
 Save=Salvar
 LOADING=CARREGANDO
diff --git a/core/src/main/resources/hudson/model/Job/configure_pt_PT.properties b/core/src/main/resources/hudson/model/Job/configure_pt_PT.properties
index 7de593bdf3fc754f74a53407bdf0d6066bf42597..2e2937ce6bacb52f32506022fdfe016cdf362560 100644
--- a/core/src/main/resources/hudson/model/Job/configure_pt_PT.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_pt_PT.properties
@@ -1,6 +1,5 @@
 # This file is under the MIT License by authors
 
 Description=Descri\u00E7\u00E3o
-Discard\ Old\ Builds=Descartar compila\u00E7\u00F5es antigas
 LOADING=A CARREGAR
 name={0} nome
diff --git a/core/src/main/resources/hudson/model/Job/configure_ro.properties b/core/src/main/resources/hudson/model/Job/configure_ro.properties
index 2260b1a4b107f9fe7882fc3efeb7cc75f3433140..1168eebe56233d9ebae89f73d050777abbc95872 100644
--- a/core/src/main/resources/hudson/model/Job/configure_ro.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_ro.properties
@@ -1,7 +1,6 @@
 # This file is under the MIT License by authors
 
 Description=Descriere
-Discard\ Old\ Builds=Anuleaza Build-urile vechi
 LOADING=SE INCARCA
 Strategy=Strategie
 name=numele {0}
diff --git a/core/src/main/resources/hudson/model/Job/configure_ru.properties b/core/src/main/resources/hudson/model/Job/configure_ru.properties
index 721111e40d7cd697b2511888ed91d57edb89db35..795374cdf8335098e90ff91f100687ccae38ab9c 100644
--- a/core/src/main/resources/hudson/model/Job/configure_ru.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_ru.properties
@@ -23,6 +23,5 @@
 Strategy=\u0421\u0442\u0440\u0430\u0442\u0435\u0433\u0438\u044f
 name={0}
 Description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
-Discard\ Old\ Builds=\u0423\u0434\u0430\u043b\u044f\u0442\u044c \u0443\u0441\u0442\u0430\u0440\u0435\u0432\u0448\u0438\u0435 \u0441\u0431\u043e\u0440\u043a\u0438
 LOADING=\u0417\u0410\u0413\u0420\u0423\u0417\u041a\u0410
 Save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
diff --git a/core/src/main/resources/hudson/model/Job/configure_sk.properties b/core/src/main/resources/hudson/model/Job/configure_sk.properties
index a218d7afe5fa38161387c06266e10d0a2d2e6b42..b08d5e7931880b3b0da8c9c4bc0d20fddfdabad7 100644
--- a/core/src/main/resources/hudson/model/Job/configure_sk.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_sk.properties
@@ -1,7 +1,6 @@
 # This file is under the MIT License by authors
 
 Description=Popis
-Discard\ Old\ Builds=Vymazanie star\u00FDch zostaven\u00ED
 LOADING=Nahr\u00E1vanie
 Strategy=Strat\u00E9gia
 name={0} meno
diff --git a/core/src/main/resources/hudson/model/Job/configure_sv_SE.properties b/core/src/main/resources/hudson/model/Job/configure_sv_SE.properties
index 862e6868eade3e97a065cedfaca17e53fa9d097a..43f4e32f31f4175d0e8ad5efb9103b5e83186e0b 100644
--- a/core/src/main/resources/hudson/model/Job/configure_sv_SE.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_sv_SE.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Description=Beskrivning
-Discard\ Old\ Builds=Ta bort gamla byggen
 LOADING=LADDAR
 Save=Spara
 Strategy=Strategi
diff --git a/core/src/main/resources/hudson/model/Job/configure_tr.properties b/core/src/main/resources/hudson/model/Job/configure_tr.properties
index a530c119d24354a90dd2c9fcfb78379858c6f1bf..f65678e2fefcbc4ac9013713b9df8a45e7389535 100644
--- a/core/src/main/resources/hudson/model/Job/configure_tr.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_tr.properties
@@ -23,6 +23,5 @@
 Strategy=Strateji
 name={0} isim
 Description=A\u00e7\u0131klama
-Discard\ Old\ Builds=Eski Yap\u0131land\u0131rmalardan Kurtul
 LOADING=Y\u00DCKLEN\u0130YOR
 Save=Kaydet
diff --git a/core/src/main/resources/hudson/model/Job/configure_uk.properties b/core/src/main/resources/hudson/model/Job/configure_uk.properties
index afbf1a51cccc36b07fe2ecf0cae1002e18e3fe9c..293d8113074a98938573f04de32adc6219bd0425 100644
--- a/core/src/main/resources/hudson/model/Job/configure_uk.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_uk.properties
@@ -1,7 +1,6 @@
 # This file is under the MIT License by authors
 
 Description=\u041E\u043F\u0438\u0441
-Discard\ Old\ Builds=\u0421\u043A\u0430\u0441\u0443\u0432\u0430\u0442\u0438 \u0441\u0442\u0430\u0440\u0456 \u0431\u0456\u043B\u0434\u0438
 LOADING=\u0417\u0410\u0412\u0410\u041D\u0422\u0410\u0416\u0423\u0404\u0422\u042C\u0421\u042F
 Save=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438
 Strategy=\u0421\u0442\u0440\u0430\u0442\u0435\u0433\u0456\u044F
diff --git a/core/src/main/resources/hudson/model/Job/configure_zh_CN.properties b/core/src/main/resources/hudson/model/Job/configure_zh_CN.properties
index 68143f6235b60bc4779d18c105fc21260c0991b9..307ce3d03f7c87178f1fc13b8b241407d97f3405 100644
--- a/core/src/main/resources/hudson/model/Job/configure_zh_CN.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_zh_CN.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Description=\u63CF\u8FF0
-Discard\ Old\ Builds=\u4E22\u5F03\u65E7\u7684\u6784\u5EFA
 LOADING=\u52A0\u8F7D\u4E2D
 Save=\u4FDD\u5B58
 Strategy=\u7B56\u7565
diff --git a/core/src/main/resources/hudson/model/Job/configure_zh_TW.properties b/core/src/main/resources/hudson/model/Job/configure_zh_TW.properties
index 7f09adb310104dc97cab56e8b00b81e3dfe8ea64..44bf241205fd815a13f1e500c1ddae37e44c15da 100644
--- a/core/src/main/resources/hudson/model/Job/configure_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/Job/configure_zh_TW.properties
@@ -25,7 +25,6 @@ LOADING=\u8B80\u53D6\u4E2D
 
 name={0} \u540D\u7A31
 Description=\u63CF\u8FF0
-Discard\ Old\ Builds=\u5FFD\u7565\u820ABuilds
 Strategy=\u7b56\u7565
 
 Save=\u5132\u5b58
diff --git a/core/src/main/resources/jenkins/model/BuildDiscarderProperty/config-details.jelly b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/config-details.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..a5f3d0a4d713c9d65e3a25e3fd2908cd2d4f8cdd
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/config-details.jelly
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License
+
+Copyright 2015 CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+    <f:dropdownDescriptorSelector field="strategy" title="${%Strategy}"/>
+</j:jelly>
diff --git a/war/src/main/webapp/help/project-config/log-rotation.html b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/log-rotation.html
rename to core/src/main/resources/jenkins/model/BuildDiscarderProperty/help.html
diff --git a/war/src/main/webapp/help/project-config/log-rotation_de.html b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_de.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/log-rotation_de.html
rename to core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_de.html
diff --git a/war/src/main/webapp/help/project-config/log-rotation_fr.html b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_fr.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/log-rotation_fr.html
rename to core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_fr.html
diff --git a/war/src/main/webapp/help/project-config/log-rotation_ja.html b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_ja.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/log-rotation_ja.html
rename to core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_ja.html
diff --git a/war/src/main/webapp/help/project-config/log-rotation_pt_BR.html b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_pt_BR.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/log-rotation_pt_BR.html
rename to core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_pt_BR.html
diff --git a/war/src/main/webapp/help/project-config/log-rotation_ru.html b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_ru.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/log-rotation_ru.html
rename to core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_ru.html
diff --git a/war/src/main/webapp/help/project-config/log-rotation_tr.html b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_tr.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/log-rotation_tr.html
rename to core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_tr.html
diff --git a/war/src/main/webapp/help/project-config/log-rotation_zh_TW.html b/core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_zh_TW.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/log-rotation_zh_TW.html
rename to core/src/main/resources/jenkins/model/BuildDiscarderProperty/help_zh_TW.html
diff --git a/core/src/main/resources/jenkins/model/Messages.properties b/core/src/main/resources/jenkins/model/Messages.properties
index 75452a53e7691078bcbf667e03a03b05a49f41c2..63ffa92e530f97c692192c85aef463b9523b9990 100644
--- a/core/src/main/resources/jenkins/model/Messages.properties
+++ b/core/src/main/resources/jenkins/model/Messages.properties
@@ -70,3 +70,4 @@ ParameterizedJobMixIn.build_with_parameters=Build with Parameters
 ParameterizedJobMixIn.build_now=Build Now
 BlockedBecauseOfBuildInProgress.shortDescription=Build #{0} is already in progress{1}
 BlockedBecauseOfBuildInProgress.ETA=\ (ETA:{0})
+BuildDiscarderProperty.displayName=Discard Old Builds
diff --git a/core/src/main/resources/jenkins/model/Messages_bg.properties b/core/src/main/resources/jenkins/model/Messages_bg.properties
new file mode 100644
index 0000000000000000000000000000000000000000..3ecd599250ebbfb16024609f04f5f222e768c4a4
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_bg.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=\u041F\u0440\u0435\u043D\u0435\u0431\u0440\u0435\u0433\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u0442\u0430\u0440\u0438\u0442\u0435 \u0431\u0438\u043B\u0434\u043E\u0432\u0435
diff --git a/core/src/main/resources/jenkins/model/Messages_cs.properties b/core/src/main/resources/jenkins/model/Messages_cs.properties
new file mode 100644
index 0000000000000000000000000000000000000000..ef85dc5059f5062c07cc4513f8825c98bd8ab60a
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_cs.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=Zahodit star\u00E9 sestaven\u00ED
diff --git a/core/src/main/resources/jenkins/model/Messages_da.properties b/core/src/main/resources/jenkins/model/Messages_da.properties
index cabc921cf816b0932943b4ef2ae53fcc4e810e9f..5aff31f66ba0439db7ac3a2de2ad069807bfd8ef 100644
--- a/core/src/main/resources/jenkins/model/Messages_da.properties
+++ b/core/src/main/resources/jenkins/model/Messages_da.properties
@@ -55,3 +55,4 @@ Mailer.Localhost.Error=Venligst inds\u00e6t et gyldigt v\u00e6rtsnavn, istedet f
 ParameterizedJobMixIn.build_now=Byg nu
 BlockedBecauseOfBuildInProgress.shortDescription=Byg #{0} er allerede i gang {1}
 BlockedBecauseOfBuildInProgress.ETA=(ETA:{0})
+BuildDiscarderProperty.displayName=Fjern Gamle Byg
diff --git a/core/src/main/resources/jenkins/model/Messages_de.properties b/core/src/main/resources/jenkins/model/Messages_de.properties
index 1028a7dffbad0d71359df718c42140a7eefe0fe2..44f27164ab37753a29a0b22621950a1550272fe9 100644
--- a/core/src/main/resources/jenkins/model/Messages_de.properties
+++ b/core/src/main/resources/jenkins/model/Messages_de.properties
@@ -65,3 +65,4 @@ ParameterizedJobMixIn.build_with_parameters=Bauen mit Parametern
 ParameterizedJobMixIn.build_now=Jetzt bauen
 BlockedBecauseOfBuildInProgress.shortDescription=Build #{0} ist bereits in Arbeit{1}
 BlockedBecauseOfBuildInProgress.ETA=\ (ETA:{0})
+BuildDiscarderProperty.displayName=Alte Builds verwerfen
diff --git a/core/src/main/resources/jenkins/model/Messages_es.properties b/core/src/main/resources/jenkins/model/Messages_es.properties
index 03517c008774cd110fb8eafac5ddd16a8e3e07ae..dbcea9d5d48e69895aa6b9303fa5c2450f64b509 100644
--- a/core/src/main/resources/jenkins/model/Messages_es.properties
+++ b/core/src/main/resources/jenkins/model/Messages_es.properties
@@ -65,3 +65,4 @@ Mailer.Localhost.Error=Escriba un nombre de servidor correcto en lugar de "local
 ParameterizedJobMixIn.build_now=Construir ahora
 BlockedBecauseOfBuildInProgress.shortDescription=La ejecuci\u00f3n #{0} ya est\u00e1 en progreso {1}
 BlockedBecauseOfBuildInProgress.ETA= (ETA:{0})
+BuildDiscarderProperty.displayName=Desechar ejecuciones antiguas
diff --git a/core/src/main/resources/jenkins/model/Messages_es_AR.properties b/core/src/main/resources/jenkins/model/Messages_es_AR.properties
new file mode 100644
index 0000000000000000000000000000000000000000..9fd7aaa53ab68df0f4ed062b2da0b75e3bf41e32
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_es_AR.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=Descargar build antiguos
diff --git a/core/src/main/resources/jenkins/model/Messages_et.properties b/core/src/main/resources/jenkins/model/Messages_et.properties
new file mode 100644
index 0000000000000000000000000000000000000000..37ea99b75f7c99933fce5a143da640282a3119cf
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_et.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=Eemalda vanad bildid
diff --git a/core/src/main/resources/jenkins/model/Messages_fi.properties b/core/src/main/resources/jenkins/model/Messages_fi.properties
index ad6283cffec633f4d6efb3e37f442af1ab0f84f7..e05f4ad601a65e16f791fd7fcbabf3f11a758f1c 100644
--- a/core/src/main/resources/jenkins/model/Messages_fi.properties
+++ b/core/src/main/resources/jenkins/model/Messages_fi.properties
@@ -1 +1,2 @@
 ParameterizedJobMixIn.build_now=K\u00E4\u00E4nn\u00E4 nyt
+BuildDiscarderProperty.displayName=H\u00E4vit\u00E4 vanhat k\u00E4\u00E4nn\u00F6kset
diff --git a/core/src/main/resources/jenkins/model/Messages_fr.properties b/core/src/main/resources/jenkins/model/Messages_fr.properties
index 2a179edf070e73b41a74fbdc97d14eb6bf1970fa..22adb88b5ab38baa2f4c06bd5b212b37c4a8cb77 100644
--- a/core/src/main/resources/jenkins/model/Messages_fr.properties
+++ b/core/src/main/resources/jenkins/model/Messages_fr.properties
@@ -45,3 +45,4 @@ Hudson.ReadPermission.Description=\
 ParameterizedJobMixIn.build_now=Lancer un build
 BlockedBecauseOfBuildInProgress.shortDescription=Le build #{0} est d\u00e9j\u00e0 en cours {1}
 BlockedBecauseOfBuildInProgress.ETA=\ (fin pr\u00e9vue \u00e0: {0})
+BuildDiscarderProperty.displayName=Supprimer les anciens builds
diff --git a/core/src/main/resources/jenkins/model/Messages_he.properties b/core/src/main/resources/jenkins/model/Messages_he.properties
new file mode 100644
index 0000000000000000000000000000000000000000..cd432a7c6c5ea050398c58de4262ef54ba1d5c61
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_he.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=\u05D4\u05E9\u05DE\u05D3 \u05D1\u05E0\u05D9\u05D5\u05EA \u05D9\u05E9\u05E0\u05D5\u05EA
diff --git a/core/src/main/resources/jenkins/model/Messages_hu.properties b/core/src/main/resources/jenkins/model/Messages_hu.properties
index d75db0b3e3ca892e8ceeb88f2178887f2ab5eefa..5855bc949f4b77ebaaa2ad0140d7d6ab7b2e70f6 100644
--- a/core/src/main/resources/jenkins/model/Messages_hu.properties
+++ b/core/src/main/resources/jenkins/model/Messages_hu.properties
@@ -1 +1,2 @@
 ParameterizedJobMixIn.build_now=\u00C9p\u00EDt\u00E9s Most
+BuildDiscarderProperty.displayName=R\u00E9gi \u00E9p\u00EDt\u00E9sek t\u00F6rl\u00E9se
diff --git a/core/src/main/resources/jenkins/model/Messages_it.properties b/core/src/main/resources/jenkins/model/Messages_it.properties
index bc659061b260dae57b3107d705a2e7ff2dbc51a0..2267c9beb9d2b7f3f7ff5efed4ef2ad0d4ef5777 100644
--- a/core/src/main/resources/jenkins/model/Messages_it.properties
+++ b/core/src/main/resources/jenkins/model/Messages_it.properties
@@ -1,3 +1,4 @@
 ParameterizedJobMixIn.build_now=Effettua build
 BlockedBecauseOfBuildInProgress.shortDescription=Build #{0} is already in progress{1}
 BlockedBecauseOfBuildInProgress.ETA=\ (ETA:{0})
+BuildDiscarderProperty.displayName=Elimina Build Precedenti
diff --git a/core/src/main/resources/jenkins/model/Messages_ja.properties b/core/src/main/resources/jenkins/model/Messages_ja.properties
index 460d2849771da049534329777957dd75c0efa009..a881b1699e034737f8c60078584d5e731d907e4c 100644
--- a/core/src/main/resources/jenkins/model/Messages_ja.properties
+++ b/core/src/main/resources/jenkins/model/Messages_ja.properties
@@ -66,3 +66,4 @@ ParameterizedJobMixIn.build_with_parameters=\u30d1\u30e9\u30e1\u30fc\u30bf\u4ed8
 ParameterizedJobMixIn.build_now=\u30d3\u30eb\u30c9\u5b9f\u884c
 BlockedBecauseOfBuildInProgress.shortDescription=\u30d3\u30eb\u30c9 #{0} \u306f\u65e2\u306b\u5b9f\u884c\u4e2d\u3067\u3059\u3002{1}
 BlockedBecauseOfBuildInProgress.ETA=\ (\u4e88\u5b9a\u6642\u9593:{0})
+BuildDiscarderProperty.displayName=\u53e4\u3044\u30d3\u30eb\u30c9\u306e\u7834\u68c4
diff --git a/core/src/main/resources/jenkins/model/Messages_ko.properties b/core/src/main/resources/jenkins/model/Messages_ko.properties
new file mode 100644
index 0000000000000000000000000000000000000000..04b2ab8b4109b607cc818eeffdb33401bb4fa0ae
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_ko.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=\uC624\uB798\uB41C \uBE4C\uB4DC \uC0AD\uC81C
diff --git a/core/src/main/resources/jenkins/model/Messages_lt.properties b/core/src/main/resources/jenkins/model/Messages_lt.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4679c2595b0b10fbb2acec3de07567181a4512dc
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_lt.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=Pa\u0161alinti senus darbus
diff --git a/core/src/main/resources/jenkins/model/Messages_lv.properties b/core/src/main/resources/jenkins/model/Messages_lv.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b94712621426b8c5dd6bd2a74a9510d68e9a362e
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_lv.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=Dz\u0113st vecos b\u016Bv\u0113jumus
diff --git a/core/src/main/resources/jenkins/model/Messages_nb_NO.properties b/core/src/main/resources/jenkins/model/Messages_nb_NO.properties
new file mode 100644
index 0000000000000000000000000000000000000000..317bc593783b345b0e27f8955c635fbc6f5d4403
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_nb_NO.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=Slett gamle bygg
diff --git a/core/src/main/resources/jenkins/model/Messages_nl.properties b/core/src/main/resources/jenkins/model/Messages_nl.properties
index 6c17f7168da515f2e7a6056aa5b24dfa4b477880..80bb36bf42f5bc7c8e46ef72146fe4e6361726a1 100644
--- a/core/src/main/resources/jenkins/model/Messages_nl.properties
+++ b/core/src/main/resources/jenkins/model/Messages_nl.properties
@@ -33,3 +33,4 @@ Hudson.ViewName=Alle
 ParameterizedJobMixIn.build_now=Start nu een bouwpoging
 BlockedBecauseOfBuildInProgress.shortDescription=Bouwpoging #{0} is reeds actief {1}
 BlockedBecauseOfBuildInProgress.ETA= (einde voorzien op:{0})
+BuildDiscarderProperty.displayName=Oude builds automatisch verwijderen
diff --git a/core/src/main/resources/jenkins/model/Messages_pl.properties b/core/src/main/resources/jenkins/model/Messages_pl.properties
new file mode 100644
index 0000000000000000000000000000000000000000..a0d73064dff8c00f907b0f644db351de7caebe2b
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_pl.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=Porzu\u0107 stare buildy
diff --git a/core/src/main/resources/jenkins/model/Messages_pt_BR.properties b/core/src/main/resources/jenkins/model/Messages_pt_BR.properties
index 15703005a4d8973a2a25f827772ded5fe0750ef0..75a636be07e7bbdb5ed6224f28a90597b9331e68 100644
--- a/core/src/main/resources/jenkins/model/Messages_pt_BR.properties
+++ b/core/src/main/resources/jenkins/model/Messages_pt_BR.properties
@@ -73,3 +73,4 @@ ParameterizedJobMixIn.build_with_parameters=Construir com par\u00e2metros
 ParameterizedJobMixIn.build_now=Construir agora
 BlockedBecauseOfBuildInProgress.shortDescription=A builds #{0} j\u00e1 est\u00e1 em progresso{1}
 BlockedBecauseOfBuildInProgress.ETA=\ (ETA:{0})
+BuildDiscarderProperty.displayName=Descartar builds antigos
diff --git a/core/src/main/resources/jenkins/model/Messages_pt_PT.properties b/core/src/main/resources/jenkins/model/Messages_pt_PT.properties
new file mode 100644
index 0000000000000000000000000000000000000000..02c7b5ce63b6f7188f63c186f2192144c1fd85b4
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_pt_PT.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=Descartar compila\u00E7\u00F5es antigas
diff --git a/core/src/main/resources/jenkins/model/Messages_ro.properties b/core/src/main/resources/jenkins/model/Messages_ro.properties
new file mode 100644
index 0000000000000000000000000000000000000000..222ad24c2e19b33f71cae5c36b030d49ae7b5467
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_ro.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=Anuleaza Build-urile vechi
diff --git a/core/src/main/resources/jenkins/model/Messages_ru.properties b/core/src/main/resources/jenkins/model/Messages_ru.properties
index 28dc506b49535f2e7c112c9ee4f762653787b032..67c0b69ce35d3eaf7e4d154a2797f8598aa92ce2 100644
--- a/core/src/main/resources/jenkins/model/Messages_ru.properties
+++ b/core/src/main/resources/jenkins/model/Messages_ru.properties
@@ -33,3 +33,4 @@ Hudson.ViewName=\u0412\u0441\u0435
 ParameterizedJobMixIn.build_now=\u0421\u043E\u0431\u0440\u0430\u0442\u044C \u0441\u0435\u0439\u0447\u0430\u0441
 BlockedBecauseOfBuildInProgress.shortDescription=\u0421\u0431\u043e\u0440\u043a\u0430 #{0} \u0443\u0436\u0435 \u0432 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0435 {1}
 BlockedBecauseOfBuildInProgress.ETA=\ (\u043e\u0441\u0442\u0430\u043b\u043e\u0441\u044c:{0})
+BuildDiscarderProperty.displayName=\u0423\u0434\u0430\u043b\u044f\u0442\u044c \u0443\u0441\u0442\u0430\u0440\u0435\u0432\u0448\u0438\u0435 \u0441\u0431\u043e\u0440\u043a\u0438
diff --git a/core/src/main/resources/jenkins/model/Messages_sk.properties b/core/src/main/resources/jenkins/model/Messages_sk.properties
new file mode 100644
index 0000000000000000000000000000000000000000..322f01deffd1cdd9f2fe8b8eb68b8f0d7ac60f1f
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_sk.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=Vymazanie star\u00FDch zostaven\u00ED
diff --git a/core/src/main/resources/jenkins/model/Messages_sv_SE.properties b/core/src/main/resources/jenkins/model/Messages_sv_SE.properties
index 07b8954c5cd59bbd8f698d6799486ea0e349233c..db73c8bd4898cd37380706f93bab55dea6bc1813 100644
--- a/core/src/main/resources/jenkins/model/Messages_sv_SE.properties
+++ b/core/src/main/resources/jenkins/model/Messages_sv_SE.properties
@@ -1 +1,2 @@
 ParameterizedJobMixIn.build_now=Starta bygge nu
+BuildDiscarderProperty.displayName=Ta bort gamla byggen
diff --git a/core/src/main/resources/jenkins/model/Messages_tr.properties b/core/src/main/resources/jenkins/model/Messages_tr.properties
index cedf1da87743671e6b1c582cdae34b9144473a5c..78702dbddacc66b2211484eecf245f4b3b2235fc 100644
--- a/core/src/main/resources/jenkins/model/Messages_tr.properties
+++ b/core/src/main/resources/jenkins/model/Messages_tr.properties
@@ -33,3 +33,4 @@ Hudson.ViewName=Hepsi
 ParameterizedJobMixIn.build_now=\u015eimdi Yap\u0131land\u0131r
 BlockedBecauseOfBuildInProgress.shortDescription=Yap\u0131land\u0131rma #{0} zaten i\u015flemde {1}
 BlockedBecauseOfBuildInProgress.ETA=\ (ETA:{0})
+BuildDiscarderProperty.displayName=Eski Yap\u0131land\u0131rmalardan Kurtul
diff --git a/core/src/main/resources/jenkins/model/Messages_uk.properties b/core/src/main/resources/jenkins/model/Messages_uk.properties
new file mode 100644
index 0000000000000000000000000000000000000000..28676a81108b96938a6374b9f9f5311a49edba65
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Messages_uk.properties
@@ -0,0 +1 @@
+BuildDiscarderProperty.displayName=\u0421\u043A\u0430\u0441\u0443\u0432\u0430\u0442\u0438 \u0441\u0442\u0430\u0440\u0456 \u0431\u0456\u043B\u0434\u0438
diff --git a/core/src/main/resources/jenkins/model/Messages_zh_CN.properties b/core/src/main/resources/jenkins/model/Messages_zh_CN.properties
index 0bdb364049acbccdb580ddb8b3a17b2bee38db58..7121d518f778ea4e91b9d6a6dfcd323b9a3d2456 100644
--- a/core/src/main/resources/jenkins/model/Messages_zh_CN.properties
+++ b/core/src/main/resources/jenkins/model/Messages_zh_CN.properties
@@ -1,3 +1,4 @@
 ParameterizedJobMixIn.build_now=\u7acb\u5373\u6784\u5efa
 BlockedBecauseOfBuildInProgress.shortDescription=Build #{0} is already in progress{1}
 BlockedBecauseOfBuildInProgress.ETA=\ (ETA:{0})
+BuildDiscarderProperty.displayName=\u4E22\u5F03\u65E7\u7684\u6784\u5EFA
diff --git a/core/src/main/resources/jenkins/model/Messages_zh_TW.properties b/core/src/main/resources/jenkins/model/Messages_zh_TW.properties
index 2729aea122d33ca5641c313f521dfd37f6ace34d..c7bf681af033618e558a6e4f73a83acf0e793326 100644
--- a/core/src/main/resources/jenkins/model/Messages_zh_TW.properties
+++ b/core/src/main/resources/jenkins/model/Messages_zh_TW.properties
@@ -65,3 +65,4 @@ PatternProjectNamingStrategy.NamePatternInvalidSyntax=\u6b63\u898f\u8868\u793a\u
 ParameterizedJobMixIn.build_now=\u99ac\u4e0a\u5efa\u7f6e
 BlockedBecauseOfBuildInProgress.shortDescription=\u5efa\u7f6e #{0} \u57f7\u884c\u4e2d{1}
 BlockedBecauseOfBuildInProgress.ETA=\ (\u9810\u4f30\u6642\u9593:{0})
+BuildDiscarderProperty.displayName=\u5FFD\u7565\u820ABuilds