Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 45 insertions, 59 deletions

diff --git a/doc/development/i18n/translation.md b/doc/development/i18n/translation.md
index f3d02e180e7..f2592d9a8b9 100644
--- a/doc/development/i18n/translation.md
+++ b/doc/development/i18n/translation.md
@@ -6,47 +6,39 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Translating GitLab
 
-For managing the translation process we use [CrowdIn](https://crowdin.com).
+For managing the translation process, we use [CrowdIn](https://crowdin.com).
+To contribute translations at [`translate.gitlab.com`](https://translate.gitlab.com),
+you must create a CrowdIn account. You may create a new account or use any of their supported
+sign-in services.
 
-## Using CrowdIn
+## Language selections
 
-The first step is to get familiar with CrowdIn.
+GitLab is being translated into many languages. To select a language to contribute to:
 
-### Sign In
+1. Find the language that you want to contribute to, in the
+   [GitLab CrowdIn project](https://crowdin.com/project/gitlab-ee).
 
-To contribute translations at <https://translate.gitlab.com>
-you must create a CrowdIn account.
-You may create a new account or use any of their supported sign in services.
+   - If the language you want is available, proceed to the next step.
+   - If the language you want is not available,
+      [open an issue](https://gitlab.com/gitlab-org/gitlab/-/issues?scope=all&utf8=✓&state=all&label_name[]=Category%3AInternationalization).
+      Notify our CrowdIn administrators by including `@gitlab-org/manage/import` in your issue.
+   - After the issue and any merge requests are complete, restart this procedure.
 
-### Language Selections
+1. View the list of files and folders. Select `gitlab.pot` to open the translation editor.
 
-GitLab is being translated into many languages.
-
-1. Find the language that you want to contribute to, in our
-   [GitLab Crowdin project](https://crowdin.com/project/gitlab-ee).
-   - If the language that you're looking for is available, proceed
-     to the next step.
-   - If the language you are looking for is not available,
-      [open an issue](https://gitlab.com/gitlab-org/gitlab/-/issues?scope=all&utf8=✓&state=all&label_name[]=Category%3AInternationalization). Notify our Crowdin
-      administrators by including `@gitlab-org/manage/import` in your issue.
-   - After the issue/Merge Request is complete, restart this procedure.
-1. Next, you can view list of files and folders.
-   Select `gitlab.pot` to open the translation editor.
-
-### Translation Editor
+### Translation editor
 
 The online translation editor is the easiest way to contribute translations.
 
 ![CrowdIn Editor](img/crowdin-editor.png)
 
-1. Strings for translation are listed in the left panel
-1. Translations are entered into the central panel.
-  Multiple translations are required for strings that contains plurals.
-  The string to be translated is shown above with glossary terms highlighted.
-  If the string to be translated is not clear, you can 'Request Context'
+- Strings for translation are listed in the left panel.
+- Translations are entered into the central panel. Multiple translations are required for strings
+  that contain plurals. The string to translate is shown in the above image with glossary terms
+  highlighted. If the string to translate isn't clear, you can request context.
 
-A glossary of common terms is available in the right panel by clicking Terms.
-Comments can be added to discuss a translation with the community.
+A glossary of common terms is available in the **Terms** tab in the right panel. In the **Comments**
+tab, you can add comments to discuss a translation with the community.
 
 Remember to **Save** each translation.
 
@@ -56,21 +48,18 @@ Be sure to check the following guidelines before you translate any strings.
 
 ### Namespaced strings
 
-When an externalized string is prepended with a namespace, e.g.
-`s_('OpenedNDaysAgo|Opened')`, the namespace should be removed from the final
-translation.
-For example in French `OpenedNDaysAgo|Opened` would be translated to
-`Ouvert•e`, not `OpenedNDaysAgo|Ouvert•e`.
+When an externalized string is prepended with a namespace (for example,
+`s_('OpenedNDaysAgo|Opened')`), the namespace should be removed from the final translation. For
+example, in French, `OpenedNDaysAgo|Opened` is translated to `Ouvert•e`, not
+`OpenedNDaysAgo|Ouvert•e`.
 
 ### Technical terms
 
-Some technical terms should be treated like proper nouns and not be translated.
-
-Technical terms that should always be in English are noted in the glossary when
-using <https://translate.gitlab.com>.
-
-This helps maintain a logical connection and consistency between tools (e.g.
-`git` client) and GitLab.
+You should treat some technical terms like proper nouns and not translate them. Technical terms that
+should always be in English are noted in the glossary when using
+[`translate.gitlab.com`](https://translate.gitlab.com).
+This helps maintain a logical connection and consistency between tools (for example, a Git client)
+and GitLab.
 
 ### Formality
 
@@ -78,36 +67,33 @@ The level of formality used in software varies by language:
 
 | Language | Formality | Example |
 | -------- | --------- | ------- |
-| French | formal | `vous` for `you` |
-| German | informal | `du` for `you` |
+| French   | formal    | `vous` for `you` |
+| German   | informal  | `du` for `you` |
 
-You can refer to other translated strings and notes in the glossary to assist
-determining a suitable level of formality.
+Refer to other translated strings and notes in the glossary to assist you in determining a suitable
+level of formality.
 
 ### Inclusive language
 
-[Diversity](https://about.gitlab.com/handbook/values/#diversity) is a GitLab value.
-We ask you to avoid translations which exclude people based on their gender or
-ethnicity.
-In languages which distinguish between a male and female form, use both or
-choose a neutral formulation.
+[Diversity, inclusion, and belonging](https://about.gitlab.com/handbook/values/#diversity-inclusion)
+are GitLab values. We ask you to avoid translations that exclude people based on their gender or
+ethnicity. In languages that distinguish between a male and female form, use both or choose a
+neutral formulation.
 
 <!-- vale gitlab.Spelling = NO -->
-For example in German, the word "user" can be translated into "Benutzer" (male) or "Benutzerin" (female).
-Therefore "create a new user" would translate into "Benutzer(in) anlegen".
+For example, in German, the word _user_ can be translated into _Benutzer_ (male) or _Benutzerin_
+(female). Therefore, _create a new user_ translates to _Benutzer(in) anlegen_.
 <!-- vale gitlab.Spelling = YES -->
 
 ### Updating the glossary
 
-To propose additions to the glossary please
+To propose additions to the glossary, please
 [open an issue](https://gitlab.com/gitlab-org/gitlab/-/issues?scope=all&utf8=✓&state=all&label_name[]=Category%3AInternationalization).
 
-## French Translation Guidelines
-
-### Inclusive language in French
+## French translation guidelines
 
 <!-- vale gitlab.Spelling = NO -->
-In French, the "écriture inclusive" is now over (see on [Legifrance](https://www.legifrance.gouv.fr/jorf/id/JORFTEXT000036068906/)).
-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.
+In French, the _écriture inclusive_ is now over (see on [Legifrance](https://www.legifrance.gouv.fr/jorf/id/JORFTEXT000036068906/)).
+To include both genders, write _Utilisateurs et utilisatrices_ instead of _Utilisateur·rice·s_. If
+there is not enough space, use the male gender alone.
 <!-- vale gitlab.Spelling = YES -->