Skip to content

Commit e665b26

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: Fix markup Use .xlf extension
2 parents 0611895 + 9993814 commit e665b26

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

contributing/code/pull_requests.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ work:
129129
</contributing/code/maintenance>` (you may have to choose a higher branch if
130130
the feature you are fixing was introduced in a later version);
131131

132-
* ``master``, if you are adding a new feature.
132+
* ``master``, if you are adding a new feature.
133133

134134
.. note::
135135

translation/debug.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ you've already setup some translations for the ``fr`` locale:
3838

3939
.. code-block:: xml
4040
41-
<!-- translations/messages.fr.xliff -->
41+
<!-- translations/messages.fr.xlf -->
4242
<?xml version="1.0"?>
4343
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
4444
<file source-language="en" datatype="plaintext" original="file.ext">
@@ -69,7 +69,7 @@ and for the ``en`` locale:
6969

7070
.. code-block:: xml
7171
72-
<!-- translations/messages.en.xliff -->
72+
<!-- translations/messages.en.xlf -->
7373
<?xml version="1.0"?>
7474
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
7575
<file source-language="en" datatype="plaintext" original="file.ext">

0 commit comments

Comments
 (0)