From 64101aba0aeeabff0180c4f85e695adf8c60715a Mon Sep 17 00:00:00 2001
From: Christian Raue <christian.raue@gmail.com>
Date: Fri, 11 May 2012 16:14:27 +0200
Subject: [PATCH] separate numeric value from suffix in File constraint's error
 message `$uploadIniSizeErrorMessage`

---
 .../FrameworkBundle/Resources/translations/validators.ca.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.cs.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.da.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.de.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.en.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.es.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.et.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.eu.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.fa.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.fi.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.fr.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.he.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.hr.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.hu.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.hy.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.id.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.it.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.ja.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.lb.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.lt.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.mn.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.nb.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.nl.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.pl.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.pt.xlf | 4 ++--
 .../Resources/translations/validators.pt_BR.xlf              | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.ro.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.ru.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.sk.xlf | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.sl.xlf | 4 ++--
 .../Resources/translations/validators.sr_Cyrl.xlf            | 4 ++--
 .../Resources/translations/validators.sr_Latn.xlf            | 4 ++--
 .../FrameworkBundle/Resources/translations/validators.ua.xlf | 4 ++--
 .../Resources/translations/validators.zh_CN.xlf              | 4 ++--
 src/Symfony/Component/Validator/Constraints/File.php         | 2 +-
 .../Component/Validator/Constraints/FileValidator.php        | 5 ++++-
 .../Validator/Tests/Constraints/FileValidatorTest.php        | 5 ++++-
 37 files changed, 77 insertions(+), 71 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ca.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ca.xlf
