Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 6.4:
  [HttpClient][Mailer] Revert "Let curl handle transfer encoding", use HTTP/1.1 for Mailgun
  Reviewed Catalan missing translations
  [AssetMapper] Upgrade importmap polyfill
  Fix typo: synchronous -> synchronously
  [Serializer] Check if exception message in test is correct
  Ibexa is sponsoring Symfony 5.4, thanks to them! \o/
  [VarDumper] Fix `FFICaster` test to be platform-adaptable
  [String] Add `alias` case to `EnglishInflector`
  [FrameworkBundle] Throw runtime exception when trying to use asset-mapper while http-client is disabled
  [SecurityBundle] Remove unused memory users’ `name` attribute from the XSD
  [VarExporter] generate __doUnserialize() method in ProxyHelper::generateLazyProxy()
  Double check if pcntl function exists
  Add additional headers in Scaleway bridge
  [VarDumper] Fix FFI caster test
  [DependencyInjection] Add test coverage for `AutowireCallable::buildDefinition()`
  • Loading branch information
nicolas-grekas committed Jun 28, 2024
2 parents 6fec2c1 + 2d58f4c commit 115682b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Resources/translations/security.ca.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,19 @@
</trans-unit>
<trans-unit id="17">
<source>Too many failed login attempts, please try again later.</source>
<target>Massa intents d'inici de sessió fallits, torneu-ho a provar més tard.</target>
<target>Massa intents d'inici de sessió fallits, si us plau torneu-ho a provar més tard.</target>
</trans-unit>
<trans-unit id="18">
<source>Invalid or expired login link.</source>
<target>Enllaç d'inici de sessió no vàlid o caducat.</target>
</trans-unit>
<trans-unit id="19">
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
<target>Massa intents d'inici de sessió fallits, torneu-ho a provar en %minutes% minut.</target>
<target>Massa intents d'inici de sessió fallits, si us plau torneu-ho a provar en %minutes% minut.</target>
</trans-unit>
<trans-unit id="20">
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
<target state="needs-review-translation">Massa intents fallits d'inici de sessió, torneu-ho a provar d'aquí a %minutes% minuts.</target>
<target>Massa intents d'inici de sessió fallits, si us plau torneu-ho a provar en %minutes% minuts.</target>
</trans-unit>
</body>
</file>
Expand Down

0 comments on commit 115682b

Please sign in to comment.