git commit: WICKET-2128 use ${label} consistently

[svenmeier]

Updated Branches:
  refs/heads/master 66e71ae88 -> c30e33481


WICKET-2128 use ${label} consistently

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c30e3348
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c30e3348
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c30e3348

Branch: refs/heads/master
Commit: c30e33481fc71fe2e16ff15ec0e6fb838c3d7b4b
Parents: 66e71ae
Author: svenmeier <svenme...@apache.org>
Authored: Tue Nov 27 17:40:31 2012 +0100
Committer: svenmeier <svenme...@apache.org>
Committed: Tue Nov 27 17:40:31 2012 +0100

----------------------------------------------------------------------
 .../apache/wicket/Application_bg.properties.xml    |   48 +++++++-------
 .../apache/wicket/Application_ru.properties.xml    |   46 +++++++-------
 .../apache/wicket/Application_th_TH.properties.xml |   26 ++++----
 .../forminput/FormInput_da_DK.properties.xml       |    4 +-
 .../examples/forminput/FormInput_de.properties.xml |    4 +-
 .../forminput/FormInput_fa_IR.properties.xml       |    4 +-
 .../examples/forminput/FormInput_ja.properties.xml |    4 +-
 .../forminput/FormInput_pt_BR.properties.xml       |    4 +-
 .../examples/forminput/FormInput_ru.properties.xml |    4 +-
 .../forminput/FormInput_th_TH.properties.xml       |    4 +-
 .../forminput/FormInput_zh_CN.properties.xml       |    4 +-
 11 files changed, 76 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-core/src/main/java/org/apache/wicket/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/Application_bg.properties.xml 
b/wicket-core/src/main/java/org/apache/wicket/Application_bg.properties.xml
index 7a21fc1..c72d8b8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_bg.properties.xml
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_bg.properties.xml
@@ -18,31 +18,31 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";>
 <properties>
        <entry key="Required">Полето '${label}' е 