index 24ed53ab52..e96ec7a2c5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ca.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ca.xlf
@@ -127,8 +127,8 @@
                 <target>Els dos valors haurien de ser iguals.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>L'arxiu és massa gran. El tamany màxim permés és {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>L'arxiu és massa gran. El tamany màxim permés és {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.cs.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.cs.xlf
index 5bd641a80a..b90e2e005b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.cs.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.cs.xlf
@@ -127,8 +127,8 @@
                 <target>Tyto dvě hodnoty musí být stejné.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Soubor je příliš velký. Maximální povolená velikost souboru je {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Soubor je příliš velký. Maximální povolená velikost souboru je {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.da.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.da.xlf
index 67c2ae3b5e..5e3804b170 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.da.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.da.xlf
@@ -127,8 +127,8 @@
                 <target>De to værdier skal være ens.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Filen er for stor. Den maksimale størrelse er {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Filen er for stor. Den maksimale størrelse er {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.de.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.de.xlf
index a11399d19d..bfb6bd8fe8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.de.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.de.xlf
@@ -127,8 +127,8 @@
                 <target>Die beiden Werte sollten identisch sein.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Die Datei ist zu groß. Die maximal zulässige Größe beträgt {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Die Datei ist zu groß. Die maximal zulässige Größe beträgt {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.en.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.en.xlf
index 7df5eb4bbf..2e258525a9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.en.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.en.xlf
@@ -127,8 +127,8 @@
                 <target>The two values should be equal.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>The file is too large. Allowed maximum size is {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.es.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.es.xlf
index 787b417ac5..60e4200037 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.es.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.es.xlf
@@ -127,8 +127,8 @@
                 <target>Los dos valores deberían ser iguales.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>El archivo es demasiado grande. El tamaño máximo permitido es {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>El archivo es demasiado grande. El tamaño máximo permitido es {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.et.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.et.xlf
index c68d7964a8..ddfe050997 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.et.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.et.xlf
@@ -127,8 +127,8 @@
                 <target>Väärtused peaksid olema võrdsed.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Fail on liiga suur. Maksimaalne lubatud suurus on {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Fail on liiga suur. Maksimaalne lubatud suurus on {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.eu.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.eu.xlf
index e80afb2fe0..0b25269a45 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.eu.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.eu.xlf
@@ -127,8 +127,8 @@
                 <target>Bi balioak berdinak izan beharko lirateke.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Fitxategia handiegia da. Baimendutako tamainu handiena {{ limit }} da.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Fitxategia handiegia da. Baimendutako tamainu handiena {{ limit }} {{ suffix }} da.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fa.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fa.xlf
index bc9274e8c8..3002c544ec 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fa.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fa.xlf
@@ -127,8 +127,8 @@
                 <target>دو مقدار باید برابر باشند.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>فایل بیش از اندازه بزرگ است. حداکثر اندازه مجاز برابر {{ limit }} است.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>فایل بیش از اندازه بزرگ است. حداکثر اندازه مجاز برابر {{ limit }} {{ suffix }} است.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fi.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fi.xlf
index db9128e4aa..e512c9c4ce 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fi.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fi.xlf
@@ -127,8 +127,8 @@
                 <target>Kahden annetun arvon tulee olla samat.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Annettu tiedosto on liian iso. Suurin sallittu tiedostokoko on {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Annettu tiedosto on liian iso. Suurin sallittu tiedostokoko on {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fr.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fr.xlf
index 4bd9f80d34..5add80d136 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fr.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fr.xlf
@@ -127,8 +127,8 @@
                 <target>Les deux valeurs doivent être identiques.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Le fichier est trop volumineux. Sa taille ne doit pas dépasser {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Le fichier est trop volumineux. Sa taille ne doit pas dépasser {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.he.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.he.xlf
index 5b7239489c..1495191ef9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.he.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.he.xlf
@@ -127,8 +127,8 @@
                 <target>שני הערכים צריכים להיות שווים.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>הקובץ גדול מדי. הגודל המרבי המותר הוא {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>הקובץ גדול מדי. הגודל המרבי המותר הוא {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hr.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hr.xlf
index 3c2753a8a9..67404f484f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hr.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hr.xlf
@@ -127,8 +127,8 @@
                 <target>Obje vrijednosti trebaju biti jednake.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Ova datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Ova datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hu.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hu.xlf
index 741755e431..5c161a300f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hu.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hu.xlf
@@ -127,8 +127,8 @@
                 <target>A két értéknek azonosnak kell lennie.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>A fájl túl nagy. A megengedett maximális méret: {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>A fájl túl nagy. A megengedett maximális méret: {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hy.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hy.xlf
index 5e2b96bc69..60a1e06682 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hy.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hy.xlf
@@ -127,8 +127,8 @@
                 <target>Երկու արժեքները պետք է նույնը լինեն.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Ֆայլը չափազանց մեծ է: Մաքսիմալ թույլատրելի չափսը {{ limit }} է.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Ֆայլը չափազանց մեծ է: Մաքսիմալ թույլատրելի չափսը {{ limit }} {{ suffix }} է.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.id.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.id.xlf
index 6ec3978657..c7e3fc1caf 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.id.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.id.xlf
@@ -127,8 +127,8 @@
                 <target>Isi keduanya harus sama.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Ukuran berkas terlalu besar. Ukuran maksimum yang diijinkan adalah {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Ukuran berkas terlalu besar. Ukuran maksimum yang diijinkan adalah {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.it.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.it.xlf
index 72ba39c1e7..5b939dda34 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.it.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.it.xlf
@@ -127,8 +127,8 @@
                 <target>I due valori dovrebbero essere uguali.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Il file è troppo grande. La dimensione massima è {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Il file è troppo grande. La dimensione massima è {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ja.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ja.xlf
index e787c7bf3c..7b4d6e5fbd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ja.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ja.xlf
@@ -131,8 +131,8 @@
                 <target>値は有効な国名ではありません.</target>
             </trans-unit>
             <trans-unit id="33">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>ファイルのサイズが大きすぎます。有効な最大サイズは{{ limit }}です.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>ファイルのサイズが大きすぎます。有効な最大サイズは{{ limit }} {{ suffix }}です.</target>
             </trans-unit>
             <trans-unit id="34">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.lb.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.lb.xlf
index f1d530e158..4efecc69e8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.lb.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.lb.xlf
@@ -127,8 +127,8 @@
                 <target>Béid Wäerter sollten identesch sinn.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>De fichier ass ze grouss. Déi maximal Gréisst dierf {{ limit }} net depasséieren.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>De fichier ass ze grouss. Déi maximal Gréisst dierf {{ limit }} {{ suffix }} net depasséieren.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.lt.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.lt.xlf
index daadf280bb..d9ea20a41b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.lt.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.lt.xlf
@@ -127,8 +127,8 @@
                 <target>Abi reikšmės turi būti identiškos.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Byla yra per didelė. Maksimalus dydis yra {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Byla yra per didelė. Maksimalus dydis yra {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.mn.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.mn.xlf
index 1772fce5a0..fb544998c2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.mn.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.mn.xlf
@@ -127,8 +127,8 @@
                 <target>Хоёр утгууд ижил байх ёстой.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Файл хэтэрхий том байна. Зөвшөөрөгдөх дээд хэмжээ нь {{ limit }} байна.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Файл хэтэрхий том байна. Зөвшөөрөгдөх дээд хэмжээ нь {{ limit }} {{ suffix }} байна.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nb.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nb.xlf
index 9e6962d711..7f9e406a7d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nb.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nb.xlf
@@ -127,8 +127,8 @@
                 <target>De to verdier skal være ens.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Filen er for stor. Den maksimale størrelse er {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Filen er for stor. Den maksimale størrelse er {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nl.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nl.xlf
index 1e07b95ddf..b1b414bc7a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nl.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nl.xlf
@@ -127,8 +127,8 @@
                 <target>De twee waarden moeten gelijk zijn.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Het bestand is te groot. Toegestane maximum grootte is {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Het bestand is te groot. Toegestane maximum grootte is {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pl.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pl.xlf
index 7633f0a626..e8bfbbe420 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pl.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pl.xlf
@@ -127,8 +127,8 @@
                 <target>Obie wartości powinny być równe.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Plik jest za duży. Maksymalny dozwolony rozmiar to {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Plik jest za duży. Maksymalny dozwolony rozmiar to {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pt.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pt.xlf
index c081feb0d9..bcb1df61ad 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pt.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pt.xlf
@@ -127,8 +127,8 @@
                 <target>Os dois valores deveriam ser iguais.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>O arquivo é muito grande ({{ size }}). O tamanho máximo permitido é de {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>O arquivo é muito grande. O tamanho máximo permitido é de {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pt_BR.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pt_BR.xlf
index 8d61cd9b98..ce52dd0f72 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pt_BR.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.pt_BR.xlf
@@ -127,8 +127,8 @@
                 <target>Os dois valores devem ser iguais.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>O arquivo é muito grande. O tamanho máximo permitido é de {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>O arquivo é muito grande. O tamanho máximo permitido é de {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ro.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ro.xlf
index ece0c3585f..5d7c4aa770 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ro.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ro.xlf
@@ -127,8 +127,8 @@
                 <target>Cele două valori ar trebui să fie egale.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Fișierul este prea mare. Mărimea maximă permisă este {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Fișierul este prea mare. Mărimea maximă permisă este {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ru.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ru.xlf
index eefbeadd5c..411d4d86db 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ru.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ru.xlf
@@ -127,8 +127,8 @@
                 <target>Оба значения должны быть одинаковыми.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Файл слишком большой. Максимальный допустимый размер {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Файл слишком большой. Максимальный допустимый размер {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sk.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sk.xlf
index 86a54a29c8..830e7679ed 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sk.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sk.xlf
@@ -127,8 +127,8 @@
                 <target>Tieto dve hodnoty by mali byť rovnaké.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Súbor je príliš veľký. Maximálna povolená veľkosť je {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Súbor je príliš veľký. Maximálna povolená veľkosť je {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sl.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sl.xlf
index 3fc8d3aba0..132dc27c89 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sl.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sl.xlf
@@ -127,8 +127,8 @@
                 <target>Vrednosti morata biti enaki.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Datoteka je prevelika. Največja dovoljena velikost je {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Datoteka je prevelika. Največja dovoljena velikost je {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr_Cyrl.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr_Cyrl.xlf
index 4f048b2d13..974d8ad02f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr_Cyrl.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr_Cyrl.xlf
@@ -127,8 +127,8 @@
                 <target>Обе вредности треба да буду једнаке.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Датотека је превелика. Највећа дозвољена величина је {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Датотека је превелика. Највећа дозвољена величина је {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr_Latn.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr_Latn.xlf
index 825205f228..ae2b247474 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr_Latn.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr_Latn.xlf
@@ -127,8 +127,8 @@
                 <target>Obe vrednosti treba da budu jednake.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ua.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ua.xlf
index f07985f4b9..41ea5579ef 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ua.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.ua.xlf
@@ -127,8 +127,8 @@
                 <target>Обидва занчення повинні бути одинаковими.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>Файл занадто великий. Максимальний допустимий розмір {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>Файл занадто великий. Максимальний допустимий розмір {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.zh_CN.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.zh_CN.xlf
index dfd3d9560b..0fcb15288f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.zh_CN.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.zh_CN.xlf
@@ -127,8 +127,8 @@
                 <target>该两个变量的值应该相同.</target>
             </trans-unit>
             <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }}.</source>
-                <target>文件太大， 文件大小不可以超过 {{ limit }}.</target>
+                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+                <target>文件太大， 文件大小不可以超过 {{ limit }} {{ suffix }}.</target>
             </trans-unit>
             <trans-unit id="33">
                 <source>The file is too large.</source>
diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php
index cba412721b..49880ad679 100644
--- a/src/Symfony/Component/Validator/Constraints/File.php
+++ b/src/Symfony/Component/Validator/Constraints/File.php
@@ -27,7 +27,7 @@ class File extends Constraint
     public $maxSizeMessage = 'The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.';
     public $mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.';
 
-    public $uploadIniSizeErrorMessage   = 'The file is too large. Allowed maximum size is {{ limit }}.';
+    public $uploadIniSizeErrorMessage   = 'The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.';
     public $uploadFormSizeErrorMessage  = 'The file is too large.';
     public $uploadPartialErrorMessage   = 'The file was only partially uploaded.';
     public $uploadNoFileErrorMessage    = 'No file was uploaded.';
diff --git a/src/Symfony/Component/Validator/Constraints/FileValidator.php b/src/Symfony/Component/Validator/Constraints/FileValidator.php
index 6c5aeb5192..76869c24d2 100644
--- a/src/Symfony/Component/Validator/Constraints/FileValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/FileValidator.php
@@ -44,7 +44,10 @@ class FileValidator extends ConstraintValidator
                 case UPLOAD_ERR_INI_SIZE:
                     $maxSize = UploadedFile::getMaxFilesize();
                     $maxSize = $constraint->maxSize ? min($maxSize, $constraint->maxSize) : $maxSize;
-                    $this->context->addViolation($constraint->uploadIniSizeErrorMessage, array('{{ limit }}' => $maxSize.' bytes'));
+                    $this->context->addViolation($constraint->uploadIniSizeErrorMessage, array(
+                        '{{ limit }}' => $maxSize,
+                        '{{ suffix }}' => 'bytes',
+                    ));
 
                     return;
                 case UPLOAD_ERR_FORM_SIZE:
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
index e8ec770289..318245979e 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
@@ -317,7 +317,10 @@ abstract class FileValidatorTest extends \PHPUnit_Framework_TestCase
         );
 
         if (class_exists('Symfony\Component\HttpFoundation\File\UploadedFile')) {
-            $tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array('{{ limit }}' => UploadedFile::getMaxFilesize() . ' bytes'));
+            $tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array(
+                '{{ limit }}' => UploadedFile::getMaxFilesize(),
+                '{{ suffix }}' => 'bytes',
+            ));
         }
 
         return $tests;