Merge branch '3.4' into 4.4
* 3.4: Fix CI for 3.4 [Form] Some minor teaks for Swedish Fix CI minor #38838 [ProxyManager] use "composer/package-versions-deprecated" instead of "ocramius/package-versions" (nicolas-grekas)
This commit is contained in:
commit
dcb57f8505
|
@ -265,7 +265,7 @@ install:
|
||||||
export -f phpinfo
|
export -f phpinfo
|
||||||
|
|
||||||
for PHP in $TRAVIS_PHP_VERSION $php_extra; do
|
for PHP in $TRAVIS_PHP_VERSION $php_extra; do
|
||||||
tfold $PHP phpinfo $PHP
|
tfold phpinfo phpinfo $PHP
|
||||||
done
|
done
|
||||||
|
|
||||||
- |
|
- |
|
||||||
|
|
|
@ -48,11 +48,11 @@
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="107">
|
<trans-unit id="107">
|
||||||
<source>Please enter a valid date and time.</source>
|
<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>
|
||||||
<trans-unit id="108">
|
<trans-unit id="108">
|
||||||
<source>Please enter a valid date.</source>
|
<source>Please enter a valid date.</source>
|
||||||
<target>Ange ett datum.</target>
|
<target>Ange ett giltigt datum.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="109">
|
<trans-unit id="109">
|
||||||
<source>Please select a valid file.</source>
|
<source>Please select a valid file.</source>
|
||||||
|
@ -100,7 +100,7 @@
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="120">
|
<trans-unit id="120">
|
||||||
<source>Please select a valid timezone.</source>
|
<source>Please select a valid timezone.</source>
|
||||||
<target>Välj tidszon.</target>
|
<target>Välj en tidszon.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="121">
|
<trans-unit id="121">
|
||||||
<source>Please enter a valid URL.</source>
|
<source>Please enter a valid URL.</source>
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="128">
|
<trans-unit id="128">
|
||||||
<source>Please enter a valid week.</source>
|
<source>Please enter a valid week.</source>
|
||||||
<target>Ange en vecka.</target>
|
<target>Ange en giltig vecka.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
</body>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
|
|
Reference in New Issue