задължително.</entry>
-       <entry key="IConverter">'${input}' не е валиден 
${type}.</entry>
-       <entry key="RangeValidator.range">${input} трябва да бъде 
между ${minimum} и ${maximum}.</entry>
-       <entry key="RangeValidator.exact">${input} трябва да бъде 
точно ${minimum}.</entry>
-       <entry key="RangeValidator.minimum">'${input}' трябва да 
бъде най-малко ${minimum}.</entry>
-       <entry key="RangeValidator.maximum">'${input}' трябва да 
бъде най-много ${maximum}.</entry>
-
-       <entry key="StringValidator.range">'${input}' трябва да 
бъде между ${minimum} и ${maximum} символа.</entry>
-       <entry key="StringValidator.minimum">'${input}' трябва да 
бъде поне ${minimum} символа.</entry>
-       <entry key="StringValidator.maximum">'${input}' трябва да 
бъде най-много ${maximum} символа.</entry>
-       <entry key="StringValidator.exact">'${input}' трябва да 
бъде точно ${exact} символа.</entry>
-
-       <entry key="DateValidator.range">'${input}' трябва да бъде 
между ${minimum} и ${maximum}.</entry>
-       <entry key="DateValidator.minimum">'${input}' не трябва да 
бъде преди ${minimum}.</entry>
-       <entry key="DateValidator.maximum">'${input}' не трябва да 
бъде след ${maximum}.</entry>
-
-       <entry key="NumberValidator.positive">'${input}' трябва да е 
положително число.</entry>
-       <entry key="NumberValidator.negative">'${input}' трябва да е 
отрицателно число.</entry>
-       <entry key="NumberValidator.range">'${input}' трябва да 
бъде между ${minimum} и ${maximum}.</entry>
-       <entry key="NumberValidator.minimum">'${input}' трябва да 
бъде най-малко ${minimum}.</entry>
-       <entry key="NumberValidator.maximum">'${input}' трябва да 
бъде най-много ${maximum}.</entry>
-
-       <entry key="PatternValidator">'${input}' не отговаря на 
шаблона '${pattern}'.</entry>
-       <entry key="EmailAddressValidator">'${input}' не е валиден 
адрес на електронна поща.</entry>
+       <entry key="IConverter">'${label}' не е валиден 
${type}.</entry>
+       <entry key="RangeValidator.range">${label} трябва да бъде 
между ${minimum} и ${maximum}.</entry>
+       <entry key="RangeValidator.exact">${label} трябва да бъде 
точно ${minimum}.</entry>
+       <entry key="RangeValidator.minimum">'${label}' трябва да 
бъде най-малко ${minimum}.</entry>
+       <entry key="RangeValidator.maximum">'${label}' трябва да 
бъде най-много ${maximum}.</entry>
+
+       <entry key="StringValidator.range">'${label}' трябва да 
бъде между ${minimum} и ${maximum} символа.</entry>
+       <entry key="StringValidator.minimum">'${label}' трябва да 
бъде поне ${minimum} символа.</entry>
+       <entry key="StringValidator.maximum">'${label}' трябва да 
бъде най-много ${maximum} символа.</entry>
+       <entry key="StringValidator.exact">'${label}' трябва да 
бъде точно ${exact} символа.</entry>
+
+       <entry key="DateValidator.range">'${label}' трябва да бъде 
между ${minimum} и ${maximum}.</entry>
+       <entry key="DateValidator.minimum">'${label}' не трябва да 
бъде преди ${minimum}.</entry>
+       <entry key="DateValidator.maximum">'${label}' не трябва да 
бъде след ${maximum}.</entry>
+
+       <entry key="NumberValidator.positive">'${label}' трябва да е 
положително число.</entry>
+       <entry key="NumberValidator.negative">'${label}' трябва да е 
отрицателно число.</entry>
+       <entry key="NumberValidator.range">'${label}' трябва да 
бъде между ${minimum} и ${maximum}.</entry>
+       <entry key="NumberValidator.minimum">'${label}' трябва да 
бъде най-малко ${minimum}.</entry>
+       <entry key="NumberValidator.maximum">'${label}' трябва да 
бъде най-много ${maximum}.</entry>
+
+       <entry key="PatternValidator">'${label}' не отговаря на 
шаблона '${pattern}'.</entry>
+       <entry key="EmailAddressValidator">'${label}' не е валиден 
адрес на електронна поща.</entry>
        <entry key="CreditCardValidator">Номерът на 
кредитната карта не е валиден.</entry>
-       <entry key="UrlValidator">'${input}' не е валиден уеб 
адрес.</entry>
+       <entry key="UrlValidator">'${label}' не е валиден уеб 
адрес.</entry>
 
        <entry key="EqualInputValidator">'${input0}' от ${label0} и 
'${input1}' от ${label1} трябва да бъдат еднакви.</entry>
        <entry key="EqualPasswordInputValidator">${label0} и ${label1} 
трябва да съвпадат.</entry>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml 
b/wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml
index f1531df..e725b7e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml
@@ -18,30 +18,30 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";>
 <properties>
        <entry key="Required">Поле '${label}' обязательно для 
