diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-05 18:42:37 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-05 18:42:37 +0000 |
| commit | 1804c82dc4b099912c384ce10d957b2dddb322b6 (patch) | |
| tree | e28791b65e97ec0dd910df9096ac153479672b7d | |
| parent | 74ad3add565b8893da5d22092606c7f11614ba49 (diff) | |
| parent | 65f362b6a467fddd4f6aa0dd32dd0dd917c9ae55 (diff) | |
| download | gitlab-ce-1804c82dc4b099912c384ce10d957b2dddb322b6.tar.gz | |
Merge branch 'patch-33' into 'master'
deprecate the French “écriture inclusive”
See merge request gitlab-org/gitlab-ce!28861
| -rw-r--r-- | doc/development/i18n/translation.md | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/doc/development/i18n/translation.md b/doc/development/i18n/translation.md index 99c0fe6db1d..62be3786549 100644 --- a/doc/development/i18n/translation.md +++ b/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/ |