merged branch tgalopin/patch-1 (PR #6506)

This PR was merged into the master branch.

Commits
-------

d2a1e4e Update src/Symfony/Component/Validator/Resources/translations/validators.it.xlf

Discussion
----------

[Validator] Fix structure error in validators.it.xlf

Fix structure error in validators.it.xlf.

Probably a copy-cut that didn't work correctly.

---------------------------------------------------------------------------

by stof at 2012-12-28T17:04:17Z

I suspect a bad resolution of a merge conflict

---------------------------------------------------------------------------

by tgalopin at 2012-12-28T17:06:17Z

Indeed, probably.
This commit is contained in:
Fabien Potencier 2012-12-28 23:55:06 +01:00
commit 636c24e5a0

View File

@ -213,6 +213,7 @@
<trans-unit id="56">
<source>This collection should contain exactly {{ limit }} elements.</source>
<target>Questa collezione dovrebbe contenere esattamente {{ limit }} elemento.|Questa collezione dovrebbe contenere esattamente {{ limit }} elementi.</target>
</trans-unit>
<trans-unit id="57">
<source>Invalid card number.</source>
<target>Numero di carta non valido.</target>
@ -221,7 +222,8 @@
<source>Unsupported card type or invalid card number.</source>
<target>Tipo di carta non supportato o numero non valido.</target>
</trans-unit>
</trans-unit>
<!--
Old messages: differents ?!
<trans-unit id="57">
<source>Invalid card number.</source>
<target>Il numero della carta non è valido.</target>
@ -230,6 +232,7 @@
<source>Unsupported card type or invalid card number.</source>
<target>Il tipo di carta non è supportato o il numero non è valido.</target>
</trans-unit>
-->
</body>
</file>
</xliff>