ввода.</entry>
-       <entry key="IConverter">'${input}' должно 
соответствовать типу ${type}.</entry>
-       <entry key="RangeValidator.range">'${input}' не находится 
между ${minimum} и ${maximum}.</entry>
-       <entry key="RangeValidator.minimum">'${input}' меньше 
минимального значения ${minimum}.</entry>
-       <entry key="RangeValidator.maximum">'${input}' больше 
максимального значения ${maximum}.</entry>
-
-       <entry key="StringValidator.range">Количество 
символов в '${input}' не между ${minimum} и ${maximum}.</entry>
-       <entry key="StringValidator.minimum">Количество 
символов в '${input}' меньше ${minimum}.</entry>
-       <entry key="StringValidator.maximum">Количество 
символов в '${input}' больше ${maximum}.</entry>
-       <entry key="StringValidator.exact">Количество 
символов в '${input}' не равно ${exact}.</entry>
-
-       <entry key="DateValidator.range">'${input}' не находится 
между ${minimum} и ${maximum}.</entry>
-       <entry key="DateValidator.minimum">'${input}' меньше 
минимального значения ${minimum}.</entry>
-       <entry key="DateValidator.maximum">'${input}' больше 
максимального значения ${maximum}.</entry>
-
-       <entry key="NumberValidator.positive">'${input}' не является 
положительным числом.</entry>
-       <entry key="NumberValidator.negative">'${input}' не является 
отрицательным числом.</entry>
-       <entry key="NumberValidator.range">'${input}' не находится 
между ${minimum} и ${maximum}.</entry>
-       <entry key="NumberValidator.minimum">'${input}' меньше 
минимального значения ${minimum}.</entry>
-       <entry key="NumberValidator.maximum">'${input}' больше 
максимального значения ${maximum}.</entry>
-
-       <entry key="PatternValidator">'${input}' не 
соответствует шаблону '${pattern}'.</entry>
-       <entry key="EmailAddressValidator">'${input}' не является 
правильным адресом e-mail.</entry>
+       <entry key="IConverter">'${label}' должно 
соответствовать типу ${type}.</entry>
+       <entry key="RangeValidator.range">'${label}' не находится 
между ${minimum} и ${maximum}.</entry>
+       <entry key="RangeValidator.minimum">'${label}' меньше 
минимального значения ${minimum}.</entry>
+       <entry key="RangeValidator.maximum">'${label}' больше 
максимального значения ${maximum}.</entry>
+
+       <entry key="StringValidator.range">Количество 
символов в '${label}' не между ${minimum} и ${maximum}.</entry>
+       <entry key="StringValidator.minimum">Количество 
символов в '${label}' меньше ${minimum}.</entry>
+       <entry key="StringValidator.maximum">Количество 
символов в '${label}' больше ${maximum}.</entry>
+       <entry key="StringValidator.exact">Количество 
символов в '${label}' не равно ${exact}.</entry>
+
+       <entry key="DateValidator.range">'${label}' не находится 
между ${minimum} и ${maximum}.</entry>
+       <entry key="DateValidator.minimum">'${label}' меньше 
минимального значения ${minimum}.</entry>
+       <entry key="DateValidator.maximum">'${label}' больше 
максимального значения ${maximum}.</entry>
+
+       <entry key="NumberValidator.positive">'${label}' не является 
положительным числом.</entry>
+       <entry key="NumberValidator.negative">'${label}' не является 
отрицательным числом.</entry>
+       <entry key="NumberValidator.range">'${label}' не находится 
между ${minimum} и ${maximum}.</entry>
+       <entry key="NumberValidator.minimum">'${label}' меньше 
минимального значения ${minimum}.</entry>
+       <entry key="NumberValidator.maximum">'${label}' больше 
максимального значения ${maximum}.</entry>
+
+       <entry key="PatternValidator">'${label}' не 
соответствует шаблону '${pattern}'.</entry>
+       <entry key="EmailAddressValidator">'${label}' не является 
правильным адресом e-mail.</entry>
        <entry key="CreditCardValidator">Неправильный номер 
пластиковой карты.</entry>
-       <entry key="UrlValidator">'${input}' не является 
правильным адресом URL.</entry>
+       <entry key="UrlValidator">'${label}' не является 
правильным адресом URL.</entry>
 
        <entry key="EqualInputValidator">'${input0}' из поля ${label0} и 
'${input1}' из поля ${label1} не совпадают.</entry>
        <entry key="EqualPasswordInputValidator">Значения в полях 
