Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '2.1'

* 2.1:
  fixed CS
  added doc comments
  added doc comments
  [Validator] Updated swedish translation
  Update src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
  [2.1] Exclude tests from zips via gitattributes
  [HttpKernel][Translator] Fixed type-hints
  Updated lithuanian validation translation
  [DomCrawler] Allows using multiselect through Form::setValues().
  [Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/Translation#1)
  Unit test for patched method OptionsResolver::validateOptionValues().
  validateOptionValues throw a notice if an allowed value is set and the corresponding option isn't.
  [Form] Hardened code of ViolationMapper against errors
  [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.
  [Form] Fixed negative index access in PropertyPathBuilder
  Update src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf

Conflicts:
	src/Symfony/Component/DomCrawler/Form.php
	src/Symfony/Component/Process/Process.php
  • Loading branch information...
commit 67c788bb6a0d087ff9d12ee4d561f445e6c66ead 2 parents 649d13e + 7c43f65
@fabpot fabpot authored
View
2  .gitattributes
@@ -0,0 +1,2 @@
+Tests/ export-ignore
+phpunit.xml.dist export-ignore
View
42 Resources/translations/validators.de.xlf
@@ -24,11 +24,11 @@
</trans-unit>
<trans-unit id="6">
<source>You must select at least {{ limit }} choices.</source>
- <target>Sie müssen mindestens {{ limit }} Möglichkeiten wählen.</target>
+ <target>Sie müssen mindestens {{ limit }} Möglichkeit wählen.|Sie müssen mindestens {{ limit }} Möglichkeiten wählen.</target>
</trans-unit>
<trans-unit id="7">
<source>You must select at most {{ limit }} choices.</source>
- <target>Sie dürfen höchstens {{ limit }} Möglichkeiten wählen.</target>
+ <target>Sie dürfen höchstens {{ limit }} Möglichkeit wählen.|Sie dürfen höchstens {{ limit }} Möglichkeiten wählen.</target>
</trans-unit>
<trans-unit id="8">
<source>One or more of the given values is invalid.</source>
@@ -76,7 +76,7 @@
</trans-unit>
<trans-unit id="19">
<source>This value is too long. It should have {{ limit }} characters or less.</source>
- <target>Diese Zeichenkette ist zu lang. Sie sollte höchstens {{ limit }} Zeichen haben.</target>
+ <target>Diese Zeichenkette ist zu lang. Sie sollte höchstens {{ limit }} Zeichen haben.|Diese Zeichenkette ist zu lang. Sie sollte höchstens {{ limit }} Zeichen haben.</target>
</trans-unit>
<trans-unit id="20">
<source>This value should be {{ limit }} or more.</source>
@@ -84,7 +84,7 @@
</trans-unit>
<trans-unit id="21">
<source>This value is too short. It should have {{ limit }} characters or more.</source>
- <target>Diese Zeichenkette ist zu kurz. Sie sollte mindestens {{ limit }} Zeichen haben.</target>
+ <target>Diese Zeichenkette ist zu kurz. Sie sollte mindestens {{ limit }} Zeichen haben.|Diese Zeichenkette ist zu kurz. Sie sollte mindestens {{ limit }} Zeichen haben.</target>
</trans-unit>
<trans-unit id="22">
<source>This value should not be blank.</source>
@@ -180,7 +180,39 @@
</trans-unit>
<trans-unit id="48">
<source>This value should have exactly {{ limit }} characters.</source>
- <target>Dieser Wert sollte genau {{ limit }} Zeichen lang sein.</target>
+ <target>Dieser Wert sollte genau {{ limit }} Zeichen lang sein.|Dieser Wert sollte genau {{ limit }} Zeichen lang sein.</target>
+ </trans-unit>
+ <trans-unit id="49">
+ <source>The file was only partially uploaded.</source>
+ <target>Die Datei wurde nur teilweise hochgeladen.</target>
+ </trans-unit>
+ <trans-unit id="50">
+ <source>No file was uploaded.</source>
+ <target>Es wurde keine Datei hochgeladen.</target>
+ </trans-unit>
+ <trans-unit id="51">
+ <source>No temporary folder was configured in php.ini.</source>
+ <target>Es wurde kein temporärer Ordner in der php.ini konfiguriert.</target>
+ </trans-unit>
+ <trans-unit id="52">
+ <source>Cannot write temporary file to disk.</source>
+ <target>Kann die temporäre Datei nicht speichern.</target>
+ </trans-unit>
+ <trans-unit id="53">
+ <source>A PHP extension caused the upload to fail.</source>
+ <target>Eine PHP Erweiterung verhinderte den Upload.</target>
+ </trans-unit>
+ <trans-unit id="54">
+ <source>This collection should contain {{ limit }} elements or more.</source>
+ <target>Diese Sammlung sollte {{ limit }} oder mehr Elemente beinhalten.|Diese Sammlung sollte {{ limit }} oder mehr Elemente beinhalten.</target>
+ </trans-unit>
+ <trans-unit id="55">
+ <source>This collection should contain {{ limit }} elements or less.</source>
+ <target>Diese Sammlung sollte {{ limit }} oder weniger Elemente beinhalten.|Diese Sammlung sollte {{ limit }} oder weniger Elemente beinhalten.</target>
+ </trans-unit>
+ <trans-unit id="56">
+ <source>This collection should contain exactly {{ limit }} elements.</source>
+ <target>Diese Sammlung sollte genau {{ limit }} Element beinhalten.|Diese Sammlung sollte genau {{ limit }} Element beinhalten.</target>
</trans-unit>
</body>
</file>
View
74 Resources/translations/validators.lt.xlf
@@ -24,11 +24,11 @@
</trans-unit>
<trans-unit id="6">
<source>You must select at least {{ limit }} choices.</source>
- <target>Turite pasirinkti bent {{ limit }} variantus.</target>
+ <target>Turite pasirinkti bent {{ limit }} variantą.|Turite pasirinkti bent {{ limit }} variantus.|Turite pasirinkti bent {{ limit }} variantų.</target>
</trans-unit>
<trans-unit id="7">
<source>You must select at most {{ limit }} choices.</source>
- <target>Turite pasirinkti ne daugiau kaip {{ limit }} variantus.</target>
+ <target>Turite pasirinkti ne daugiau kaip {{ limit }} variantą.|Turite pasirinkti ne daugiau kaip {{ limit }} variantus.|Turite pasirinkti ne daugiau kaip {{ limit }} variantų.</target>
</trans-unit>
<trans-unit id="8">
<source>One or more of the given values is invalid.</source>
@@ -76,7 +76,7 @@
</trans-unit>
<trans-unit id="19">
<source>This value is too long. It should have {{ limit }} characters or less.</source>
- <target>Per didelis simbolių skaičius. Turi susidaryti iš {{ limit }} arba mažiau simbolių.</target>
+ <target>Per didelis simbolių skaičius. Turi susidaryti iš {{ limit }} arba mažiau simbolių.|Per didelis simbolių skaičius. Turi susidaryti iš {{ limit }} arba mažiau simbolių.|Per didelis simbolių skaičius. Turi susidaryti iš {{ limit }} arba mažiau simbolių.</target>
</trans-unit>
<trans-unit id="20">
<source>This value should be {{ limit }} or more.</source>
@@ -84,7 +84,7 @@
</trans-unit>
<trans-unit id="21">
<source>This value is too short. It should have {{ limit }} characters or more.</source>
- <target>Per mažas simbolių skaičius. Turi susidaryti iš {{ limit }} arba daugiau simbolių.</target>
+ <target>Per mažas simbolių skaičius. Turi susidaryti iš {{ limit }} arba daugiau simbolių.|Per mažas simbolių skaičius. Turi susidaryti iš {{ limit }} arba daugiau simbolių.|Per mažas simbolių skaičius. Turi susidaryti iš {{ limit }} arba daugiau simbolių.</target>
</trans-unit>
<trans-unit id="22">
<source>This value should not be blank.</source>
@@ -150,6 +150,70 @@
<source>This value is not a valid locale.</source>
<target>Ši reikšmė nėra tinkama lokalė.</target>
</trans-unit>
+ <trans-unit id="41">
+ <source>This value is already used.</source>
+ <target>Ši reikšmė jau yra naudojama.</target>
+ </trans-unit>
+ <trans-unit id="42">
+ <source>The size of the image could not be detected.</source>
+ <target>Nepavyko nustatyti nuotraukos dydžio.</target>
+ </trans-unit>
+ <trans-unit id="43">
+ <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
+ <target>Nuotraukos plotis per didelis ({{ width }}px). Maksimalus leidžiamas plotis yra {{ max_width }}px.</target>
+ </trans-unit>
+ <trans-unit id="44">
+ <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
+ <target>Nuotraukos plotis per mažas ({{ width }}px). Minimalus leidžiamas plotis yra {{ min_width }}px.</target>
+ </trans-unit>
+ <trans-unit id="45">
+ <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
+ <target>Nuotraukos aukštis per didelis ({{ height }}px). Maksimalus leidžiamas aukštis yra {{ max_height }}px.</target>
+ </trans-unit>
+ <trans-unit id="46">
+ <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
+ <target>Nuotraukos aukštis per mažas ({{ height }}px). Minimalus leidžiamas aukštis yra {{ min_height }}px.</target>
+ </trans-unit>
+ <trans-unit id="47">
+ <source>This value should be the user current password.</source>
+ <target>Ši reikšmė turi sutapti su dabartiniu vartotojo slaptažodžiu.</target>
+ </trans-unit>
+ <trans-unit id="48">
+ <source>This value should have exactly {{ limit }} characters.</source>
+ <target>Ši reikšmė turi turėti lygiai {{ limit }} simbolį.|Ši reikšmė turi turėti lygiai {{ limit }} simbolius.|Ši reikšmė turi turėti lygiai {{ limit }} simbolių.</target>
+ </trans-unit>
+ <trans-unit id="49">
+ <source>The file was only partially uploaded.</source>
+ <target>Failas buvo tik dalinai įkeltas.</target>
+ </trans-unit>
+ <trans-unit id="50">
+ <source>No file was uploaded.</source>
+ <target>Nebuvo įkelta jokių failų.</target>
+ </trans-unit>
+ <trans-unit id="51">
+ <source>No temporary folder was configured in php.ini.</source>
+ <target>Nėra sukonfiguruoto jokio laikino katalogo php.ini faile.</target>
+ </trans-unit>
+ <trans-unit id="52">
+ <source>Cannot write temporary file to disk.</source>
+ <target>Nepavyko išsaugoti laikino failo.</target>
+ </trans-unit>
+ <trans-unit id="53">
+ <source>A PHP extension caused the upload to fail.</source>
+ <target>PHP plėtinys sutrukdė failo įkėlimą ir jis nepavyko.</target>
+ </trans-unit>
+ <trans-unit id="54">
+ <source>This collection should contain {{ limit }} elements or more.</source>
+ <target>Sąraše turi būti {{ limit }} arba daugiau įrašų.|Sąraše turi būti {{ limit }} arba daugiau įrašų.|Sąraše turi būti {{ limit }} arba daugiau įrašų.</target>
+ </trans-unit>
+ <trans-unit id="55">
+ <source>This collection should contain {{ limit }} elements or less.</source>
+ <target>Sąraše turi būti {{ limit }} arba mažiau įrašų.|Sąraše turi būti {{ limit }} arba mažiau įrašų.|Sąraše turi būti {{ limit }} arba mažiau įrašų.</target>
+ </trans-unit>
+ <trans-unit id="56">
+ <source>This collection should contain exactly {{ limit }} elements.</source>
+ <target>Sąraše turi būti lygiai {{ limit }} įrašas.|Sąraše turi būti lygiai {{ limit }} įrašai.|Sąraše turi būti lygiai {{ limit }} įrašų.</target>
+ </trans-unit>
</body>
</file>
-</xliff>
+</xliff>
View
6 Resources/translations/validators.ro.xlf
@@ -76,7 +76,7 @@
</trans-unit>
<trans-unit id="19">
<source>This value is too long. It should have {{ limit }} characters or less.</source>
- <target>Această valoare este prea lungă. Ar trebui să aibă maxim {{ limit }} caractere.</target>
+ <target>Această valoare este prea lungă. Ar trebui să aibă maxim {{ limit }} caracter.|Această valoare este prea lungă. Ar trebui să aibă maxim {{ limit }} caractere.</target>
</trans-unit>
<trans-unit id="20">
<source>This value should be {{ limit }} or more.</source>
@@ -84,7 +84,7 @@
</trans-unit>
<trans-unit id="21">
<source>This value is too short. It should have {{ limit }} characters or more.</source>
- <target>Această valoare este prea scurtă. Ar trebui să aibă minim {{ limit }} caractere.</target>
+ <target>Această valoare este prea scurtă. Ar trebui să aibă minim {{ limit }} caracter.|Această valoare este prea scurtă. Ar trebui să aibă minim {{ limit }} caractere.</target>
</trans-unit>
<trans-unit id="22">
<source>This value should not be blank.</source>
@@ -180,7 +180,7 @@
</trans-unit>
<trans-unit id="48">
<source>This value should have exactly {{ limit }} characters.</source>
- <target>Această valoare trebuie să conțină minim {{ limit }} caractere.</target>
+ <target>Această valoare trebuie să conțină exact {{ limit }} caracter.|Această valoare trebuie să conțină exact {{ limit }} caractere.</target>
</trans-unit>
<trans-unit id="49">
<source>The file was only partially uploaded.</source>
View
110 Resources/translations/validators.sv.xlf
@@ -24,11 +24,11 @@
</trans-unit>
<trans-unit id="6">
<source>You must select at least {{ limit }} choices.</source>
- <target>Du ska välja minst {{ limit }} val.</target>
+ <target>Du måste välja minst {{ limit }} val.|Du måste välja minst {{ limit }} val.</target>
</trans-unit>
<trans-unit id="7">
<source>You must select at most {{ limit }} choices.</source>
- <target>Du kan som mest välja {{ limit }} val.</target>
+ <target>Du kan som mest välja {{ limit }} val.|Du kan som mest välja {{ limit }} val.</target>
</trans-unit>
<trans-unit id="8">
<source>One or more of the given values is invalid.</source>
@@ -76,7 +76,7 @@
</trans-unit>
<trans-unit id="19">
<source>This value is too long. It should have {{ limit }} characters or less.</source>
- <target>Värdet är för långt. Det ska vara {{ limit }} eller färre bokstäver.</target>
+ <target>Värdet är för långt. Det ska ha {{ limit }} tecken eller färre.|Värdet är för långt. Det ska ha {{ limit }} tecken eller färre.</target>
</trans-unit>
<trans-unit id="20">
<source>This value should be {{ limit }} or more.</source>
@@ -84,7 +84,7 @@
</trans-unit>
<trans-unit id="21">
<source>This value is too short. It should have {{ limit }} characters or more.</source>
- <target>Värdet är för kort. Det ska vara {{ limit }} eller fler bokstäver.</target>
+ <target>Värdet är för kort. Det ska ha {{ limit }} tecken eller mer.|Värdet är för kort. Det ska ha {{ limit }} tecken eller mer.</target>
</trans-unit>
<trans-unit id="22">
<source>This value should not be blank.</source>
@@ -114,6 +114,106 @@
<source>The two values should be equal.</source>
<target>De två värdena måste vara lika.</target>
</trans-unit>
+ <trans-unit id="32">
+ <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
+ <target>Filen är för stor. Tillåten maximal storlek är {{ limit }} {{ suffix }}.</target>
+ </trans-unit>
+ <trans-unit id="33">
+ <source>The file is too large.</source>
+ <target>Filen är för stor.</target>
+ </trans-unit>
+ <trans-unit id="34">
+ <source>The file could not be uploaded.</source>
+ <target>Filen kunde inte laddas upp.</target>
+ </trans-unit>
+ <trans-unit id="35">
+ <source>This value should be a valid number.</source>
+ <target>Värdet ska vara ett giltigt nummer.</target>
+ </trans-unit>
+ <trans-unit id="36">
+ <source>This file is not a valid image.</source>
+ <target>Den är filen är ingen giltig bild.</target>
+ </trans-unit>
+ <trans-unit id="37">
+ <source>This is not a valid IP address.</source>
+ <target>Det här är inte en giltig IP-adress.</target>
+ </trans-unit>
+ <trans-unit id="38">
+ <source>This value is not a valid language.</source>
+ <target>Värdet är inte ett giltigt språk.</target>
+ </trans-unit>
+ <trans-unit id="39">
+ <source>This value is not a valid locale.</source>
+ <target>Värdet är inte en giltig plats.</target>
+ </trans-unit>
+ <trans-unit id="40">
+ <source>This value is not a valid country.</source>
+ <target>Värdet är inte ett giltigt land.</target>
+ </trans-unit>
+ <trans-unit id="41">
+ <source>This value is already used.</source>
+ <target>Värdet används redan.</target>
+ </trans-unit>
+ <trans-unit id="42">
+ <source>The size of the image could not be detected.</source>
+ <target>Det gick inte att fastställa storleken på bilden.</target>
+ </trans-unit>
+ <trans-unit id="43">
+ <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
+ <target>Bildens bredd är för stor ({{ width }}px). Tillåten maximal bredd är {{ max_width }}px.</target>
+ </trans-unit>
+ <trans-unit id="44">
+ <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
+ <target>Bildens bredd är för liten ({{ width }}px). Minsta förväntade bredd är {{ min_width }}px.</target>
+ </trans-unit>
+ <trans-unit id="45">
+ <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
+ <target>Bildens höjd är för stor ({{ height }}px). Tillåten maximal bredd är {{ max_height }}px.</target>
+ </trans-unit>
+ <trans-unit id="46">
+ <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
+ <target>Bildens höjd är för liten ({{ height }}px). Minsta förväntade höjd är {{ min_height }}px.</target>
+ </trans-unit>
+ <trans-unit id="47">
+ <source>This value should be the user current password.</source>
+ <target>Värdet ska vara användarens nuvarande lösenord.</target>
+ </trans-unit>
+ <trans-unit id="48">
+ <source>This value should have exactly {{ limit }} characters.</source>
+ <target>Värdet ska ha exakt {{ limit }} tecken.|Värdet ska ha exakt {{ limit }} tecken.</target>
+ </trans-unit>
+ <trans-unit id="49">
+ <source>The file was only partially uploaded.</source>
+ <target>Filen laddades bara upp delvis.</target>
+ </trans-unit>
+ <trans-unit id="50">
+ <source>No file was uploaded.</source>
+ <target>Ingen fil laddades upp.</target>
+ </trans-unit>
+ <trans-unit id="51">
+ <source>No temporary folder was configured in php.ini.</source>
+ <target>Det finns ingen temporär mapp konfigurerad i php.ini.</target>
+ </trans-unit>
+ <trans-unit id="52">
+ <source>Cannot write temporary file to disk.</source>
+ <target>Kan inte skriva temporär fil till disken.</target>
+ </trans-unit>
+ <trans-unit id="53">
+ <source>A PHP extension caused the upload to fail.</source>
+ <target>En PHP extension gjorde att uppladdningen misslyckades.</target>
+ </trans-unit>
+ <trans-unit id="54">
+ <source>This collection should contain {{ limit }} elements or more.</source>
+ <target>Den här samlingen ska innehålla {{ limit }} element eller mer.|Den här samlingen ska innehålla {{ limit }} element eller mer.</target>
+ </trans-unit>
+ <trans-unit id="55">
+ <source>This collection should contain {{ limit }} elements or less.</source>
+ <target>Den här samlingen ska innehålla {{ limit }} element eller mindre.|Den här samlingen ska innehålla {{ limit }} element eller mindre.</target>
+ </trans-unit>
+ <trans-unit id="56">
+ <source>This collection should contain exactly {{ limit }} elements.</source>
+ <target>Den här samlingen ska innehålla exakt {{ limit }} element.|Den här samlingen ska innehålla exakt {{ limit }} element.</target>
+ </trans-unit>
</body>
</file>
-</xliff>
+</xliff>
Please sign in to comment.
Something went wrong with that request. Please try again.