Merge branch '5.1' into 5.x

nicolas-grekas · nicolas-grekas · commit 982bf9487eec · 2020-10-27T15:19:03.000+01:00
* 5.1: Fix CI for 3.4 [Form] Some minor teaks for Swedish Fix CI Fix CI minor #38838 [ProxyManager] use "composer/package-versions-deprecated" instead of "ocramius/package-versions" (nicolas-grekas)
diff --git a/.github/patch-types.php b/.github/patch-types.php
@@ -5,7 +5,7 @@
     exit(1);
 }
 
-require __DIR__.'/../.phpunit/phpunit-8.3-0/vendor/autoload.php';
+require __DIR__.'/../.phpunit/phpunit/vendor/autoload.php';
 
 $loader = require __DIR__.'/../vendor/autoload.php';
 
diff --git a/.travis.yml b/.travis.yml
@@ -265,7 +265,7 @@ install:
       export -f phpinfo
 
       for PHP in $TRAVIS_PHP_VERSION $php_extra; do
-          tfold $PHP phpinfo $PHP
+          tfold phpinfo phpinfo $PHP
       done
 
     - |
diff --git a/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf b/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf
@@ -48,11 +48,11 @@
             </trans-unit>
             <trans-unit id="107">
                 <source>Please enter a valid date and time.</source>
-                <target>Ange datum och tid.</target>
+                <target>Ange ett giltigt datum och tid.</target>
             </trans-unit>
             <trans-unit id="108">
                 <source>Please enter a valid date.</source>
-                <target>Ange ett datum.</target>
+                <target>Ange ett giltigt datum.</target>
             </trans-unit>
             <trans-unit id="109">
                 <source>Please select a valid file.</source>
@@ -100,7 +100,7 @@
             </trans-unit>
             <trans-unit id="120">
                 <source>Please select a valid timezone.</source>
-                <target>Välj tidszon.</target>
+                <target>Välj en tidszon.</target>
             </trans-unit>
             <trans-unit id="121">
                 <source>Please enter a valid URL.</source>
@@ -132,7 +132,7 @@
             </trans-unit>
             <trans-unit id="128">
                 <source>Please enter a valid week.</source>
-                <target>Ange en vecka.</target>
+                <target>Ange en giltig vecka.</target>
             </trans-unit>
         </body>
     </file>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`exit(1);`
`6`	`6`	`}`
`7`	`7`
`8`		`-require __DIR__.'/../.phpunit/phpunit-8.3-0/vendor/autoload.php';`
	`8`	`+require __DIR__.'/../.phpunit/phpunit/vendor/autoload.php';`
`9`	`9`
`10`	`10`	`$loader = require __DIR__.'/../vendor/autoload.php';`
`11`	`11`