${label0} и ${label1} не совпадают.</entry>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-core/src/main/java/org/apache/wicket/Application_th_TH.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/Application_th_TH.properties.xml 
b/wicket-core/src/main/java/org/apache/wicket/Application_th_TH.properties.xml
index a2b4e31..46d5cb0 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/Application_th_TH.properties.xml
+++ 
b/wicket-core/src/main/java/org/apache/wicket/Application_th_TH.properties.xml
@@ -19,19 +19,19 @@
 <properties>
        <!-- have to confirm whether this is really ok -->
        <entry key="Required">ข้อมูลใน ${label} 
เป็นที่ต้องการ.</entry>
-       <entry key="IConverter">ไม่ใช่ '${input}' 
ที่ใช้งานได้จริง ${type}.</entry>
-       <entry key="RangeValidator.range">${input} 
ต้องอยู่ระหว่าง ${minimum} และ 
${maximum}.</entry>
-       <entry key="RangeValidator.minimum">'${input}' 
ต้องมากกว่า ${minimum}.</entry>
-       <entry key="RangeValidator.maximum">'${input}' 
ต้องน้อยกว่า ${maximum}.</entry>
-       <entry key="StringValidator.range">'${input}' 
ต้องอยู่ระหว่าง ${minimum} และ ${maximum} 
chars.</entry>
-       <entry key="StringValidator.minimum">'${input}' 
ต้องมีอย่างน้อย ${minimum} 
ตัวอักษร.</entry>
-       <entry key="StringValidator.maximum">'${input}' 
ต้องมีไม่เกิน ${maximum} 
ตัวอักษร.</entry>
-       <entry key="StringValidator.exact">'${input}' ต้องมี 
${exact} ความยาวตัวอักษร.</entry>
-       <entry key="DateValidator.range">'${input}' must be between ${minimum} 
and ${maximum}.</entry>
-       <entry key="DateValidator.minimum">'${input}' must be greater than 
${minimum}.</entry>
-       <entry key="DateValidator.maximum">'${input}' must be smaller than 
${maximum}.</entry>
-       <entry key="PatternValidator">'${input}' 
ไม่ตรงกับรูปแบบ '${pattern}'</entry>
-       <entry key="EmailAddressValidator">'${input}' 
ไม่ใช่อีเมลที่ใช้งานได้จริง.</entry>
+       <entry key="IConverter">ไม่ใช่ '${label}' 
ที่ใช้งานได้จริง ${type}.</entry>
+       <entry key="RangeValidator.range">${label} 
ต้องอยู่ระหว่าง ${minimum} และ 
${maximum}.</entry>
+       <entry key="RangeValidator.minimum">'${label}' 
ต้องมากกว่า ${minimum}.</entry>
+       <entry key="RangeValidator.maximum">'${label}' 
ต้องน้อยกว่า ${maximum}.</entry>
+       <entry key="StringValidator.range">'${label}' 
ต้องอยู่ระหว่าง ${minimum} และ ${maximum} 
chars.</entry>
+       <entry key="StringValidator.minimum">'${label}' 
ต้องมีอย่างน้อย ${minimum} 
ตัวอักษร.</entry>
+       <entry key="StringValidator.maximum">'${label}' 
ต้องมีไม่เกิน ${maximum} 
ตัวอักษร.</entry>
+       <entry key="StringValidator.exact">'${label}' ต้องมี 
${exact} ความยาวตัวอักษร.</entry>
+       <entry key="DateValidator.range">'${label}' must be between ${minimum} 
and ${maximum}.</entry>
+       <entry key="DateValidator.minimum">'${label}' must be greater than 
${minimum}.</entry>
+       <entry key="DateValidator.maximum">'${label}' must be smaller than 
${maximum}.</entry>
+       <entry key="PatternValidator">'${label}' 
ไม่ตรงกับรูปแบบ '${pattern}'</entry>
+       <entry key="EmailAddressValidator">'${label}' 
ไม่ใช่อีเมลที่ใช้งานได้จริง.</entry>
        <entry key="EqualInputValidator">'${input0}' จาก ${label0} 
