Merge branch '6.4' into 7.0

* 6.4:
  [Translation] Mention `enabled_locales`

Author: javiereguiluz

translation.rst

@@ -104,6 +104,11 @@ are located:
             ;
         };
 
+.. tip::
+
+    You can also define the :ref:`enabled_locales option <reference-translator-enabled-locales>`
+    to restrict the locales that your application is available in.
+
 .. _translation-basic:
 
 Basic Translation
@@ -256,9 +261,10 @@ using the ``trans()`` method:
 
 #. A catalog of translated messages is loaded from translation resources
    defined for the ``locale`` (e.g. ``fr_FR``). Messages from the
-   :ref:`fallback locale <translation-fallback>` are also loaded and added to
-   the catalog if they don't already exist. The end result is a large
-   "dictionary" of translations.
+   :ref:`fallback locale <translation-fallback>` and the
+   :ref:`enabled locales <reference-translator-enabled-locales>` are also
+   loaded and added to the catalog if they don't already exist. The end result
+   is a large "dictionary" of translations.
 
 #. If the message is located in the catalog, the translation is returned. If
    not, the translator returns the original message.

validation/translations.rst

@@ -123,6 +123,14 @@ Now, create a ``validators`` catalog file in the ``translations/`` directory:
 You may need to clear your cache (even in the dev environment) after creating
 this file for the first time.
 
+.. tip::
+
+    Symfony will also create translation files for the built-in validation messages.
+    You can optionally set the :ref:`enabled_locales <reference-translator-enabled-locales>`
+    option to restrict the available locales in your application. This will improve
+    performance a bit because Symfony will only generate the translation files
+    for those locales instead of all of them.
+
 You can also use :class:`Symfony\\Component\\Translation\\TranslatableMessage` to build your violation message::
 
     use Symfony\Component\Translation\TranslatableMessage;