Merge branch '4.3' into 4.4

* 4.3:
  [#12861] Tweak translation articles for 4.3 component changes

Author: wouterj

translation.rst

@@ -503,15 +503,19 @@ to learn more about how to handle it.
 Fallback Translation Locales
 ----------------------------
 
-Imagine that the user's locale is ``fr_FR`` and that you're translating the
-key ``Symfony is great``. To find the French translation, Symfony actually
+Imagine that the user's locale is ``es_AR`` and that you're translating the
+key ``Symfony is great``. To find the Spanish translation, Symfony actually
 checks translation resources for several locales:
 
-#. First, Symfony looks for the translation in a ``fr_FR`` translation resource
-   (e.g. ``messages.fr_FR.xlf``);
+#. First, Symfony looks for the translation in a ``es_AR`` (Argentinean
+   Spanish) translation resource (e.g. ``messages.es_AR.yaml``);
 
-#. If it wasn't found, Symfony looks for the translation in a ``fr`` translation
-   resource (e.g. ``messages.fr.xlf``);
+#. If it wasn't found, Symfony looks for the translation in the
+   parent locale, which is automatically defined only for some locales. In
+   this example, the parent locale is ``es_419`` (Latin American Spanish);
+
+#. If it wasn't found, Symfony looks for the translation in a ``es``
+   (Spanish) translation resource (e.g. ``messages.es.yaml``);
 
 #. If the translation still isn't found, Symfony uses the ``fallbacks`` option,
    which can be configured as follows:
@@ -613,7 +617,6 @@ Learn more
 .. _`i18n`: https://en.wikipedia.org/wiki/Internationalization_and_localization
 .. _`ICU MessageFormat`: http://userguide.icu-project.org/formatparse/messages
 .. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
-.. _`ISO 31-11`: https://en.wikipedia.org/wiki/Interval_(mathematics)#Notations_for_intervals
 .. _`ISO 639-1`: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
 .. _`Translatable Extension`: http://atlantic18.github.io/DoctrineExtensions/doc/translatable.html
 .. _`Translatable Behavior`: https://github.com/KnpLabs/DoctrineBehaviors

translation/xliff.rst

@@ -27,7 +27,7 @@ loaded/dumped inside a Symfony application:
     <xliff xmlns="urn:oasis:names:tc:xliff:document:2.1" version="2.1"
         srcLang="fr-FR" trgLang="en-US">
         <file id="messages.en_US">
-            <unit id="LCa0a2j">
+            <unit id="LCa0a2j" name="original-content">
                 <notes>
                     <note category="state">new</note>
                     <note category="approved">true</note>