และ '${input1}' จาก ${label1} 
ต้องเท่ากัน.</entry>
        <entry key="EqualPasswordInputValidator">${label0} และ ${label1} 
ต้องเท่ากัน.</entry>
        <entry key="null">เลือกหนึ่งอย่าง</entry>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_da_DK.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_da_DK.properties.xml
 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_da_DK.properties.xml
index 978584b..92f6037 100644
--- 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_da_DK.properties.xml
+++ 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_da_DK.properties.xml
@@ -17,8 +17,8 @@
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";>
 <properties>
-       <entry key="inputForm.urlProperty.IConverter">'${input}' er ikke en 
gyldig URL adresse</entry>
-       <entry key="inputForm.phoneNumberUS.IConverter">'${input}' er ikke et 
gyldigt US telefonnummer</entry>
+       <entry key="inputForm.urlProperty.IConverter">'${label}' er ikke en 
gyldig URL adresse</entry>
+       <entry key="inputForm.phoneNumberUS.IConverter">'${label}' er ikke et 
gyldigt US telefonnummer</entry>
        <entry key="use.locale">Brug locale:</entry>
        <entry key="default">default</entry>
        <entry key="input">Indtastningsform</entry>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_de.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_de.properties.xml
 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_de.properties.xml
index 4691784..f94336c 100644
--- 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_de.properties.xml
+++ 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_de.properties.xml
@@ -17,8 +17,8 @@
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";>
 <properties>
-       <entry key="inputForm.urlProperty.IConverter">'${input}' ist keine 
gültige URL</entry>
-       <entry key="inputForm.phoneNumberUS.IConverter">'${input}' nicht ist 
keine gültige US Telefonnummerุ</entry>
+       <entry key="inputForm.urlProperty.IConverter">'${label}' ist keine 
gültige URL</entry>
+       <entry key="inputForm.phoneNumberUS.IConverter">'${label}' nicht ist 
keine gültige US Telefonnummerุ</entry>
        <entry key="use.locale">Locale:</entry>
        <entry key="default">standard</entry>
        <entry key="input">input</entry>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_fa_IR.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_fa_IR.properties.xml
 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_fa_IR.properties.xml
index d0b3d84..45cefd3 100644
--- 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_fa_IR.properties.xml
+++ 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_fa_IR.properties.xml
@@ -17,8 +17,8 @@
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";>
 <properties>
-       <entry key="inputForm.urlProperty.IConverter">'${input}' یک آدرس 
معتبر نمی باشد</entry>
-       <entry key="inputForm.phoneNumberUS.IConverter">'${input}' یک 
شماره معتبر در ایالات متحده نمی باشุ</entry>
+       <entry key="inputForm.urlProperty.IConverter">'${label}' یک آدرس 
معتبر نمی باشد</entry>
+       <entry key="inputForm.phoneNumberUS.IConverter">'${label}' یک 
شماره معتبر در ایالات متحده نمی باشุ</entry>
        <entry key="use.locale">استفاده از محلی سازی:</entry>
        <entry key="default">standard</entry>
                                <entry key="input">فرم ورودی</entry>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ja.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ja.properties.xml
 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ja.properties.xml
index 5513305..5ca47a8 100644
--- 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ja.properties.xml
+++ 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ja.properties.xml
@@ -17,8 +17,8 @@
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";>
 <properties>
-       <entry key="inputForm.urlProperty.IConverter">'${input}' 
は正しいURLではありません。</entry>
-       <entry key="inputForm.phoneNumberUS.IConverter">'${input}' 
は正しい電話番号ではありません。ุ</entry>
+       <entry key="inputForm.urlProperty.IConverter">'${label}' 
は正しいURLではありません。</entry>
+       <entry key="inputForm.phoneNumberUS.IConverter">'${label}' 
は正しい電話番号ではありません。ุ</entry>
        <entry key="use.locale">使用するロケール:</entry>
        <entry key="default">standard</entry>
        <entry key="input">input</entry>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_pt_BR.properties.xml
 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_pt_BR.properties.xml
