Merge branch '5.4' into 6.0

* 5.4:
  [String] Add conflict for translation-contracts v3
  fixed help text

Author: chalasr

src/Symfony/Component/Translation/Command/TranslationPullCommand.php

@@ -110,7 +110,7 @@ protected function configure()
 
 Full example:
 
-  <info>php %command.full_name% provider --force --domains=messages,validators --locales=en</>
+  <info>php %command.full_name% provider --force --domains=messages --domains=validators --locales=en</>
 
 This command pulls all translations associated with the <comment>messages</> and <comment>validators</> domains for the <comment>en</> locale.
 Local translations for the specified domains and locale are deleted if they're not present on the provider and overwritten if it's the case.

src/Symfony/Component/Translation/Command/TranslationPushCommand.php

@@ -102,7 +102,7 @@ protected function configure()
 
 Full example:
 
-  <info>php %command.full_name% provider --force --delete-missing --domains=messages,validators --locales=en</>
+  <info>php %command.full_name% provider --force --delete-missing --domains=messages --domains=validators --locales=en</>
 
 This command pushes all translations associated with the <comment>messages</> and <comment>validators</> domains for the <comment>en</> locale.
 Provider translations for the specified domains and locale are deleted if they're not present locally and overwritten if it's the case.