You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2012/05/08 11:55:31 UTC
[2/2] Fixes WICKET-2128: all variables in validation messages have
been replaced with
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-core/src/main/java/org/apache/wicket/Application_sk.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_sk.properties b/wicket-core/src/main/java/org/apache/wicket/Application_sk.properties
index 2affc67..e9a9ef4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_sk.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_sk.properties
@@ -13,27 +13,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
Required=pole '${label}' je povinn\u00e9.
-IConverter='${input}' nie je platn\u00fd ${type}.
+IConverter='${label}' nie je platn\u00fd ${type}.
-RangeValidator=${input} mus\u00ed by\u0165 medzi ${minimum} a ${maximum}.
-MinimumValidator='${input}' mus\u00ed by\u0165 v\u00e4\u010d\u0161ie ne\u017e ${minimum}.
-MaximumValidator='${input}' mus\u00ed by\u0165 men\u0161ie ne\u017e ${maximum}.
-NumberValidator.positive='${input}' mus\u00ed by\u0165 kladn\u00e9.
-NumberValidator.negative='${input}' mus\u00ed by\u0165 z\u00e1porn\u00e9.
+RangeValidator=${label} mus\u00ed by\u0165 medzi ${minimum} a ${maximum}.
+MinimumValidator='${label}' mus\u00ed by\u0165 v\u00e4\u010d\u0161ie ne\u017e ${minimum}.
+MaximumValidator='${label}' mus\u00ed by\u0165 men\u0161ie ne\u017e ${maximum}.
+NumberValidator.positive='${label}' mus\u00ed by\u0165 kladn\u00e9.
+NumberValidator.negative='${label}' mus\u00ed by\u0165 z\u00e1porn\u00e9.
-StringValidator.range='${input}' mus\u00ed ma\u0165 medzi ${minimum} a\u017e ${maximum} znakmi.
-StringValidator.minimum='${input}' mus\u00ed ma\u0165 najmenej ${minimum} znakov.
-StringValidator.maximum='${input}' mus\u00ed ma\u0165 najviac ${maximum} znakov.
-StringValidator.exact='${input}' mus\u00ed ma\u0165 presne ${exact} znakov.
+StringValidator.range='${label}' mus\u00ed ma\u0165 medzi ${minimum} a\u017e ${maximum} znakmi.
+StringValidator.minimum='${label}' mus\u00ed ma\u0165 najmenej ${minimum} znakov.
+StringValidator.maximum='${label}' mus\u00ed ma\u0165 najviac ${maximum} znakov.
+StringValidator.exact='${label}' mus\u00ed ma\u0165 presne ${exact} znakov.
-DateValidator.range='${input}' mus\u00ed by\u0165 medzi ${minimum} a ${maximum}.
-DateValidator.minimum='${input}' mus\u00ed by\u0165 v\u00e4\u010d\u0161\u00ed ne\u017e ${minimum}.
-DateValidator.maximum='${input}' mus\u00ed by\u0165 men\u0161\u00ed ne\u017e ${maximum}.
+DateValidator.range='${label}' mus\u00ed by\u0165 medzi ${minimum} a ${maximum}.
+DateValidator.minimum='${label}' mus\u00ed by\u0165 v\u00e4\u010d\u0161\u00ed ne\u017e ${minimum}.
+DateValidator.maximum='${label}' mus\u00ed by\u0165 men\u0161\u00ed ne\u017e ${maximum}.
-PatternValidator='${input}' nezodpoved\u00e1 regul\u00e1rnemu v\u00fdrazu '${pattern}'
-EmailAddressValidator='${input}' nie je platn\u00e1 emailov\u00e1 adresa.
+PatternValidator='${label}' nezodpoved\u00e1 regul\u00e1rnemu v\u00fdrazu '${pattern}'
+EmailAddressValidator='${label}' nie je platn\u00e1 emailov\u00e1 adresa.
CreditCardValidator=\u010c\u00edslo kreditnej karty je neplatn\u00e9.
-UrlValidator='${input}' nie je platn\u00e1 URL.
+UrlValidator='${label}' nie je platn\u00e1 URL.
EqualInputValidator='${input0}' z ${label0} a '${input1}' z ${label1} musia by\u0165 rovnak\u00e9.
EqualPasswordInputValidator=${label0} a ${label1} musia by\u0165 rovnak\u00e9.
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-core/src/main/java/org/apache/wicket/Application_sl.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_sl.properties b/wicket-core/src/main/java/org/apache/wicket/Application_sl.properties
index b1843c7..e341b0c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_sl.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_sl.properties
@@ -14,24 +14,24 @@
# limitations under the License.
Required=Polje '${label}' je obvezno.
-IConverter='${input}' ni veljavna ${type} vrednost.
+IConverter='${label}' ni veljavna ${type} vrednost.
-RangeValidator=Vrednost '${input}' mora biti med ${minimum} in ${maximum}.
-MinimumValidator=Vrednost '${input}' je manj\u0161a od ${minimum}.
-MaximumValidator=Vrednost '${input}' je ve\u010dja od ${maximum}.
+RangeValidator=Vrednost '${label}' mora biti med ${minimum} in ${maximum}.
+MinimumValidator=Vrednost '${label}' je manj\u0161a od ${minimum}.
+MaximumValidator=Vrednost '${label}' je ve\u010dja od ${maximum}.
-StringValidator.range=Dol\u017eina '${input}' mora biti med ${minimum} in ${maximum}.
-StringValidator.minimum=Dol\u017eina '${input}' je manj\u0161a od ${minimum}.
-StringValidator.maximum=Dol\u017eina '${input}' je ve\u010dja od ${maximum}.
-StringValidator.exact=Dol\u017eina '${input}' ni enaka ${exact}.
+StringValidator.range=Dol\u017eina '${label}' mora biti med ${minimum} in ${maximum}.
+StringValidator.minimum=Dol\u017eina '${label}' je manj\u0161a od ${minimum}.
+StringValidator.maximum=Dol\u017eina '${label}' je ve\u010dja od ${maximum}.
+StringValidator.exact=Dol\u017eina '${label}' ni enaka ${exact}.
-DateValidator.range=Vrednost '${input}' mora biti med ${minimum} in ${maximum}.
-DateValidator.minimum=Vrednost '${input}' je manj\u0161a od ${minimum}.
-DateValidator.maximum=Vrednost '${input}' je ve\u010dja od ${maximum}.
+DateValidator.range=Vrednost '${label}' mora biti med ${minimum} in ${maximum}.
+DateValidator.minimum=Vrednost '${label}' je manj\u0161a od ${minimum}.
+DateValidator.maximum=Vrednost '${label}' je ve\u010dja od ${maximum}.
CreditCardValidator=\u0160tevilka kredtne kartice ni veljavna.
-PatternValidator=Vrednost '${input}' ne ustreza vzorcu '${pattern}'.
-EmailAddressValidator=Vrednost '${input}' ni veljaven naslov za e-po\u0161to.
+PatternValidator=Vrednost '${label}' ne ustreza vzorcu '${pattern}'.
+EmailAddressValidator=Vrednost '${label}' ni veljaven naslov za e-po\u0161to.
EqualInputValidator='${input0}' od ${label0} in '${input1}' od ${label1} morata biti enaka.
EqualPasswordInputValidator=${label0} in ${label1} morata biti enaka.
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-core/src/main/java/org/apache/wicket/Application_sv.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_sv.properties b/wicket-core/src/main/java/org/apache/wicket/Application_sv.properties
index d9bf8a4..f9199ef 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_sv.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_sv.properties
@@ -13,35 +13,35 @@
# See the License for the specific language governing permissions and
# limitations under the License.
Required=f\u00e4ltet '${label}' kr\u00e4vs.
-IConverter='${input}' \u00e4r ingen giltig ${type}.
+IConverter='${label}' \u00e4r ingen giltig ${type}.
-RangeValidator=${input} m\u00e5ste vara mellan ${minimum} och ${maximum}.
-MinimumValidator='${input}' m\u00e5ste vara st\u00f6rre \u00e4n ${minimum}.
-MaximumValidator='${input}' m\u00e5ste vara mindre \u00e4n ${maximum}.
+RangeValidator=${label} m\u00e5ste vara mellan ${minimum} och ${maximum}.
+MinimumValidator='${label}' m\u00e5ste vara st\u00f6rre \u00e4n ${minimum}.
+MaximumValidator='${label}' m\u00e5ste vara mindre \u00e4n ${maximum}.
-StringValidator.range='${input}' m\u00e5ste inneh\u00e5lla mellan ${minimum} och ${maximum} tecken.
-StringValidator.minimum='${input}' m\u00e5ste inneh\u00e5lla minst ${minimum} tecken.
-StringValidator.maximum='${input}' f\u00e5r som mest inneh\u00e5lla ${maximum} tecken.
-StringValidator.exact='${input}' m\u00e5ste vara ${exact} tecken l\u00e5ng.
+StringValidator.range='${label}' m\u00e5ste inneh\u00e5lla mellan ${minimum} och ${maximum} tecken.
+StringValidator.minimum='${label}' m\u00e5ste inneh\u00e5lla minst ${minimum} tecken.
+StringValidator.maximum='${label}' f\u00e5r som mest inneh\u00e5lla ${maximum} tecken.
+StringValidator.exact='${label}' m\u00e5ste vara ${exact} tecken l\u00e5ng.
EqualPasswordInputValidator=${label0} och ${label1} m\u00e5ste vara lika.
-DateValidator.range='${input}' m\u00e5ste vara mellan ${minimum} och ${maximum}.
-DateValidator.minimum='${input}' m\u00e5ste vara senare \u00e4n ${minimum}.
-DateValidator.maximum='${input}' m\u00e5ste vara tidigare \u00e4n ${maximum}.
+DateValidator.range='${label}' m\u00e5ste vara mellan ${minimum} och ${maximum}.
+DateValidator.minimum='${label}' m\u00e5ste vara senare \u00e4n ${minimum}.
+DateValidator.maximum='${label}' m\u00e5ste vara tidigare \u00e4n ${maximum}.
-PatternValidator='${input}' matchar inte m\u00f6nstret '${pattern}'
-EmailAddressValidator='${input}' \u00e4r ingen giltig epostadress.
+PatternValidator='${label}' matchar inte m\u00f6nstret '${pattern}'
+EmailAddressValidator='${label}' \u00e4r ingen giltig epostadress.
EqualInputValidator='${input0}' fr\u00e5n ${label0} och '${input1}' fr\u00e5n ${label1} m\u00e5ste vara lika.
null=V\u00e4lj en
nullValid=
-IConverter.Integer='${input}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt heltal.
-IConverter.integer='${input}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt heltal.
-IConverter.Double='${input}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt flyttal.
-IConverter.double='${input}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt flyttal.
-IConverter.Long='${input}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt heltal.
-IConverter.long='${input}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt heltal.
-IConverter.Date='${input}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt datum.
-IConverter.date='${input}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt datum.
+IConverter.Integer='${label}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt heltal.
+IConverter.integer='${label}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt heltal.
+IConverter.Double='${label}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt flyttal.
+IConverter.double='${label}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt flyttal.
+IConverter.Long='${label}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt heltal.
+IConverter.long='${label}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt heltal.
+IConverter.Date='${label}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt datum.
+IConverter.date='${label}' i f\u00e4ltet '${label}' \u00e4r inte ett giltigt datum.
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-core/src/main/java/org/apache/wicket/Application_tl.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_tl.properties b/wicket-core/src/main/java/org/apache/wicket/Application_tl.properties
index b2b652e..eb1da9e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_tl.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_tl.properties
@@ -13,22 +13,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
Required=Ang '${label}' ay kailangan.
-IConverter=Ang '${input}' ay hindi isang ${type}.
+IConverter=Ang '${label}' ay hindi isang ${type}.
-RangeValidator=Ang ${input} ay dapat na nasa pagitan ng ${minimum} hanggang ${maximum} lamang.
-MinimumValidator=Ang '${input}' ay dapat na mas higit sa ${minimum}.
-MaximumValidator=Ang '${input}' ay dapat na mas mababa sa ${maximum}.
+RangeValidator=Ang ${label} ay dapat na nasa pagitan ng ${minimum} hanggang ${maximum} lamang.
+MinimumValidator=Ang '${label}' ay dapat na mas higit sa ${minimum}.
+MaximumValidator=Ang '${label}' ay dapat na mas mababa sa ${maximum}.
-StringValidator.range=Ang bilang ng mga titik sa '${input}' ay dapat na nasa pagitan ng ${minimum} hanggang ${maximum} lamang.
-StringValidator.minimum=Ang bilang ng mga titik sa '${input}' ay hindi dapat na mas kaunti sa ${minimum}.
-StringValidator.maximum=Ang bilang ng mga titik sa '${input}' ay hindi dapat na mas marami sa ${maximum}.
+StringValidator.range=Ang bilang ng mga titik sa '${label}' ay dapat na nasa pagitan ng ${minimum} hanggang ${maximum} lamang.
+StringValidator.minimum=Ang bilang ng mga titik sa '${label}' ay hindi dapat na mas kaunti sa ${minimum}.
+StringValidator.maximum=Ang bilang ng mga titik sa '${label}' ay hindi dapat na mas marami sa ${maximum}.
-DateValidator.range=Ang ${input} ay dapat na nasa pagitan ng ${minimum} hanggang ${maximum} lamang.
-DateValidator.minimum='Ang '${input}' ay dapat na mas higit sa ${minimum}.
-DateValidator.maximum=Ang '${input}' ay dapat na mas mababa sa ${maximum}.
+DateValidator.range=Ang ${label} ay dapat na nasa pagitan ng ${minimum} hanggang ${maximum} lamang.
+DateValidator.minimum='Ang '${label}' ay dapat na mas higit sa ${minimum}.
+DateValidator.maximum=Ang '${label}' ay dapat na mas mababa sa ${maximum}.
-PatternValidator=Ang '${input}' ay hindi tumugma sa pattern na '${pattern}'.
-EmailAddressValidator=Ang '${input}' ay hindi puwedeng email address.
+PatternValidator=Ang '${label}' ay hindi tumugma sa pattern na '${pattern}'.
+EmailAddressValidator=Ang '${label}' ay hindi puwedeng email address.
EqualInputValidator=Ang '${input0}' mula sa ${label0} at ang '${input1}' mula sa ${label1} ay dapat na magkapareho.
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-core/src/main/java/org/apache/wicket/Application_zh_CN.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_zh_CN.properties b/wicket-core/src/main/java/org/apache/wicket/Application_zh_CN.properties
index 6b70062..49d1c7c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_zh_CN.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_zh_CN.properties
@@ -13,23 +13,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
Required='${label}' \u662F\u5FC5\u586B\u9879\uFF01
-IConverter='${input}' \u4E0D\u662F\u6709\u6548\u7684 ${type} \u7C7B\u578B\uFF01
+IConverter='${label}' \u4E0D\u662F\u6709\u6548\u7684 ${type} \u7C7B\u578B\uFF01
-RangeValidator=${input} \u5FC5\u987B\u4ECB\u4E8E ${minimum} \u548C ${maximum} \u4E4B\u95F4\uFF01
-MinimumValidator='${input}' \u5FC5\u987B\u5927\u4E8E ${minimum}\uFF01
-MaximumValidator='${input}' \u5FC5\u987B\u5C0F\u4E8E ${maximum}\uFF01
+RangeValidator=${label} \u5FC5\u987B\u4ECB\u4E8E ${minimum} \u548C ${maximum} \u4E4B\u95F4\uFF01
+MinimumValidator='${label}' \u5FC5\u987B\u5927\u4E8E ${minimum}\uFF01
+MaximumValidator='${label}' \u5FC5\u987B\u5C0F\u4E8E ${maximum}\uFF01
-StringValidator.range='${input}' \u53EA\u80FD\u662F ${minimum} \u5230 ${maximum} \u4E2A\u5B57\u7B26\uFF01
-StringValidator.minimum='${input}' \u81F3\u5C11\u5FC5\u987B\u662F ${minimum} \u4E2A\u5B57\u7B26\uFF01
-StringValidator.maximum='${input}' \u6700\u591A\u53EA\u80FD\u4E0D\u8D85\u8FC7 ${maximum} \u4E2A\u5B57\u7B26\uFF01
+StringValidator.range='${label}' \u53EA\u80FD\u662F ${minimum} \u5230 ${maximum} \u4E2A\u5B57\u7B26\uFF01
+StringValidator.minimum='${label}' \u81F3\u5C11\u5FC5\u987B\u662F ${minimum} \u4E2A\u5B57\u7B26\uFF01
+StringValidator.maximum='${label}' \u6700\u591A\u53EA\u80FD\u4E0D\u8D85\u8FC7 ${maximum} \u4E2A\u5B57\u7B26\uFF01
-DateValidator.range='${input}' \u5FC5\u987B\u4ECB\u4E8E ${minimum} \u548C ${maximum} \u4E4B\u95F4\uFF01
-DateValidator.minimum='${input}' \u5FC5\u987B\u665A\u4E8E ${minimum}\uFF01
-DateValidator.maximum='${input}' \u5FC5\u987B\u65E9\u4E8E ${maximum}\uFF01
+DateValidator.range='${label}' \u5FC5\u987B\u4ECB\u4E8E ${minimum} \u548C ${maximum} \u4E4B\u95F4\uFF01
+DateValidator.minimum='${label}' \u5FC5\u987B\u665A\u4E8E ${minimum}\uFF01
+DateValidator.maximum='${label}' \u5FC5\u987B\u65E9\u4E8E ${maximum}\uFF01
-PatternValidator='${input}' \u4E0D\u6EE1\u8DB3\u683C\u5F0F '${pattern}'\uFF01
-EmailAddressValidator='${input}' \u4E0D\u662F\u6709\u6548\u7684\u90AE\u7BB1\u5730\u5740\uFF01
-UrlValidator='${input}'\u4e0d\u662f\u4e00\u4e2a\u5408\u6cd5\u7684URL\u3002
+PatternValidator='${label}' \u4E0D\u6EE1\u8DB3\u683C\u5F0F '${pattern}'\uFF01
+EmailAddressValidator='${label}' \u4E0D\u662F\u6709\u6548\u7684\u90AE\u7BB1\u5730\u5740\uFF01
+UrlValidator='${label}'\u4e0d\u662f\u4e00\u4e2a\u5408\u6cd5\u7684URL\u3002
EqualInputValidator=${label0} \u7684 '${input0}' \u548C ${label1} \u7684 '${input1}' \u5FC5\u987B\u4E00\u81F4\uFF01
EqualPasswordInputValidator=${label0} \u548C ${label1} \u5FC5\u987B\u4E00\u81F4\uFF01
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-core/src/main/java/org/apache/wicket/Application_zh_TW.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_zh_TW.properties b/wicket-core/src/main/java/org/apache/wicket/Application_zh_TW.properties
index 46075e3..6343279 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_zh_TW.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_zh_TW.properties
@@ -13,23 +13,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
Required = '${label}' \u70BA\u5FC5\u586B\u6B04\u4F4D
-IConverter = '${input}' \u4E0D\u7B26\u5408\u683C\u5F0F: ${type}
+IConverter = '${label}' \u4E0D\u7B26\u5408\u683C\u5F0F: ${type}
-RangeValidator = ${input} \u5FC5\u9808\u4ECB\u65BC ${minimum} \u548C ${maximum} \u4E4B\u9593
-MinimumValidator = '${input}' \u5FC5\u9808\u5927\u65BC ${minimum}
-MaximumValidator = '${input}' \u5FC5\u9808\u5C0F\u65BC ${maximum}
+RangeValidator = ${label} \u5FC5\u9808\u4ECB\u65BC ${minimum} \u548C ${maximum} \u4E4B\u9593
+MinimumValidator = '${label}' \u5FC5\u9808\u5927\u65BC ${minimum}
+MaximumValidator = '${label}' \u5FC5\u9808\u5C0F\u65BC ${maximum}
-StringValidator.range = '${input}' \u7684\u5B57\u6578\u5FC5\u9808\u4ECB\u65BC ${minimum} \u548C ${maximum} \u4E4B\u9593
-StringValidator.minimum = '${input}' \u6700\u5C11 ${minimum} \u500B\u5B57
-StringValidator.maximum = '${input}' \u6700\u591A ${maximum} \u500B\u5B57
+StringValidator.range = '${label}' \u7684\u5B57\u6578\u5FC5\u9808\u4ECB\u65BC ${minimum} \u548C ${maximum} \u4E4B\u9593
+StringValidator.minimum = '${label}' \u6700\u5C11 ${minimum} \u500B\u5B57
+StringValidator.maximum = '${label}' \u6700\u591A ${maximum} \u500B\u5B57
-DateValidator.range = '${input}' \u5FC5\u9808\u4ECB\u65BC ${minimum} \u548C ${maximum} \u4E4B\u9593
-DateValidator.minimum = '${input}' \u5FC5\u9808\u5728 ${minimum} \u4E4B\u5F8C
-DateValidator.maximum = '${input}' \u5FC5\u9808\u5728 ${maximum} \u4E4B\u524D
+DateValidator.range = '${label}' \u5FC5\u9808\u4ECB\u65BC ${minimum} \u548C ${maximum} \u4E4B\u9593
+DateValidator.minimum = '${label}' \u5FC5\u9808\u5728 ${minimum} \u4E4B\u5F8C
+DateValidator.maximum = '${label}' \u5FC5\u9808\u5728 ${maximum} \u4E4B\u524D
-PatternValidator = '${input}' \u4E0D\u7B26\u5408\u683C\u5F0F: '${pattern}'
-EmailAddressValidator = '${input}' \u4E0D\u7B26\u5408 email \u683C\u5F0F
-UrlValidator='${input}'\u4e0d\u662f\u4e00\u500b\u5408\u6cd5\u7684URL\u3002
+PatternValidator = '${label}' \u4E0D\u7B26\u5408\u683C\u5F0F: '${pattern}'
+EmailAddressValidator = '${label}' \u4E0D\u7B26\u5408 email \u683C\u5F0F
+UrlValidator='${label}'\u4e0d\u662f\u4e00\u500b\u5408\u6cd5\u7684URL\u3002
EqualInputValidator = ${label0} \u7684\u8F38\u5165 '${input0}' \u548C ${label1} \u7684\u8F38\u5165 '${input1}' \u5169\u8005\u5FC5\u9808\u76F8\u540C
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication.properties b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication.properties
index 38b5e08..8f65100 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication.properties
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication.properties
@@ -1,8 +1,8 @@
# default validator messages
Required=field '${label}' is required
-IConverter='${input}' is not a valid ${type}
-IntegerValidator=${input} must be an integer between ${min} and ${max}
-LengthValidator=${input} must be between ${min} and ${max} chars.
+IConverter='${label}' is not a valid ${type}
+IntegerValidator=${label} must be an integer between ${min} and ${max}
+LengthValidator=${label} must be between ${min} and ${max} chars.
createForm.id.Required = id is required
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication_de.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication_de.properties b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication_de.properties
index cffcaab..92e17c3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication_de.properties
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication_de.properties
@@ -1,6 +1,6 @@
# default validator messages
Required=Die Eingabe des Feldes '${name}' is erforderlich
-IConverter=Ung�ltige Eingabe: '${input}'
-IntegerValidator=${input} muss ein Integerwert zwischen ${min} und ${max} sein
-LengthValidator=${input} muss mindestens ${min} und maximal ${max} Zeichen lang sein
+IConverter=Ung�ltige Eingabe: '${label}'
+IntegerValidator=${label} muss ein Integerwert zwischen ${min} und ${max} sein
+LengthValidator=${label} muss mindestens ${min} und maximal ${max} Zeichen lang sein
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication_nl.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication_nl.properties b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication_nl.properties
index 97020e8..4f6f8ee 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication_nl.properties
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_1/MyMockApplication_nl.properties
@@ -1,6 +1,6 @@
# default validator messages
Required=veld 'integerInRange' is verplicht
-IConverter='${input}' is geen geldig geheel getal
-IntegerValidator='${input}' is niet tussen ${min} en ${max}
-LengthValidator='${input}' is niet tussen ${min} en ${max}
+IConverter='${label}' is geen geldig geheel getal
+IntegerValidator='${label}' is niet tussen ${min} en ${max}
+LengthValidator='${label}' is niet tussen ${min} en ${max}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.properties
index 42822e7..355bdb4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.properties
@@ -12,4 +12,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-form.integer.IConverter='${input}' is not an integer
+form.integer.IConverter='${label}' is not an integer
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage_ko.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage_ko.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage_ko.properties
index e76706c..732c969 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage_ko.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage_ko.properties
@@ -12,4 +12,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-form.integer.IConverter='${input}' \uac12\uc740 \uc815\uc218\uac00 \uc544\ub2d9\ub2c8\ub2e4
+form.integer.IConverter='${label}' \uac12\uc740 \uc815\uc218\uac00 \uc544\ub2d9\ub2c8\ub2e4
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage_no.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage_no.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage_no.properties
index 783c586..ea2da4b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage_no.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage_no.properties
@@ -12,4 +12,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-form.integer.IConverter='${input}' er ikke et heltall
+form.integer.IConverter='${label}' er ikke et heltall
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.properties
index 8e0f8b9..26fe822 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.properties
@@ -12,8 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-inputForm.urlProperty.IConverter='${input}' is not a valid URL
-inputForm.phoneNumberUS.IConverter='${input}' is not a valid US phone number
+inputForm.urlProperty.IConverter='${label}' is not a valid URL
+inputForm.phoneNumberUS.IConverter='${label}' is not a valid US phone number
use.locale=Use locale:
default=default
input=Input
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ko.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ko.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ko.properties
index a9b2fe8..130a319 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ko.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ko.properties
@@ -12,8 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-inputForm.urlProperty.IConverter='${input}' \uac12\uc740 \uc720\ud6a8\ud55c URL\uc774 \uc544\ub2d9\ub2c8\ub2e4
-inputForm.phoneNumberUS.IConverter='${input}' \uac12\uc740 \uc720\ud6a8\ud55c \ubbf8\uad6d \uc804\ud654\ubc88\ud638\uac00 \uc544\ub2d9\ub2c8\ub2e4
+inputForm.urlProperty.IConverter='${label}' \uac12\uc740 \uc720\ud6a8\ud55c URL\uc774 \uc544\ub2d9\ub2c8\ub2e4
+inputForm.phoneNumberUS.IConverter='${label}' \uac12\uc740 \uc720\ud6a8\ud55c \ubbf8\uad6d \uc804\ud654\ubc88\ud638\uac00 \uc544\ub2d9\ub2c8\ub2e4
use.locale=\ub85c\ucf00\uc77c \uc0ac\uc6a9:
default=\uae30\ubcf8 \uac12
input=\uc785\ub825
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_nl.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_nl.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_nl.properties
index c908d0b..a9a1329 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_nl.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_nl.properties
@@ -12,8 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-inputForm.urlProperty.IConverter='${input}' is geen geldige URL
-inputForm.phoneNumberUS.IConverter='${input}' is geen geldig amerikaans telefoonnummer
+inputForm.urlProperty.IConverter='${label}' is geen geldige URL
+inputForm.phoneNumberUS.IConverter='${label}' is geen geldig amerikaans telefoonnummer
use.locale=gebruik locale:
default=standaardwaarde
input=Invoer
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_no.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_no.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_no.properties
index 3c54674..84cc2ba 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_no.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_no.properties
@@ -12,8 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-inputForm.urlProperty.IConverter='${input}' er ikke en gyldig URL
-inputForm.phoneNumberUS.IConverter='${input}' er ikke et gyldig amerikansk telefonnummer
+inputForm.urlProperty.IConverter='${label}' er ikke en gyldig URL
+inputForm.phoneNumberUS.IConverter='${label}' er ikke et gyldig amerikansk telefonnummer
use.locale=Bruk språk:
default=standard
input=Inndata
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.properties
index 57fcee9..62063ed 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.properties
@@ -14,4 +14,4 @@
# limitations under the License.
title.Required=You must include a valid, non-empty title
author.Required=You must include a valid, non-empty author
-title.StringValidator.maximum=The value '${input}' is longer than ${maximum} characters.
+title.StringValidator.maximum=The value '${label}' is longer than ${maximum} characters.
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook_ko.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook_ko.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook_ko.properties
index 703efa6..b3ea0e6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook_ko.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook_ko.properties
@@ -14,4 +14,4 @@
# limitations under the License.
title.Required=\uacf5\ubc31\uc774 \uc544\ub2cc \uc720\ud6a8\ud55c \uc81c\ubaa9\uc744 \uc785\ub825\ud574\uc57c \ud569\ub2c8\ub2e4
author.Required=\uacf5\ubc31\uc774 \uc544\ub2cc \uc720\ud6a8\ud55c \uc800\uc790\uba85\uc744 \uc785\ub825\ud574\uc57c \ud569\ub2c8\ub2e4
-title.StringValidator.maximum='${input}' \uac12\uc758 \ubb38\uc790\uc5f4 \uae38\uc774\ub294 \ucd5c\ub300\uac12\uc778 ${maximum} \ubcf4\ub2e4 \uae41\ub2c8\ub2e4.
+title.StringValidator.maximum='${label}' \uac12\uc758 \ubb38\uc790\uc5f4 \uae38\uc774\ub294 \ucd5c\ub300\uac12\uc778 ${maximum} \ubcf4\ub2e4 \uae41\ub2c8\ub2e4.
http://git-wip-us.apache.org/repos/asf/wicket/blob/f4f739ca/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook_no.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook_no.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook_no.properties
index 3405712..5db7286 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook_no.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook_no.properties
@@ -14,4 +14,4 @@
# limitations under the License.
title.Required=Du må oppgi en tittel
author.Required=Du må oppgi en forfatter
-title.StringValidator.maximum=Verdien '${input}' er lengre enn ${maximum} tegn.
+title.StringValidator.maximum=Verdien '${label}' er lengre enn ${maximum} tegn.