Skip to content

Commit

Permalink
Merge branch '5.4' into 6.4
Browse files Browse the repository at this point in the history 
* 5.4:
  fix Twig 3.12 compatibility
  [Translation] Review Serbian translations
  Fix typos
  [DependencyInjection] Fix error message typo in YamlFileLoader
  • Loading branch information
@xabbuh
xabbuh committed Aug 29, 2024
2 parents 1da8e1e + a1b845a commit 8e37d58
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
24 changes: 12 additions & 12 deletions Resources/translations/validators.sr_Cyrl.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
</trans-unit>
<trans-unit id="37" resname="This is not a valid IP address.">
<source>This value is not a valid IP address.</source>
<target state="needs-review-translation">Ова вредност није валидна IP адреса.</target>
<target>Ова вредност није валидна IP адреса.</target>
</trans-unit>
<trans-unit id="38">
<source>This value is not a valid language.</source>
Expand Down Expand Up @@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51" resname="No temporary folder was configured in php.ini.">
<source>No temporary folder was configured in php.ini, or the configured folder does not exist.</source>
<target state="needs-review-translation">Привремени директоријум није конфигурисан у php.ini, или конфигурисани директоријум не постоји.</target>
<target>Привремени директоријум није конфигурисан у php.ini, или конфигурисани директоријум не постоји.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
Expand Down Expand Up @@ -224,7 +224,7 @@
</trans-unit>
<trans-unit id="59" resname="This is not a valid International Bank Account Number (IBAN).">
<source>This value is not a valid International Bank Account Number (IBAN).</source>
<target state="needs-review-translation">Ова вредност није валидан Међународни број банкарског рачуна (IBAN).</target>
<target>Ова вредност није валидан Међународни број банковног рачуна (IBAN).</target>
</trans-unit>
<trans-unit id="60">
<source>This value is not a valid ISBN-10.</source>
Expand Down Expand Up @@ -312,15 +312,15 @@
</trans-unit>
<trans-unit id="81" resname="This is not a valid Business Identifier Code (BIC).">
<source>This value is not a valid Business Identifier Code (BIC).</source>
<target state="needs-review-translation">Ова вредност није валидан Код за идентификацију бизниса (BIC).</target>
<target>Ова вредност није валидна Код за идентификацију бизниса (BIC).</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Грешка</target>
</trans-unit>
<trans-unit id="83" resname="This is not a valid UUID.">
<source>This value is not a valid UUID.</source>
<target state="needs-review-translation">Ова вредност није валидан UUID.</target>
<target>Ова вредност није валидан UUID.</target>
</trans-unit>
<trans-unit id="84">
<source>This value should be a multiple of {{ compared_value }}.</source>
Expand Down Expand Up @@ -440,31 +440,31 @@
</trans-unit>
<trans-unit id="113">
<source>This URL is missing a top-level domain.</source>
<target state="needs-review-translation">Овом URL недостаје домен највишег нивоа.</target>
<target>Овом УРЛ-у недостаје домен највишег нивоа.</target>
</trans-unit>
<trans-unit id="114">
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
<target>Ова вредност је прекратка. Треба да садржи макар једну реч.|Ова вредност је прекратка. Треба да садржи макар {{ min }} речи.</target>
</trans-unit>
<trans-unit id="115">
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
<target>Ова вредност је предугачка. Треба да садржи само једну реч.|Ова вредност је предугачка. Треба да садржи највише {{ max }} речи.</target>
</trans-unit>
<trans-unit id="116">
<source>This value does not represent a valid week in the ISO 8601 format.</source>
<target state="needs-translation">This value does not represent a valid week in the ISO 8601 format.</target>
<target>Ова вредност не представља валидну недељу у ISO 8601 формату.</target>
</trans-unit>
<trans-unit id="117">
<source>This value is not a valid week.</source>
<target state="needs-translation">This value is not a valid week.</target>
<target>Ова вредност није валидна недеља.</target>
</trans-unit>
<trans-unit id="118">
<source>This value should not be before week "{{ min }}".</source>
<target state="needs-translation">This value should not be before week "{{ min }}".</target>
<target>Ова вредност не би требала да буде пре недеље "{{ min }}".</target>
</trans-unit>
<trans-unit id="119">
<source>This value should not be after week "{{ max }}".</source>
<target state="needs-translation">This value should not be after week "{{ max }}".</target>
<target>Ова вредност не би требала да буде после недеље "{{ max }}".</target>
</trans-unit>
</body>
</file>
Expand Down
26 changes: 13 additions & 13 deletions Resources/translations/validators.sr_Latn.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
</trans-unit>
<trans-unit id="37" resname="This is not a valid IP address.">
<source>This value is not a valid IP address.</source>
<target state="needs-review-translation">Ova vrednost nije validna IP adresa.</target>
<target>Ova vrednost nije validna IP adresa.</target>
</trans-unit>
<trans-unit id="38">
<source>This value is not a valid language.</source>
Expand Down Expand Up @@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51" resname="No temporary folder was configured in php.ini.">
<source>No temporary folder was configured in php.ini, or the configured folder does not exist.</source>
<target state="needs-review-translation">Privremeni direktorijum nije konfigurisan u php.ini, ili konfigurisani direktorijum ne postoji.</target>
<target>Privremeni direktorijum nije konfigurisan u php.ini, ili direktorijum koji je konfigurisan ne postoji.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
Expand Down Expand Up @@ -224,7 +224,7 @@
</trans-unit>
<trans-unit id="59" resname="This is not a valid International Bank Account Number (IBAN).">
<source>This value is not a valid International Bank Account Number (IBAN).</source>
<target state="needs-review-translation">Ova vrednost nije validan Međunarodni broj bankovnog računa (IBAN).</target>
<target>Ova vrednost nije validan Međunarodni broj bankovnog računa (IBAN).</target>
</trans-unit>
<trans-unit id="60">
<source>This value is not a valid ISBN-10.</source>
Expand Down Expand Up @@ -312,15 +312,15 @@
</trans-unit>
<trans-unit id="81" resname="This is not a valid Business Identifier Code (BIC).">
<source>This value is not a valid Business Identifier Code (BIC).</source>
<target state="needs-review-translation">Ova vrednost nije validan Kod za identifikaciju biznisa (BIC).</target>
<target>Ova vrednost nije validan Kod za identifikaciju biznisa (BIC).</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Greška</target>
</trans-unit>
<trans-unit id="83" resname="This is not a valid UUID.">
<source>This value is not a valid UUID.</source>
<target state="needs-review-translation">Ova vrednost nije validan UUID.</target>
<target>Ova vrednost nije validan UUID.</target>
</trans-unit>
<trans-unit id="84">
<source>This value should be a multiple of {{ compared_value }}.</source>
Expand Down Expand Up @@ -436,35 +436,35 @@
</trans-unit>
<trans-unit id="112">
<source>This value is not a valid MAC address.</source>
<target state="needs-review-translation">Ova vrednost nije validna MAC adresa.</target>
<target>Ova vrednost nije validna MAC adresa.</target>
</trans-unit>
<trans-unit id="113">
<source>This URL is missing a top-level domain.</source>
<target state="needs-review-translation">Ovom URL nedostaje domen najvišeg nivoa.</target>
<target>Ovom URL nedostaje domen najvišeg nivoa.</target>
</trans-unit>
<trans-unit id="114">
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
<target>Ova vrednost je prekratka. Treba da sadrži makar jednu reč.|Ova vrednost je prekratka. Treba da sadrži makar {{ min }} reči.</target>
</trans-unit>
<trans-unit id="115">
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
<target>Ova vrednost je predugačka. Treba da sadrži samo jednu reč.|Ova vrednost je predugačka. Treba da sadrži najviše {{ max }} reči.</target>
</trans-unit>
<trans-unit id="116">
<source>This value does not represent a valid week in the ISO 8601 format.</source>
<target state="needs-translation">This value does not represent a valid week in the ISO 8601 format.</target>
<target>Ova vrednost ne predstavlja validnu nedelju u ISO 8601 formatu.</target>
</trans-unit>
<trans-unit id="117">
<source>This value is not a valid week.</source>
<target state="needs-translation">This value is not a valid week.</target>
<target>Ova vrednost nije validna nedelja</target>
</trans-unit>
<trans-unit id="118">
<source>This value should not be before week "{{ min }}".</source>
<target state="needs-translation">This value should not be before week "{{ min }}".</target>
<target>Ova vrednost ne bi trebala da bude pre nedelje "{{ min }}".</target>
</trans-unit>
<trans-unit id="119">
<source>This value should not be after week "{{ max }}".</source>
<target state="needs-translation">This value should not be after week "{{ max }}".</target>
<target>Ova vrednost ne bi trebala da bude posle nedelje "{{ max }}".</target>
</trans-unit>
</body>
</file>
Expand Down

0 comments on commit 8e37d58

Please sign in to comment.