Merge branch '1.3' into 2.0
Conflicts: src/Behat/MinkExtension/Context/MinkDictionary.php
This commit is contained in:
@@ -135,8 +135,8 @@
|
||||
<target><![CDATA[/^(?:|я )должен быть на главной странице/]]></target>
|
||||
</trans-unit>
|
||||
<trans-unit id="the-url-should-match">
|
||||
<source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
|
||||
<target><![CDATA[/^(?:url|адрес) должен соответствовать (?P<pattern>"([^"]|\\")*")$/]]></target>
|
||||
<source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
|
||||
<target><![CDATA[/^(?:url|адрес) должен соответствовать (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
|
||||
</trans-unit>
|
||||
<trans-unit id="the-element-should-contain">
|
||||
<source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
|
||||
|
||||
Reference in New Issue
Block a user