Merge branch '4.4' into 5.1
* 4.4: 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)
This commit is contained in:
commit
f7390bb073
2
.github/patch-types.php
vendored
2
.github/patch-types.php
vendored
@ -5,7 +5,7 @@ if (false === getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
|
||||
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';
|
||||
|
||||
|
@ -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
|
||||
|
||||
- |
|
||||
|
@ -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>
|
||||
|
Reference in New Issue
Block a user