[WICKET-6499] russian translation is improved
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/897573d9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/897573d9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/897573d9 Branch: refs/heads/master Commit: 897573d997880b60fb976d1ec316702e130059cb Parents: b310085 Author: Maxim Solodovnik <[email protected]> Authored: Sun Nov 26 22:59:50 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Nov 26 22:59:50 2017 +0700 ---------------------------------------------------------------------- .../bean/validation/PropertyValidator_fr.properties.xml | 12 ++++++------ .../bean/validation/PropertyValidator_ru.properties.xml | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/897573d9/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_fr.properties.xml ---------------------------------------------------------------------- diff --git a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_fr.properties.xml b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_fr.properties.xml index 0354b5d..5375e13 100644 --- a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_fr.properties.xml +++ b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_fr.properties.xml @@ -29,10 +29,10 @@ <entry key="javax.validation.constraints.Min.message">Le champ '${label}' doit être supérieur ou égal à ${value}</entry> <entry key="javax.validation.constraints.Negative.message">Le champ '${label}' doit être négatif,</entry> <entry key="javax.validation.constraints.NegativeOrZero.message">Le champ '${label}' doit être négatif, ou zéro</entry> - <entry key="javax.validation.constraints.NotBlank.message">Le champ '${label}' ne peut pas être vide</entry> - <entry key="javax.validation.constraints.NotEmpty.message">Le champ '${label}' ne peut pas être vide</entry> - <entry key="javax.validation.constraints.NotNull.message">Le champ '${label}' ne doit pas être null</entry> - <entry key="javax.validation.constraints.Null.message">Le champ '${label}' doit être null</entry> + <entry key="javax.validation.constraints.NotBlank.message">Le champ '${label}' ne peut pas être vide</entry> + <entry key="javax.validation.constraints.NotEmpty.message">Le champ '${label}' ne peut pas être vide</entry> + <entry key="javax.validation.constraints.NotNull.message">Le champ '${label}' ne doit pas être null</entry> + <entry key="javax.validation.constraints.Null.message">Le champ '${label}' doit être null</entry> <entry key="javax.validation.constraints.Past.message">Le champ '${label}' doit être dans le passé</entry> <entry key="javax.validation.constraints.PastOrPresent.message">Le champ '${label}' doit être dans le passé ou le présent</entry> <entry key="javax.validation.constraints.Positive.message">Le champ '${label}' doit être positif</entry> @@ -46,9 +46,9 @@ <entry key="org.hibernate.validator.constraints.Length.message">La longueur du champ '${label}' doit être entre ${min} et ${max}</entry> <entry key="org.hibernate.validator.constraints.NotBlank.message">Le champ '${label}' ne peut pas être vide</entry> <entry key="org.hibernate.validator.constraints.NotEmpty.message">Le champ '${label}' ne peut pas être vide</entry> - <entry key="org.hibernate.validator.constraints.SafeHtml.message">Le champ '${label}' pourrait contenir du contenu HTML dangereux</entry> <entry key="org.hibernate.validator.constraints.Range.message">Le champ '${label}' doit être entre ${min} et ${max}</entry> + <entry key="org.hibernate.validator.constraints.SafeHtml.message">Le champ '${label}' pourrait contenir du contenu HTML dangereux</entry> <entry key="org.hibernate.validator.constraints.ScriptAssert.message">Le script "${script}" du champ '${label}' n'a pas retourné true</entry> <entry key="org.hibernate.validator.constraints.URL.message">Le champ '${label}' n'est pas une URL</entry> -</properties> \ No newline at end of file +</properties> http://git-wip-us.apache.org/repos/asf/wicket/blob/897573d9/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml ---------------------------------------------------------------------- diff --git a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml index 7acbfe8..c5d6fb7 100644 --- a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml +++ b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml @@ -22,12 +22,21 @@ <entry key="javax.validation.constraints.DecimalMax.message">'${label}' должно бÑÑÑ Ð¼ÐµÐ½ÑÑе или Ñавно ${value}</entry> <entry key="javax.validation.constraints.DecimalMin.message">'${label}' должно бÑÑÑ Ð±Ð¾Ð»ÑÑе или Ñавно ${value}</entry> <entry key="javax.validation.constraints.Digits.message"><![CDATA['${label}' ÑиÑловое знаÑение не ÑооÑвеÑÑÑвÑÐµÑ Ð¾Ð³ÑаниÑениÑм (<${integer} знаков>.<${fraction} знаков> expected)]]></entry> + <entry key="javax.validation.constraints.Email.message">'${label}' '${label}' некоÑÑекÑнÑй адÑÐµÑ ÑлекÑÑонной поÑÑÑ</entry> <entry key="javax.validation.constraints.Future.message">'${label}' должно бÑÑÑ Ð² бÑдÑÑÑем</entry> + <entry key="javax.validation.constraints.FutureOrPresent.message">'${label}' должно бÑÑÑ Ð² бÑдÑÑÑем или в наÑÑоÑÑем</entry> <entry key="javax.validation.constraints.Max.message">'${label}' должно бÑÑÑ Ð¼ÐµÐ½ÑÑе или Ñавно ${value}</entry> <entry key="javax.validation.constraints.Min.message">'${label}' должно бÑÑÑ Ð±Ð¾Ð»ÑÑе или Ñавно ${value}</entry> + <entry key="javax.validation.constraints.Negative.message">'${label}' должно бÑÑÑ Ð¾ÑÑиÑаÑелÑнÑм</entry> + <entry key="javax.validation.constraints.NegativeOrZero.message">'${label}' должно бÑÑÑ Ð¾ÑÑиÑаÑелÑнÑм или нÑлÑм</entry> + <entry key="javax.validation.constraints.NotBlank.message">'${label}' не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÑÑо</entry> + <entry key="javax.validation.constraints.NotEmpty.message">'${label}' не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÑÑо</entry> <entry key="javax.validation.constraints.NotNull.message">'${label}' не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÑÑо</entry> <entry key="javax.validation.constraints.Null.message">'${label}' должно бÑÑÑ Ð¿ÑÑÑо</entry> <entry key="javax.validation.constraints.Past.message">'${label}' должно бÑÑÑ Ð² пÑоÑлом</entry> + <entry key="javax.validation.constraints.PastOrPresent.message">'${label}' должно бÑÑÑ Ð² пÑоÑлом или наÑÑоÑÑем</entry> + <entry key="javax.validation.constraints.Positive.message">'${label}' должно бÑÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸ÑелÑнÑм</entry> + <entry key="javax.validation.constraints.PositiveOrZero.message">'${label}' должно бÑÑÑ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸ÑелÑнÑм или нÑлÑм</entry> <entry key="javax.validation.constraints.Pattern.message">'${label}' должно ÑооÑвеÑÑÑвоваÑÑ ÑегÑлÑÑÐ½Ð¾Ð¼Ñ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ "${regexp}"</entry> <entry key="javax.validation.constraints.Size.message">'${label}' должно бÑÑÑ Ð¼ÐµÐ¶Ð´Ñ ${min} и ${max}</entry> <entry key="javax.validation.constraints.Size.message.String">'${label}' длина должна бÑÑÑ Ð¼ÐµÐ¶Ð´Ñ ${min} и ${max}</entry>