index a120913..f3cdf82 100644
--- 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_pt_BR.properties.xml
+++ 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_pt_BR.properties.xml
@@ -17,8 +17,8 @@
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";>
 <properties>
-       <entry key="inputForm.urlProperty.IConverter">'${input}' n�o � uma 
URL v�lida</entry>
-       <entry key="inputForm.phoneNumberUS.IConverter">'${input}' n�o � um 
telefone v�lido</entry>
+       <entry key="inputForm.urlProperty.IConverter">'${label}' n�o � uma 
URL v�lida</entry>
+       <entry key="inputForm.phoneNumberUS.IConverter">'${label}' n�o � um 
telefone v�lido</entry>
        <entry key="use.locale">Usar localiza��o:</entry>
        <entry key="default">padr�o</entry>
        <entry key="input">Formul�rio</entry>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ru.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ru.properties.xml
 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ru.properties.xml
index 220ad87..051e881 100644
--- 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ru.properties.xml
+++ 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_ru.properties.xml
@@ -17,8 +17,8 @@
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";>
 <properties>
-       <entry key="inputForm.urlProperty.IConverter">'${input}' не 
является корректным URL</entry>
-       <entry key="inputForm.phoneNumberUS.IConverter">'${input}' не 
является корректным телефонным номером 
США</entry>
+       <entry key="inputForm.urlProperty.IConverter">'${label}' не 
является корректным URL</entry>
+       <entry key="inputForm.phoneNumberUS.IConverter">'${label}' не 
является корректным телефонным номером 
США</entry>
        <entry key="use.locale">Локаль:</entry>
        <entry key="default">по-умолчанию</entry>
        <entry key="input">Ввод</entry>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_th_TH.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_th_TH.properties.xml
 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_th_TH.properties.xml
index 23895a4..f198b5e 100644
--- 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_th_TH.properties.xml
+++ 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_th_TH.properties.xml
@@ -17,8 +17,8 @@
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";>
 <properties>
-       <entry key="inputForm.urlProperty.IConverter">'${input}' 
ไม่ใช URL ที่ใช้งานได้จริง</entry>
-       <entry key="inputForm.phoneNumberUS.IConverter">'${input}' 
ไม่ใช่หมายเลขโทรศัพท์ที่ใช้งานได</entry>
+       <entry key="inputForm.urlProperty.IConverter">'${label}' 
ไม่ใช URL ที่ใช้งานได้จริง</entry>
+       <entry key="inputForm.phoneNumberUS.IConverter">'${label}' 
ไม่ใช่หมายเลขโทรศัพท์ที่ใช้งานได</entry>
        <entry 
key="use.locale">เลือกใช้ภาษาหลัก:</entry>
        <entry key="default">ค่ามาตรฐาน</entry>
        <entry key="input">ข้อมูลนำเข้า</entry>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c30e3348/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_zh_CN.properties.xml
 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_zh_CN.properties.xml
index c7d5ad2..243e3be 100644
--- 
a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_zh_CN.properties.xml
+++ 
b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput_zh_CN.properties.xml
@@ -17,8 +17,8 @@
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";>
 <properties>
-       <entry key="inputForm.urlProperty.IConverter">'${input}' 
不是合法的URL</entry>
-       <entry key="inputForm.phoneNumberUS.IConverter">'${input}' 
不是一个合法的美国电话号码ุ</entry>
+       <entry key="inputForm.urlProperty.IConverter">'${label}' 
不是合法的URL</entry>
+       <entry key="inputForm.phoneNumberUS.IConverter">'${label}' 
不是一个合法的美国电话号码ุ</entry>
        <entry key="use.locale">使用地点:</entry>
        <entry key="default">缺省</entry>
        <entry key="input">输入</entry>