merged branch jdreesen/trans-update-2 (PR symfony#2112)

Commits ------- 1134c1a [Validator] Fixed typo in Image constraint 428a01c Merge branch 'master' of git://github.com/symfony/symfony into trans-update-2 3843afa [FrameworkBundle] Improved German validator translation ac54080 [FrameworkBundle] Updated German translations for image validator Discussion ---------- Updated/improved german validator translation & fixed typos in Image constraint

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.de.xliff

@@ -64,7 +64,7 @@
  </trans-unit>
  <trans-unit id="16">
  <source>The file is too large ({{ size }}). Allowed maximum size is {{ limit }}</source>
- <target>Die Datei ist zu groß ({{ size }}). Die maximal zugelassene Größe beträgt {{ limit }}</target>
+ <target>Die Datei ist zu groß ({{ size }}). Die maximal zulässige Größe beträgt {{ limit }}</target>
  </trans-unit>
  <trans-unit id="17">
  <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}</source>
@@ -128,7 +128,7 @@
  </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 zugelassene Größe beträgt {{ limit }}</target>
+ <target>Die Datei ist zu groß. Die maximal zulässige Größe beträgt {{ limit }}</target>
  </trans-unit>
  <trans-unit id="33">
  <source>The file is too large</source>
@@ -166,6 +166,26 @@
  <source>This value is already used</source>
  <target>Dieser Wert wird bereits verwendet</target>
  </trans-unit>
+ <trans-unit id="42">
+ <source>The size of the image could not be detected</source>
+ <target>Die Größe des Bildes konnte nicht ermittlet werden</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>Die Bildbreite ist zu groß ({{ width }}px). Die maximal zulässige Breite beträgt {{ 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>Die Bildbreite ist zu gering ({{ width }}px). Die erwartete Mindestbreite beträgt {{ 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>Die Bildhöhe ist zu groß ({{ height }}px). Die maximal zulässige Höhe beträgt {{ 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>Die Bildhöhe ist zu gering ({{ height }}px). Die erwartete Mindesthöhe beträgt {{ min_height }}px</target>
+ </trans-unit>
  </body>
  </file>
 </xliff>

src/Symfony/Component/Validator/Constraints/Image.php

@@ -28,6 +28,6 @@ class Image extends File
  public $sizeNotDetectedMessage = 'The size of the image could not be detected';
  public $maxWidthMessage = 'The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px';
  public $minWidthMessage = 'The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px';
- public $maxHeightMessage = 'The image height is too big ({{ height }}px). Allowed maximum width is {{ max_height }}px';
- public $minHeightMessage = 'The image width is too small ({{ height }}px). Minimum height expected is {{ min_height }}px';
+ public $maxHeightMessage = 'The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px';
+ public $minHeightMessage = 'The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px';
 }