diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
index 13a6156b5c88a26d7ea23dd2f9a064f4fe0dd92d..1bcd8e325ab17f5ac31a736c931b9a5342e97952 100644
--- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
+++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
@@ -38,12 +38,14 @@ import javax.annotation.CheckForNull;
 import javax.servlet.ServletException;
 import static javax.servlet.http.HttpServletResponse.SC_CREATED;
 import jenkins.model.Jenkins;
+import jenkins.model.OptionalJobProperty;
 import jenkins.model.ParameterizedJobMixIn;
 import jenkins.util.TimeDuration;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
@@ -60,11 +62,12 @@ import org.kohsuke.stapler.export.ExportedBean;
  * The builds also need a {@code sidepanel.jelly}.
  */
 @ExportedBean(defaultVisibility=2)
-public class ParametersDefinitionProperty extends JobProperty<Job<?, ?>>
+public class ParametersDefinitionProperty extends OptionalJobProperty<Job<?, ?>>
         implements Action {
 
     private final List<ParameterDefinition> parameterDefinitions;
 
+    @DataBoundConstructor
     public ParametersDefinitionProperty(List<ParameterDefinition> parameterDefinitions) {
         this.parameterDefinitions = parameterDefinitions;
     }
@@ -203,33 +206,12 @@ public class ParametersDefinitionProperty extends JobProperty<Job<?, ?>>
     }
 
     @Extension
