Skip to content

Commit 4df9329

Browse files
Merge branch '4.4' into 5.1
* 4.4: fix merge Remove branch-version (keep them for contracts only) [HttpClient] relax auth bearer format requirements [PHPUnitBridge] Silence errors from mkdir() [DependencyInjection] Preload classes with union types correctly. [Serializer] fix decoding float XML attributes starting with 0 add missing dutch translations Support PHPUnit 8 and PHPUnit 9 in constraint compatibility trait Add expectDeprecation, expectNotice, expectWarning, and expectError to TestCase polyfill Add missing exporter function for PHPUnit 7 [Validator] Add missing romanian translations [Cache] Use correct expiry in ChainAdapter do not translate null placeholders or titles
2 parents 4aa3068 + 738370a commit 4df9329

File tree

3 files changed

+73
-4
lines changed

3 files changed

+73
-4
lines changed

Resources/translations/validators.nl.xlf

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,26 @@
366366
<source>This value should be between {{ min }} and {{ max }}.</source>
367367
<target>Deze waarde moet zich tussen {{ min }} en {{ max }} bevinden.</target>
368368
</trans-unit>
369+
<trans-unit id="95">
370+
<source>This value is not a valid hostname.</source>
371+
<target>Deze waarde is geen geldige hostnaam.</target>
372+
</trans-unit>
373+
<trans-unit id="96">
374+
<source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
375+
<target>Het aantal elementen van deze collectie moet een veelvoud zijn van {{ compared_value }}.</target>
376+
</trans-unit>
377+
<trans-unit id="97">
378+
<source>This value should satisfy at least one of the following constraints:</source>
379+
<target>Deze waarde moet voldoen aan tenminste een van de volgende voorwaarden:</target>
380+
</trans-unit>
381+
<trans-unit id="98">
382+
<source>Each element of this collection should satisfy its own set of constraints.</source>
383+
<target>Elk element van deze collectie moet voldoen aan zijn eigen set voorwaarden.</target>
384+
</trans-unit>
385+
<trans-unit id="99">
386+
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387+
<target>Deze waarde is geen geldig International Securities Identification Number (ISIN).</target>
388+
</trans-unit>
369389
</body>
370390
</file>
371391
</xliff>

Resources/translations/validators.ro.xlf

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,58 @@
334334
<source>This value should be valid JSON.</source>
335335
<target>Această valoare trebuie să fie un JSON valid.</target>
336336
</trans-unit>
337+
<trans-unit id="87">
338+
<source>This collection should contain only unique elements.</source>
339+
<target>Acest set ar trebui să conțină numai elemente unice.</target>
340+
</trans-unit>
341+
<trans-unit id="88">
342+
<source>This value should be positive.</source>
343+
<target>Această valoare ar trebui să fie pozitivă.</target>
344+
</trans-unit>
345+
<trans-unit id="89">
346+
<source>This value should be either positive or zero.</source>
347+
<target>Această valoare trebuie să fie pozitivă sau zero.</target>
348+
</trans-unit>
349+
<trans-unit id="90">
350+
<source>This value should be negative.</source>
351+
<target>Această valoare ar trebui să fie negativă.</target>
352+
</trans-unit>
353+
<trans-unit id="91">
354+
<source>This value should be either negative or zero.</source>
355+
<target>Această valoare trebuie să fie negativă sau zero.</target>
356+
</trans-unit>
357+
<trans-unit id="92">
358+
<source>This value is not a valid timezone.</source>
359+
<target>Această valoare nu este un fus orar valid.</target>
360+
</trans-unit>
361+
<trans-unit id="93">
362+
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
363+
<target>Această parolă a fost compromisă și nu poate fi utilizată. Vă rugăm să utilizați o altă parolă.</target>
364+
</trans-unit>
365+
<trans-unit id="94">
366+
<source>This value should be between {{ min }} and {{ max }}.</source>
367+
<target>Această valoare trebuie să fie între {{ min }} și {{ max }}.</target>
368+
</trans-unit>
369+
<trans-unit id="95">
370+
<source>This value is not a valid hostname.</source>
371+
<target>Această valoare nu este un numele gazdei valid.</target>
372+
</trans-unit>
373+
<trans-unit id="96">
374+
<source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
375+
<target>Numărul de elemente din această colecție ar trebui să fie un multiplu al {{ compared_value }}.</target>
376+
</trans-unit>
377+
<trans-unit id="97">
378+
<source>This value should satisfy at least one of the following constraints:</source>
379+
<target>Această valoare trebuie să îndeplinească cel puțin una dintre următoarele reguli:</target>
380+
</trans-unit>
381+
<trans-unit id="98">
382+
<source>Each element of this collection should satisfy its own set of constraints.</source>
383+
<target>Fiecare element din acest set ar trebui să îndeplinească propriul set de reguli.</target>
384+
</trans-unit>
385+
<trans-unit id="99">
386+
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387+
<target>Această valoare nu este un număr internațional de identificare (ISIN) valabil.</target>
388+
</trans-unit>
337389
</body>
338390
</file>
339391
</xliff>

composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,5 @@
7171
"/Tests/"
7272
]
7373
},
74-
"minimum-stability": "dev",
75-
"extra": {
76-
"branch-version": "5.1"
77-
}
74+
"minimum-stability": "dev"
7875
}

0 commit comments

Comments
 (0)