Skip to content

Commit

Permalink
Merge branch '3.0'
Browse files Browse the repository at this point in the history
* 3.0: (21 commits)
  fixed typo
  fixed typo
  Fixed a minor XML issue in a translation file
  Fix merge
  Fix merge
  Fix merge
  Fix merge
  Update twig.html.twig
  PhpUnitNoDedicateAssertFixer results
  disable the assets helper when assets are disabled
  Improve Norwegian translations
  [2.7] [FrameworkBundle] minor fix tests added by #17569
  Fixed the antialiasing of the toolbar text
  Simplify markdown for PR template
  fixed CS
  fixed CS
  documented the $url parameter better
  [Form] add test for ArrayChoiceList handling null
  [Form] fix edge cases with choice placeholder
  register commands from kernel when accessing list
  ...
  • Loading branch information
fabpot committed Feb 23, 2016
2 parents 614a07c + e603817 commit 33672bb
Showing 1 changed file with 186 additions and 22 deletions.
208 changes: 186 additions & 22 deletions Resources/translations/validators.no.xlf
Expand Up @@ -4,39 +4,39 @@
<body>
<trans-unit id="1">
<source>This value should be false.</source>
<target>Verdien skal være falsk.</target>
<target>Verdien være usann.</target>
</trans-unit>
<trans-unit id="2">
<source>This value should be true.</source>
<target>Verdien skal være sann.</target>
<target>Verdien være sann.</target>
</trans-unit>
<trans-unit id="3">
<source>This value should be of type {{ type }}.</source>
<target>Verdien skal være av typen {{ type }}.</target>
<target>Verdien være av typen {{ type }}.</target>
</trans-unit>
<trans-unit id="4">
<source>This value should be blank.</source>
<target>Verdien skal være blank.</target>
<target>Verdien være blank.</target>
</trans-unit>
<trans-unit id="5">
<source>The value you selected is not a valid choice.</source>
<target>Verdien skal være en av de gitte valg.</target>
<target>Den valgte verdien er ikke gyldig.</target>
</trans-unit>
<trans-unit id="6">
<source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
<target>Du skal velge minst {{ limit }} valg.</target>
<target>Du velge minst {{ limit }} valg.</target>
</trans-unit>
<trans-unit id="7">
<source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
<target>Du kan maks velge {{ limit }} valg.</target>
</trans-unit>
<trans-unit id="8">
<source>One or more of the given values is invalid.</source>
<target>En eller flere av de oppgitte verdier er ugyldige.</target>
<target>En eller flere av de oppgitte verdiene er ugyldige.</target>
</trans-unit>
<trans-unit id="9">
<source>This field was not expected.</source>
<target>Dette feltet ikke var forventet.</target>
<target>Dette feltet var ikke forventet.</target>
</trans-unit>
<trans-unit id="10">
<source>This field is missing.</source>
Expand All @@ -48,19 +48,19 @@
</trans-unit>
<trans-unit id="12">
<source>This value is not a valid datetime.</source>
<target>Verdien er ikke en gyldig dato og tid.</target>
<target>Verdien er ikke en gyldig dato/tid.</target>
</trans-unit>
<trans-unit id="13">
<source>This value is not a valid email address.</source>
<target>Verdien er ikke en gyldig e-mail adresse.</target>
<target>Verdien er ikke en gyldig e-postadresse.</target>
</trans-unit>
<trans-unit id="14">
<source>The file could not be found.</source>
<target>Filen kunne ikke finnes.</target>
</trans-unit>
<trans-unit id="15">
<source>The file is not readable.</source>
<target>Filen kan ikke leses.</target>
<target>Filen er ikke lesbar.</target>
</trans-unit>
<trans-unit id="16">
<source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
Expand All @@ -72,19 +72,19 @@
</trans-unit>
<trans-unit id="18">
<source>This value should be {{ limit }} or less.</source>
<target>Verdien skal være {{ limit }} eller mindre.</target>
<target>Verdien være {{ limit }} tegn lang eller mindre.</target>
</trans-unit>
<trans-unit id="19">
<source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
<target>Verdien er for lang. Den skal ha {{ limit }} bokstaver eller mindre.</target>
<target>Verdien er for lang. Den ha {{ limit }} tegn eller mindre.</target>
</trans-unit>
<trans-unit id="20">
<source>This value should be {{ limit }} or more.</source>
<target>Verdien skal være {{ limit }} eller mer.</target>
<target>Verdien være {{ limit }} eller mer.</target>
</trans-unit>
<trans-unit id="21">
<source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
<target>Verdien er for kort. Den skal ha {{ limit }} tegn eller flere.</target>
<target>Verdien er for kort. Den ha {{ limit }} tegn eller flere.</target>
</trans-unit>
<trans-unit id="22">
<source>This value should not be blank.</source>
Expand All @@ -96,7 +96,7 @@
</trans-unit>
<trans-unit id="24">
<source>This value should be null.</source>
<target>Verdien skal være tom (null).</target>
<target>Verdien være tom (null).</target>
</trans-unit>
<trans-unit id="25">
<source>This value is not valid.</source>
Expand All @@ -112,11 +112,11 @@
</trans-unit>
<trans-unit id="31">
<source>The two values should be equal.</source>
<target>De to verdier skal være ens.</target>
<target>Verdiene må være identiske.</target>
</trans-unit>
<trans-unit id="32">
<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>
<target>Filen er for stor. Den maksimale størrelsen er {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>
Expand All @@ -128,7 +128,7 @@
</trans-unit>
<trans-unit id="35">
<source>This value should be a valid number.</source>
<target>Denne verdi skal være et gyldig tall.</target>
<target>Verdien må være et gyldig tall.</target>
</trans-unit>
<trans-unit id="36">
<source>This file is not a valid image.</source>
Expand All @@ -140,15 +140,179 @@
</trans-unit>
<trans-unit id="38">
<source>This value is not a valid language.</source>
<target>Denne verdi er ikke et gyldig språk.</target>
<target>Verdien er ikke et gyldig språk.</target>
</trans-unit>
<trans-unit id="39">
<source>This value is not a valid locale.</source>
<target>Denne verdi er ikke en gyldig lokalitet.</target>
<target>Verdien er ikke en gyldig lokalitet.</target>
</trans-unit>
<trans-unit id="40">
<source>This value is not a valid country.</source>
<target>Denne verdi er ikke et gyldig land.</target>
<target>Verdien er ikke et gyldig navn på land.</target>
</trans-unit>
<trans-unit id="41">
<source>This value is already used.</source>
<target>Verdien er allerede brukt.</target>
</trans-unit>
<trans-unit id="42">
<source>The size of the image could not be detected.</source>
<target>Bildestørrelsen kunne ikke oppdages.</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>Bildebredden er for stor ({{ width }} piksler). Tillatt maksimumsbredde er {{ max_width }} piksler.</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>Bildebredden er for liten ({{ width }} piksler). Forventet minimumsbredde er {{ min_width }} piksler.</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>Bildehøyden er for stor ({{ height }} piksler). Tillatt maksimumshøyde er {{ max_height }} piksler.</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>Bildehøyden er for liten ({{ height }} piksler). Forventet minimumshøyde er {{ min_height }} piksler.</target>
</trans-unit>
<trans-unit id="47">
<source>This value should be the user's current password.</source>
<target>Verdien må være brukerens sitt nåværende passord.</target>
</trans-unit>
<trans-unit id="48">
<source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
<target>Verdien må være nøyaktig {{ limit }} tegn.</target>
</trans-unit>
<trans-unit id="49">
<source>The file was only partially uploaded.</source>
<target>Filen var kun delvis opplastet.</target>
</trans-unit>
<trans-unit id="50">
<source>No file was uploaded.</source>
<target>Ingen fil var lastet opp.</target>
</trans-unit>
<trans-unit id="51">
<source>No temporary folder was configured in php.ini.</source>
<target>Den midlertidige mappen (tmp) er ikke konfigurert i php.ini.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
<target>Kan ikke skrive midlertidig fil til disk.</target>
</trans-unit>
<trans-unit id="53">
<source>A PHP extension caused the upload to fail.</source>
<target>En PHP-utvidelse forårsaket en feil under opplasting.</target>
</trans-unit>
<trans-unit id="54">
<source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
<target>Denne samlingen må inneholde {{ limit }} element eller flere.|Denne samlingen må inneholde {{ limit }} elementer eller flere.</target>
</trans-unit>
<trans-unit id="55">
<source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
<target>Denne samlingen må inneholde {{ limit }} element eller færre.|Denne samlingen må inneholde {{ limit }} elementer eller færre.</target>
</trans-unit>
<trans-unit id="56">
<source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
<target>Denne samlingen må inneholde nøyaktig {{ limit }} element.|Denne samlingen må inneholde nøyaktig {{ limit }} elementer.</target>
</trans-unit>
<trans-unit id="57">
<source>Invalid card number.</source>
<target>Ugyldig kortnummer.</target>
</trans-unit>
<trans-unit id="58">
<source>Unsupported card type or invalid card number.</source>
<target>Korttypen er ikke støttet eller ugyldig kortnummer.</target>
</trans-unit>
<trans-unit id="59">
<source>This is not a valid International Bank Account Number (IBAN).</source>
<target>Dette er ikke en gyldig IBAN.</target>
</trans-unit>
<trans-unit id="60">
<source>This value is not a valid ISBN-10.</source>
<target>Verdien er ikke en gyldig ISBN-10.</target>
</trans-unit>
<trans-unit id="61">
<source>This value is not a valid ISBN-13.</source>
<target>Verdien er ikke en gyldig ISBN-13.</target>
</trans-unit>
<trans-unit id="62">
<source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
<target>Verdien er hverken en gyldig ISBN-10 eller ISBN-13.</target>
</trans-unit>
<trans-unit id="63">
<source>This value is not a valid ISSN.</source>
<target>Verdien er ikke en gyldig ISSN.</target>
</trans-unit>
<trans-unit id="64">
<source>This value is not a valid currency.</source>
<target>Verdien er ikke gyldig valuta.</target>
</trans-unit>
<trans-unit id="65">
<source>This value should be equal to {{ compared_value }}.</source>
<target>Verdien må være lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="66">
<source>This value should be greater than {{ compared_value }}.</source>
<target>Verdien må være større enn {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="67">
<source>This value should be greater than or equal to {{ compared_value }}.</source>
<target>Verdien må være større enn eller lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="68">
<source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Verdien må være identisk med {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="69">
<source>This value should be less than {{ compared_value }}.</source>
<target>Verdien må være mindre enn {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="70">
<source>This value should be less than or equal to {{ compared_value }}.</source>
<target>Verdien må være mindre enn eller lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="71">
<source>This value should not be equal to {{ compared_value }}.</source>
<target>Verdien må ikke være lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="72">
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Verdien må ikke være identisk med {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="73">
<source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
<target>Bildeforholdet er for stort ({{ ratio }}). Tillatt maksimumsbildeforhold er {{ max_ratio }}.</target>
</trans-unit>
<trans-unit id="74">
<source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
<target>Bildeforholdet er for lite ({{ ratio }}). Forventet maksimumsbildeforhold er {{ min_ratio }}.</target>
</trans-unit>
<trans-unit id="75">
<source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
<target>Bildet er en kvadrat ({{ width }}x{{ height }}px). Kvadratiske bilder er ikke tillatt.</target>
</trans-unit>
<trans-unit id="76">
<source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
<target>Bildet er i liggende retning ({{ width }}x{{ height }}px). Bilder i liggende retning er ikke tillatt.</target>
</trans-unit>
<trans-unit id="77">
<source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
<target>Bildet er i stående retning ({{ width }}x{{ height }}px). Bilder i stående retning er ikke tillatt.</target>
</trans-unit>
<trans-unit id="78">
<source>An empty file is not allowed.</source>
<target>Tomme filer er ikke tilatt.</target>
</trans-unit>
<trans-unit id="79">
<source>The host could not be resolved.</source>
<target>Vertsnavn kunne ikke løses.</target>
</trans-unit>
<trans-unit id="80">
<source>This value does not match the expected {{ charset }} charset.</source>
<target>Verdien samsvarer ikke med forventet tegnsett {{ charset }}.</target>
</trans-unit>
<trans-unit id="81">
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>Dette er ikke en gyldig BIC.</target>
</trans-unit>
</body>
</file>
Expand Down

0 comments on commit 33672bb

Please sign in to comment.