Commitffb9951

committed

Merge branch '4.2' into 4.3

* 4.2: Fix markup Use .xlf extension Removed blank line after filepath

2 parents8a4e08d +e665b26 commitffb9951Copy full SHA for ffb9951

File tree

-4

lines changed

-4

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -354,7 +354,6 @@ following standardized instructions in your ``README.md`` file.
`354`	`354`	in the ``config/bundles.php`` file of your project::
`355`	`355`
`356`	`356`	`// config/bundles.php`
`357`		`-`
`358`	`357`	`return [`
`359`	`358`	`// ...`
`360`	`359`	`<vendor>\<bundle-name>\<bundle-long-name>::class => ['all' => true],`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ work:`
`129`	`129`	</contributing/code/maintenance>` (you may have to choose a higher branch if
`130`	`130`	`the feature you are fixing was introduced in a later version);`
`131`	`131`
`132`		-* ``master``, if you are adding a new feature.
	`132`	+* ``master``, if you are adding a new feature.
`133`	`133`
`134`	`134`	`..note::`
`135`	`135`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -38,7 +38,7 @@ you've already setup some translations for the ``fr`` locale:
`38`	`38`
`39`	`39`	`..code-block::xml`
`40`	`40`
`41`		`-<!-- translations/messages.fr.xliff-->`
	`41`	`+<!-- translations/messages.fr.xlf-->`
`42`	`42`	`<?xml version="1.0"?>`
`43`	`43`	`<xliffversion="1.2"xmlns="urn:oasis:names:tc:xliff:document:1.2">`
`44`	`44`	`<filesource-language="en"datatype="plaintext"original="file.ext">`
@@ -69,7 +69,7 @@ and for the ``en`` locale:
`69`	`69`
`70`	`70`	`..code-block::xml`
`71`	`71`
`72`		`-<!-- translations/messages.en.xliff-->`
	`72`	`+<!-- translations/messages.en.xlf-->`
`73`	`73`	`<?xml version="1.0"?>`
`74`	`74`	`<xliffversion="1.2"xmlns="urn:oasis:names:tc:xliff:document:1.2">`
`75`	`75`	`<filesource-language="en"datatype="plaintext"original="file.ext">`

Comments

(0)