Merge branch '1.3' into 2.0

Conflicts:
	src/Behat/MinkExtension/Context/MinkDictionary.php
This commit is contained in:
Christophe Coevoet
2014-04-27 14:04:32 +02:00
16 changed files with 33 additions and 33 deletions

View File

@@ -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>