-    public static class DescriptorImpl extends JobPropertyDescriptor {
+    public static class DescriptorImpl extends OptionalJobPropertyDescriptor {
         @Override
         public boolean isApplicable(Class<? extends Job> jobType) {
             return ParameterizedJobMixIn.ParameterizedJob.class.isAssignableFrom(jobType);
         }
 
-        @Override
-        public JobProperty<?> newInstance(StaplerRequest req,
-                                          JSONObject formData) throws FormException {
-            if (formData.isNullObject()) {
-                return null;
-            }
-
-            JSONObject parameterized = formData.getJSONObject("parameterized");
-
-            if (parameterized.isNullObject()) {
-            	return null;
-            }
-            
-            List<ParameterDefinition> parameterDefinitions = Descriptor.newInstancesFromHeteroList(
-                    req, parameterized, "parameter", ParameterDefinition.all());
-            if(parameterDefinitions.isEmpty())
-                return null;
-
-            return new ParametersDefinitionProperty(parameterDefinitions);
-        }
-
         @Override
         public String getDisplayName() {
             return Messages.ParametersDefinitionProperty_DisplayName();
diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index e81652a8d9f2c0dc9a669f44055c8693599fb4d2..004154e1a15f6ea31fc9928360d1fe27c1c990f1 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -319,7 +319,7 @@ Permalink.LastSuccessfulBuild=Last successful build
 Permalink.LastFailedBuild=Last failed build
 
 ParameterAction.DisplayName=Parameters
-ParametersDefinitionProperty.DisplayName=Parameters
+ParametersDefinitionProperty.DisplayName=This build is parameterized
 StringParameterDefinition.DisplayName=String Parameter
 TextParameterDefinition.DisplayName=Text Parameter
 FileParameterDefinition.DisplayName=File Parameter
diff --git a/core/src/main/resources/hudson/model/Messages_bg.properties b/core/src/main/resources/hudson/model/Messages_bg.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b9c6f20f1965823b644369e8e8f5930f67b725fa
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_bg.properties
@@ -0,0 +1 @@
+ParametersDefinitionProperty.DisplayName=\u0422\u043E\u0437\u0438 \u0431\u0438\u043B\u0434 \u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438\u0437\u0438\u0440\u0430\u043D
diff --git a/core/src/main/resources/hudson/model/Messages_da.properties b/core/src/main/resources/hudson/model/Messages_da.properties
index e27f7a4826b428e852835f25352265c6f145439b..1ff2ebb813f586dfa30736bb8471646f421ce39a 100644
--- a/core/src/main/resources/hudson/model/Messages_da.properties
+++ b/core/src/main/resources/hudson/model/Messages_da.properties
@@ -237,3 +237,4 @@ LoadStatistics.Legends.BusyExecutors=Optagede afviklere
 HealthReport.EmptyString=
 MultiStageTimeSeries.EMPTY_STRING=
 ManageJenkinsAction.DisplayName=Bestyr Jenkins
+ParametersDefinitionProperty.DisplayName=Dette byg er parameteriseret
diff --git a/core/src/main/resources/hudson/model/Messages_de.properties b/core/src/main/resources/hudson/model/Messages_de.properties
index 7a8d5b1bf72025a0e650eca5ff13aee05b318131..89b4ea70ef780300117b79d35b81c52262b621fd 100644
--- a/core/src/main/resources/hudson/model/Messages_de.properties
+++ b/core/src/main/resources/hudson/model/Messages_de.properties
@@ -304,3 +304,4 @@ Cause.RemoteCause.ShortDescription=Gestartet durch entfernten Rechner {0}
 Cause.RemoteCause.ShortDescriptionWithNote=Gestartet durch entfernten Rechner {0} mit Hinweis: {1}
 
 ManageJenkinsAction.DisplayName=Jenkins verwalten
+ParametersDefinitionProperty.DisplayName=Dieser Build ist parametrisiert.
diff --git a/core/src/main/resources/hudson/model/Messages_en_GB.properties b/core/src/main/resources/hudson/model/Messages_en_GB.properties
new file mode 100644
index 0000000000000000000000000000000000000000..9e18978be2cb4e9857a91904fb68e493509324ea
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_en_GB.properties
@@ -0,0 +1 @@
+ParametersDefinitionProperty.DisplayName=This build is parameterised
diff --git a/core/src/main/resources/hudson/model/Messages_es.properties b/core/src/main/resources/hudson/model/Messages_es.properties
index cd201a02468fec5f2990ec52f8f67e31e6660f3b..366ccfd15982ea6cae9474a4c445f71b688ab41d 100644
--- a/core/src/main/resources/hudson/model/Messages_es.properties
+++ b/core/src/main/resources/hudson/model/Messages_es.properties
@@ -311,3 +311,4 @@ UpdateCenter.DownloadButNotActivated=Descarga correcta. Se activar
 Computer.ConnectPermission.Description=Este permiso permite que los usuarios puedan conectar nodos o marcarlos como activos.
 BallColor.NotBuilt=Sin ejecutar.
 AbstractBuild_Building=Ejecutando.
+ParametersDefinitionProperty.DisplayName=Esta ejecución debe parametrizarse
diff --git a/core/src/main/resources/hudson/model/Messages_fr.properties b/core/src/main/resources/hudson/model/Messages_fr.properties
index 37d121a887ad5c2916981852be43ace458785840..035343bf8cb50e75409f77abcd0b95c872ffb14e 100644
--- a/core/src/main/resources/hudson/model/Messages_fr.properties
+++ b/core/src/main/resources/hudson/model/Messages_fr.properties
@@ -192,3 +192,4 @@ MyViewsProperty.DisplayName=Mes vues
 MyViewsProperty.GlobalAction.DisplayName=Mes vues
 
 ManageJenkinsAction.DisplayName=Administrer Jenkins
+ParametersDefinitionProperty.DisplayName=Ce build a des paramètres
diff --git a/core/src/main/resources/hudson/model/Messages_he.properties b/core/src/main/resources/hudson/model/Messages_he.properties
new file mode 100644
index 0000000000000000000000000000000000000000..749fbe732d68257317835ddb25e4af01a620271c
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_he.properties
@@ -0,0 +1 @@
+ParametersDefinitionProperty.DisplayName=\u05D1\u05E0\u05D9\u05D4 \u05DE\u05DB\u05D9\u05DC\u05D4 \u05DE\u05E9\u05EA\u05E0\u05D9\u05DD
diff --git a/core/src/main/resources/hudson/model/Messages_hu.properties b/core/src/main/resources/hudson/model/Messages_hu.properties
index ed0c34be085c0b7b4df928fb34aafcdee114c7ad..949132eb7f5dadd39bd24b1054c24d5985d730d6 100644
--- a/core/src/main/resources/hudson/model/Messages_hu.properties
+++ b/core/src/main/resources/hudson/model/Messages_hu.properties
@@ -1 +1,2 @@
 ManageJenkinsAction.DisplayName=Jenkins Kezel\u00E9se
+ParametersDefinitionProperty.DisplayName=Hozz\u00E1ad
diff --git a/core/src/main/resources/hudson/model/Messages_it.properties b/core/src/main/resources/hudson/model/Messages_it.properties
index cb1fb51eca6084ee6dbe257f0fa980ce699857e9..c975784188ee14f59262725b257258ad43a1ce93 100644
--- a/core/src/main/resources/hudson/model/Messages_it.properties
+++ b/core/src/main/resources/hudson/model/Messages_it.properties
@@ -310,3 +310,4 @@ CLI.cancel-quiet-down.shortDescription=Cancel the effect of the "quiet-down" com
 CLI.reload-configuration.shortDescription=Discard all the loaded data in memory and reload everything from file system. Useful when you modified config files directly on disk.
 
 BuildAuthorizationToken.InvalidTokenProvided=Invalid token provided.
+ParametersDefinitionProperty.DisplayName=Questa build \u00E8 parametrizzata
diff --git a/core/src/main/resources/hudson/model/Messages_ja.properties b/core/src/main/resources/hudson/model/Messages_ja.properties
index e689c3945cdc45da25b79f5d8b8d591d06b59b4d..af6dcdc49c9a1c488763a1619bc18f84f73e2126 100644
--- a/core/src/main/resources/hudson/model/Messages_ja.properties
+++ b/core/src/main/resources/hudson/model/Messages_ja.properties
@@ -332,3 +332,4 @@ Jenkins.CheckDisplayName.NameNotUniqueWarning=\u8868\u793a\u7528\u30d7\u30ed\u30
 Jenkins.CheckDisplayName.DisplayNameNotUniqueWarning=\u8868\u793a\u7528\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d "{0}" \u306f\u4ed6\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u4f7f\u7528\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u3001 \u533a\u5225\u3067\u304d\u306a\u3044\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002
 
 Jenkins.NotAllowedName="{0}" \u306f\u8a31\u53ef\u3055\u308c\u306a\u3044\u540d\u524d\u3067\u3059\u3002
+ParametersDefinitionProperty.DisplayName=\u30d3\u30eb\u30c9\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u5316
diff --git a/core/src/main/resources/hudson/model/Messages_ko.properties b/core/src/main/resources/hudson/model/Messages_ko.properties
index a19ef38f9960cafa1f2054cfc4ac8dec681117b7..70020b26be130e6b02a27701a150adec4277d9be 100644
--- a/core/src/main/resources/hudson/model/Messages_ko.properties
+++ b/core/src/main/resources/hudson/model/Messages_ko.properties
@@ -1 +1,2 @@
 ManageJenkinsAction.DisplayName=Jenkins \uAD00\uB9AC
+ParametersDefinitionProperty.DisplayName=\uC774 \uBE4C\uB4DC\uB294 \uB9E4\uAC1C\uBCC0\uC218\uAC00 \uC788\uC2B5\uB2C8\uB2E4
diff --git a/core/src/main/resources/hudson/model/Messages_lt.properties b/core/src/main/resources/hudson/model/Messages_lt.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4dac83724aa1ecfbabc6c86ed6a896524317aa60
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_lt.properties
@@ -0,0 +1 @@
+ParametersDefinitionProperty.DisplayName=\u0160is darbas yra parametrizuotas
diff --git a/core/src/main/resources/hudson/model/Messages_nb_NO.properties b/core/src/main/resources/hudson/model/Messages_nb_NO.properties
index 02c96d98304627acf6b57ee6e4684d224370d4c1..e475df644f11eff8c3348da4b8b74d91d18ebe2b 100644
--- a/core/src/main/resources/hudson/model/Messages_nb_NO.properties
+++ b/core/src/main/resources/hudson/model/Messages_nb_NO.properties
@@ -1,2 +1,3 @@
 ManageJenkinsAction.DisplayName=Konfigurer Jenkins
 ManageJenkinsAction.DisplayName=Konfigurer Jenkins
+ParametersDefinitionProperty.DisplayName=Denne build har parametre
diff --git a/core/src/main/resources/hudson/model/Messages_nl.properties b/core/src/main/resources/hudson/model/Messages_nl.properties
index b00c75ebbf868325e4a012da876ba30e413b7531..e7b5b57aa62939b06c2c9e2773ee241a201ce1ec 100644
--- a/core/src/main/resources/hudson/model/Messages_nl.properties
+++ b/core/src/main/resources/hudson/model/Messages_nl.properties
@@ -101,3 +101,4 @@ Permalink.LastStableBuild=Laatste stabiele bouwpoging
 Permalink.LastSuccessfulBuild=Laatste succesvolle bouwpoging
 Permalink.LastFailedBuild=Laatst gefaalde bouwpoging
 ManageJenkinsAction.DisplayName=Beheer Jenkins
+ParametersDefinitionProperty.DisplayName=Deze bouwpoging is geparametriseerd
diff --git a/core/src/main/resources/hudson/model/Messages_pl.properties b/core/src/main/resources/hudson/model/Messages_pl.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e36ad43a2546f0508af330e3a1d38133c8cfed78
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_pl.properties
@@ -0,0 +1 @@
+ParametersDefinitionProperty.DisplayName=Ten build jest sparametryzowany
diff --git a/core/src/main/resources/hudson/model/Messages_pt_BR.properties b/core/src/main/resources/hudson/model/Messages_pt_BR.properties
index ff16f1e0f62b94f0089c7371772d200da881be65..f02d0070442d7556cb19de586d5dfa31f358f908 100644
--- a/core/src/main/resources/hudson/model/Messages_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/Messages_pt_BR.properties
@@ -512,3 +512,4 @@ Item.CONFIGURE.description=Mudar a configura\u00e7\u00e3o de um job.
 Item.DELETE.description=Excuir um job.
 HealthReport.EmptyString=
 MultiStageTimeSeries.EMPTY_STRING=
+ParametersDefinitionProperty.DisplayName=Este build \u00E9 parametrizado
diff --git a/core/src/main/resources/hudson/model/Messages_ro.properties b/core/src/main/resources/hudson/model/Messages_ro.properties
new file mode 100644
index 0000000000000000000000000000000000000000..106056997c74b267aad75bab53ddffa7a2df4f18
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_ro.properties
@@ -0,0 +1 @@
+ParametersDefinitionProperty.DisplayName=Acest build este parametrizat
diff --git a/core/src/main/resources/hudson/model/Messages_ru.properties b/core/src/main/resources/hudson/model/Messages_ru.properties
index ee5b0d00f5e403732e49039b7f009605ea4d6f84..b966716ec0685421d4dc357233abac60b274876d 100644
--- a/core/src/main/resources/hudson/model/Messages_ru.properties
+++ b/core/src/main/resources/hudson/model/Messages_ru.properties
@@ -101,3 +101,4 @@ Permalink.LastStableBuild=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f
 Permalink.LastSuccessfulBuild=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0443\u0441\u043f\u0435\u0448\u043d\u0430\u044f \u0441\u0431\u043e\u0440\u043a\u0430
 Permalink.LastFailedBuild=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u043f\u0440\u043e\u0432\u0430\u043b\u0438\u0432\u0448\u0430\u044f\u0441\u044f \u0441\u0431\u043e\u0440\u043a\u0430
 ManageJenkinsAction.DisplayName=\u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Jenkins
+ParametersDefinitionProperty.DisplayName=\u042d\u0442\u043e - \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u043d\u0430\u044f \u0441\u0431\u043e\u0440\u043a\u0430
diff --git a/core/src/main/resources/hudson/model/Messages_sk.properties b/core/src/main/resources/hudson/model/Messages_sk.properties
new file mode 100644
index 0000000000000000000000000000000000000000..d3cf7721e0e164ad7bf7a545fe62165e1a786cc2
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_sk.properties
@@ -0,0 +1 @@
+ParametersDefinitionProperty.DisplayName=Toto zostavenie je parametrizovan\u00E9
diff --git a/core/src/main/resources/hudson/model/Messages_sv_SE.properties b/core/src/main/resources/hudson/model/Messages_sv_SE.properties
index 763f29cdd2fd6214f9e5775c79e5ffe7b2da9db5..278c4193047e0661c862dd0566551295de08085a 100644
--- a/core/src/main/resources/hudson/model/Messages_sv_SE.properties
+++ b/core/src/main/resources/hudson/model/Messages_sv_SE.properties
@@ -4,3 +4,4 @@ AbstractProject.Pronoun=Projekt
 Job.Pronoun=Projekt
 
 ManageJenkinsAction.DisplayName=Hantera Jenkins
+ParametersDefinitionProperty.DisplayName=Detta bygge \u00E4r parametriserat
diff --git a/core/src/main/resources/hudson/model/Messages_tr.properties b/core/src/main/resources/hudson/model/Messages_tr.properties
index ccfc340cd48b4c49b1514ddcb41f880ff32227ae..2d3aaf217950d973a1087118b1f2a2577a46d507 100644
--- a/core/src/main/resources/hudson/model/Messages_tr.properties
+++ b/core/src/main/resources/hudson/model/Messages_tr.properties
@@ -102,3 +102,4 @@ Permalink.LastStableBuild=Son stabil yap\u0131land\u0131rma
 Permalink.LastSuccessfulBuild=Son ba\u015far\u0131l\u0131 yap\u0131land\u0131rma
 Permalink.LastFailedBuild=Son ba\u015far\u0131s\u0131z yap\u0131land\u0131rma
 ManageJenkinsAction.DisplayName=Jenkins''\u0131 Y\u00f6net
+ParametersDefinitionProperty.DisplayName=Bu yap\u0131land\u0131rma parametrele\u015ftirilmi\u015ftir.
diff --git a/core/src/main/resources/hudson/model/Messages_uk.properties b/core/src/main/resources/hudson/model/Messages_uk.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e48bfb0375776662270ad353f349706da23e0daf
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Messages_uk.properties
@@ -0,0 +1 @@
+ParametersDefinitionProperty.DisplayName=\u0426\u044F \u0431\u0443\u0434\u043E\u0432\u0430 \u043C\u0430\u0454 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438
diff --git a/core/src/main/resources/hudson/model/Messages_zh_CN.properties b/core/src/main/resources/hudson/model/Messages_zh_CN.properties
index c9945468dd022103e50c6172501e011fcae64f01..cf982c020e6050695a52ae6ff6b4865f36fe0345 100644
--- a/core/src/main/resources/hudson/model/Messages_zh_CN.properties
+++ b/core/src/main/resources/hudson/model/Messages_zh_CN.properties
@@ -269,3 +269,4 @@ CLI.quiet-down.shortDescription=Quiet down Jenkins, in preparation for a restart
 CLI.cancel-quiet-down.shortDescription=Cancel the effect of the "quiet-down" command.
 CLI.reload-configuration.shortDescription=Discard all the loaded data in memory and reload everything from file system. Useful when you modified config files directly on disk.
 ManageJenkinsAction.DisplayName=\u7cfb\u7edf\u7ba1\u7406
+ParametersDefinitionProperty.DisplayName=\u53C2\u6570\u5316\u6784\u5EFA\u8FC7\u7A0B
diff --git a/core/src/main/resources/hudson/model/Messages_zh_TW.properties b/core/src/main/resources/hudson/model/Messages_zh_TW.properties
index 7acb779f2df12c1dcb2c515a1cb64d943e009cf3..d3058a2b703e2247e82f73f2d55176232073fc6b 100644
--- a/core/src/main/resources/hudson/model/Messages_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/Messages_zh_TW.properties
@@ -325,3 +325,4 @@ Jenkins.CheckDisplayName.NameNotUniqueWarning=\u5df2\u7d93\u6709\u4f5c\u696d\u53
 Jenkins.CheckDisplayName.DisplayNameNotUniqueWarning=\u5df2\u7d93\u6709\u4f5c\u696d\u7684\u986f\u793a\u540d\u7a31\u662f "{0}"\uff0c\u53ef\u80fd\u6703\u9020\u6210\u6df7\u6dc6\u53ca\u5ef6\u9072\u3002
 
 Jenkins.NotAllowedName="{0}" \u4e26\u4e0d\u662f\u53ef\u4ee5\u4f7f\u7528\u7684\u540d\u7a31
+ParametersDefinitionProperty.DisplayName=\u53c3\u6578\u5316\u5efa\u7f6e
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config.jelly b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details.jelly
similarity index 67%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config.jelly
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details.jelly
index b2a1f6ba1016621432632f0264d1f5e55f4a5325..a2d545e0d3f0874c32f33f8e500d4edecfd8bf1c 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config.jelly
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details.jelly
@@ -23,15 +23,8 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
-	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
-	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
-  <f:optionalBlock name="parameterized" title="${%This build is parameterized}"
-          checked="${instance!=null}" help="/help/project-config/parameterized-build.html">
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
     <f:nested>
-      <f:hetero-list name="parameter" hasHeader="true"
-        descriptors="${h.getParameterDescriptors()}" items="${instance.parameterDefinitions}"
-        addCaption="${%Add Parameter}" />
+        <f:repeatableHeteroProperty field="parameterDefinitions" hasHeader="true" addCaption="${%Add Parameter}"/>
     </f:nested>
-  </f:optionalBlock>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_bg.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_bg.properties
new file mode 100644
index 0000000000000000000000000000000000000000..3669d1453314241e726e96a15f5f4ea88e5b0a08
--- /dev/null
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_bg.properties
@@ -0,0 +1,23 @@
+# The MIT License
+#
+# Copyright (c) 2004-2010, Sun Microsystems, 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.
+
+Add\ Parameter=\u0414\u043E\u0431\u0430\u0432\u0438 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u044A\u0440
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ca.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ca.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ca.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ca.properties
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_da.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_da.properties
similarity index 95%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_da.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_da.properties
index f18767a9ff2521145a3c3cf0b7b40623373b18b3..3b313b6542412539fabd6bc0486ebe7cfe586f59 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_da.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_da.properties
@@ -21,4 +21,3 @@
 # THE SOFTWARE.
 
 Add\ Parameter=Tilf\u00f8j Parametre
-This\ build\ is\ parameterized=Dette byg er parameteriseret
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_de.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_de.properties
new file mode 100644
index 0000000000000000000000000000000000000000..315117f2c31c2abf02e15581fcc8617b063c5bd5
--- /dev/null
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_de.properties
@@ -0,0 +1 @@
+Add\ Parameter=Parameter hinzufügen
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_es.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_es.properties
similarity index 94%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_es.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_es.properties
index 29bf30e7594c0a25da45da0ef2a45bf299f4cdfc..dbfed3fa2544887e54505fecf30442e83f2ef935 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_es.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_es.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ build\ is\ parameterized=Esta ejecución debe parametrizarse
 Add\ Parameter=Añadir un parámetro
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_fi.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_fi.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_fi.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_fi.properties
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_fr.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_fr.properties
similarity index 95%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_fr.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_fr.properties
index 6c9fe1823c0ea9509d174f71614c2327bb57b5b3..bab6b2cbeabdb71d2be6228a79abb2c1e706c5ea 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_fr.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_fr.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ build\ is\ parameterized=Ce build a des paramètres
 Add\ Parameter=Ajouter un paramètre
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_he.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_he.properties
new file mode 100644
index 0000000000000000000000000000000000000000..3ffb627eec0d0fb383684947dc25905e88ed7bdd
--- /dev/null
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_he.properties
@@ -0,0 +1,3 @@
+# This file is under the MIT License by authors
+
+Add\ Parameter=\u05D4\u05D5\u05E1\u05E3 \u05DE\u05E9\u05EA\u05E0\u05D4
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_hu.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_hu.properties
similarity index 69%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_hu.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_hu.properties
index 7eb7f4cee30b553b75d22221e648ea17aad70143..265e1c7a5cb0744c562212a23e59e9024842e764 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_hu.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_hu.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
 Add\ Parameter=Param\u00E9ter hozz\u00E1ad\u00E1sa
-This\ build\ is\ parameterized=Hozz\u00E1ad
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_it.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_it.properties
similarity index 94%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_it.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_it.properties
index df1251f2fd0713259d30df1a3c0f95ef92f6b9da..a362612239e9fc6da39e225cf2a75870a65b6edc 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_it.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_it.properties
@@ -21,4 +21,3 @@
 # THE SOFTWARE.
 
 Add\ Parameter=Aggiungi Parametro
-This\ build\ is\ parameterized=Questa build \u00E8 parametrizzata
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ja.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ja.properties
similarity index 88%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ja.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ja.properties
index c466a762ce0908e64e4b1c534eb37c4a22e8df13..c4fabe7ca95ee646be1499fadbea9d7d70c44f9f 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ja.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ja.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ build\ is\ parameterized=\u30d3\u30eb\u30c9\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u5316
-Add\ Parameter=\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u8ffd\u52a0
\ No newline at end of file
+Add\ Parameter=\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u8ffd\u52a0
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ko.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ko.properties
new file mode 100644
index 0000000000000000000000000000000000000000..6ebd2a13ecaa81ebe1be68754ef059a684b244a0
--- /dev/null
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ko.properties
@@ -0,0 +1,3 @@
+# This file is under the MIT License by authors
+
+Add\ Parameter=\uB9E4\uAC1C\uBCC0\uC218 \uCD94\uAC00
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_lt.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_lt.properties
similarity index 57%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_lt.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_lt.properties
index 4c66949799af17a1dc2bac0f338fbbaf624350a6..d1aace2dae62c9969a870e18d686bc30e2ffa854 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_lt.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_lt.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
 Add\ Parameter=Prid\u0117ti parametr\u0105
-This\ build\ is\ parameterized=\u0160is darbas yra parametrizuotas
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_lv.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_lv.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_lv.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_lv.properties
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_nb_NO.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_nb_NO.properties
similarity index 95%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_nb_NO.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_nb_NO.properties
index 7a09188ef889f25bf028f84af446b36ad468ca48..0e081ccb9fb5b8e2c0724e1459398a7726eb0c73 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_nb_NO.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_nb_NO.properties
@@ -21,4 +21,3 @@
 # THE SOFTWARE.
 
 Add\ Parameter=Legg til parameter
-This\ build\ is\ parameterized=Denne build har parametre
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_nl.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_nl.properties
similarity index 55%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_nl.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_nl.properties
index 7b7fe50685655e2144d8016278afee46e00bef6f..dcdd5a5287d8b0179d9546c9be92963399ce81dd 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_nl.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_nl.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
 Add\ Parameter=Instelling toevoegen
-This\ build\ is\ parameterized=Deze bouwpoging is geparametriseerd
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pl.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_pl.properties
similarity index 94%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pl.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_pl.properties
index 3fccb98d7ae1053fe32cfb44ca31765aecf57ad0..e929a96a2ccaa7dac993a9c969d9dcc422d94d7b 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pl.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_pl.properties
@@ -21,4 +21,3 @@
 # THE SOFTWARE.
 
 Add\ Parameter=Dodaj parametr
-This\ build\ is\ parameterized=Ten build jest sparametryzowany
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_pt_BR.properties
similarity index 95%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_pt_BR.properties
index 602308ba2224dd17f4231f14ef66ecbcd12f65de..0f269cfdd6894eb3d4d48e9a1855644616f962a9 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_pt_BR.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ build\ is\ parameterized=Este build \u00E9 parametrizado
 Add\ Parameter=Adicionar par\u00e2metro
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ro.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ro.properties
similarity index 57%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ro.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ro.properties
index 1f84c50491177cb89cf4465993fd21cc2797c430..bda5b182eb53f3df4045c723d79c8b1d55fe84d8 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ro.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ro.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
 Add\ Parameter=Adauga Parametru
-This\ build\ is\ parameterized=Acest build este parametrizat
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ru.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ru.properties
new file mode 100644
index 0000000000000000000000000000000000000000..af02f213e56ae8d96930b12c680ee2a21d8ffbca
--- /dev/null
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_ru.properties
@@ -0,0 +1,23 @@
+# The MIT License
+#
+# Copyright (c) 2004-2010, Sun Microsystems, 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.
+
+Add\ Parameter=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_sk.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_sk.properties
similarity index 53%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_sk.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_sk.properties
index bcc1f6c9c4f998b7a4febc6650393c037d1675a8..2dbb26fa0301e89a9c58ca410944aceb410b3723 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_sk.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_sk.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
 Add\ Parameter=Pridaj parameter
-This\ build\ is\ parameterized=Toto zostavenie je parametrizovan\u00E9
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_sv_SE.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_sv_SE.properties
similarity index 94%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_sv_SE.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_sv_SE.properties
index d2cac0e4bbf5e1f1863cae84b7da1452f0203ee0..9c8d2bc11650417404a4e4744c1d79de5d734f70 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_sv_SE.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_sv_SE.properties
@@ -21,4 +21,3 @@
 # THE SOFTWARE.
 
 Add\ Parameter=L\u00E4gg till parameter
-This\ build\ is\ parameterized=Detta bygge \u00E4r parametriserat
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_tr.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_tr.properties
similarity index 92%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_tr.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_tr.properties
index 269e5de81bbe610c7b59dab2a25c551a9c5672c4..3ce3029f744969f02a419e6044308f29825a13f5 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_tr.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_tr.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ build\ is\ parameterized=Bu yap\u0131land\u0131rma parametrele\u015ftirilmi\u015ftir.
 Add\ Parameter=Parametre ekle
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_uk.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_uk.properties
new file mode 100644
index 0000000000000000000000000000000000000000..0c6b712511d6cacec9b6039c953373965886a0ff
--- /dev/null
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_uk.properties
@@ -0,0 +1,3 @@
+# This file is under the MIT License by authors
+
+Add\ Parameter=\u0414\u043E\u0434\u0430\u0442\u0438 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_zh_CN.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_zh_CN.properties
similarity index 94%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_zh_CN.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_zh_CN.properties
index b760379d98691b2ff8007b461d0795ff6b70b225..572578efad90ad55c3f899f7c4afaed0022fba93 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_zh_CN.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_zh_CN.properties
@@ -21,4 +21,3 @@
 # THE SOFTWARE.
 
 Add\ Parameter=\u6DFB\u52A0\u53C2\u6570
-This\ build\ is\ parameterized=\u53C2\u6570\u5316\u6784\u5EFA\u8FC7\u7A0B
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_zh_TW.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_zh_TW.properties
similarity index 95%
rename from core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_zh_TW.properties
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_zh_TW.properties
index 2e4dc6bccab125f1c36558c610e91718313135c7..1ba5e442e094b6dbf4eda8b6a88c0ef98b5be8f1 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config-details_zh_TW.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ build\ is\ parameterized=\u53c3\u6578\u5316\u5efa\u7f6e
 Add\ Parameter=\u65B0\u589E\u53C3\u6578
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_bg.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_bg.properties
deleted file mode 100644
index de74757cf3f2dddf32bf796284d3e344d6aba49d..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_bg.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, 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.
-
-Add\ Parameter=\u0414\u043E\u0431\u0430\u0432\u0438 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u044A\u0440
-This\ build\ is\ parameterized=\u0422\u043E\u0437\u0438 \u0431\u0438\u043B\u0434 \u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438\u0437\u0438\u0440\u0430\u043D
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_de.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_de.properties
deleted file mode 100644
index b095c4e88032cdaa819b7a9594421360171311c3..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_de.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-This\ build\ is\ parameterized=Dieser Build ist parametrisiert.
-Add\ Parameter=Parameter hinzufügen
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_en_GB.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_en_GB.properties
deleted file mode 100644
index 76261e71cdeee54d5bfc7947de95a60c00ee56b7..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_en_GB.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-This\ build\ is\ parameterized=This build is parameterised
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_he.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_he.properties
deleted file mode 100644
index 9417ad6eeff56b805a2ce93a8acdffb5feaa65f5..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_he.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is under the MIT License by authors
-
-Add\ Parameter=\u05D4\u05D5\u05E1\u05E3 \u05DE\u05E9\u05EA\u05E0\u05D4
-This\ build\ is\ parameterized=\u05D1\u05E0\u05D9\u05D4 \u05DE\u05DB\u05D9\u05DC\u05D4 \u05DE\u05E9\u05EA\u05E0\u05D9\u05DD
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ko.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ko.properties
deleted file mode 100644
index daaae005f86b6f519cf1d9e9aaf3d540c6a8128a..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ko.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is under the MIT License by authors
-
-Add\ Parameter=\uB9E4\uAC1C\uBCC0\uC218 \uCD94\uAC00
-This\ build\ is\ parameterized=\uC774 \uBE4C\uB4DC\uB294 \uB9E4\uAC1C\uBCC0\uC218\uAC00 \uC788\uC2B5\uB2C8\uB2E4
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ru.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ru.properties
deleted file mode 100644
index 52c610189d77dd70fc7b325acc9d6a79485ddea9..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_ru.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, 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.
-
-Add\ Parameter=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440
-This\ build\ is\ parameterized=\u042d\u0442\u043e - \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u043d\u0430\u044f \u0441\u0431\u043e\u0440\u043a\u0430
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_uk.properties b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_uk.properties
deleted file mode 100644
index a0875e36a55d944a3f1f38449747ef9cd1e7ec24..0000000000000000000000000000000000000000
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/config_uk.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is under the MIT License by authors
-
-Add\ Parameter=\u0414\u043E\u0434\u0430\u0442\u0438 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440
-This\ build\ is\ parameterized=\u0426\u044F \u0431\u0443\u0434\u043E\u0432\u0430 \u043C\u0430\u0454 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438
diff --git a/war/src/main/webapp/help/project-config/parameterized-build.html b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/help.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/parameterized-build.html
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/help.html
diff --git a/war/src/main/webapp/help/project-config/parameterized-build_de.html b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_de.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/parameterized-build_de.html
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_de.html
diff --git a/war/src/main/webapp/help/project-config/parameterized-build_fr.html b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_fr.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/parameterized-build_fr.html
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_fr.html
diff --git a/war/src/main/webapp/help/project-config/parameterized-build_ja.html b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_ja.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/parameterized-build_ja.html
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_ja.html
diff --git a/war/src/main/webapp/help/project-config/parameterized-build_tr.html b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_tr.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/parameterized-build_tr.html
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_tr.html
diff --git a/war/src/main/webapp/help/project-config/parameterized-build_zh_TW.html b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_zh_TW.html
similarity index 100%
rename from war/src/main/webapp/help/project-config/parameterized-build_zh_TW.html
rename to core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_zh_TW.html