Merge branch 'patch-33' into 'master'

deprecate the French “écriture inclusive”

See merge request gitlab-org/gitlab-ce!28861

doc/development/i18n/translation.md

@@ -89,9 +89,7 @@ To propose additions to the glossary please
 
 ### Inclusive language in French
 
-In French, we should follow the guidelines from [ecriture-inclusive.fr]. For
-instance:
+In French, the "écriture inclusive" is now over (see on [Legifrance](https://www.legifrance.gouv.fr/affichTexte.do?cidTexte=JORFTEXT000036068906&categorieLien=id)).
+So, to include both genders, write “Utilisateurs et utilisatrices” instead of “Utilisateur·rice·s”.
+When space is missing, the male gender should be used alone.
 
-- Utilisateur•rice•s
-
-[ecriture-inclusive.fr]: http://www.ecriture-inclusive.fr/