Add latest changes from gitlab-org/gitlab@13-1-stable-ee

4 files changed, 61 insertions, 16 deletions

diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md
index a81e656fc27..bdd372e90ed 100644
--- a/doc/development/i18n/externalization.md
+++ b/doc/development/i18n/externalization.md
@@ -260,8 +260,22 @@ n_("%{project_name}", "%d projects selected", count) % { project_name: 'GitLab'
 
 ### Namespaces
 
-Sometimes you need to add some context to the text that you want to translate
-(if the word occurs in a sentence and/or the word is ambiguous).
+A namespace is a way to group translations that belong together. They provide context to our translators by adding a prefix followed by the bar symbol (`|`). For example:
+
+```ruby
+'Namespace|Translated string'
+```
+
+A namespace provide the following benefits:
+
+- It addresses ambiguity in words, for example: `Promotions|Promote` vs `Epic|Promote`
+- It allows translators to focus on translating externalized strings that belong to the same product area rather than arbitrary ones.
+- It gives a linguistic context to help the translator.
+
+In some cases, namespaces don't make sense, for example,
+for ubiquitous UI words and phrases such as "Cancel" or phrases like "Save changes" a namespace could
+be counterproductive.
+
 Namespaces should be PascalCase.
 
 - In Ruby/HAML:
@@ -292,7 +306,7 @@ const dateFormat = createDateTimeFormat({ year: 'numeric', month: 'long', day: '
 console.log(dateFormat.format(new Date('2063-04-05'))) // April 5, 2063
 ```
 
-This makes use of [`Intl.DateTimeFormat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat).
+This makes use of [`Intl.DateTimeFormat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat).
 
 - In Ruby/HAML, we have two ways of adding format to dates and times:
 
diff --git a/doc/development/i18n/merging_translations.md b/doc/development/i18n/merging_translations.md
index 5d9dbd23efa..e0fcaddda4c 100644
--- a/doc/development/i18n/merging_translations.md
+++ b/doc/development/i18n/merging_translations.md
@@ -20,7 +20,7 @@ doesn't do. Create a new pipeline at `https://gitlab.com/gitlab-org/gitlab/pipel
 If there are validation errors, the easiest solution is to disapprove
 the offending string in CrowdIn, leaving a comment with what is
 required to fix the offense. There is an
-[issue](https://gitlab.com/gitlab-org/gitlab/issues/23256)
+[issue](https://gitlab.com/gitlab-org/gitlab/-/issues/23256)
 suggesting to automate this process. Disapproving will exclude the
 invalid translation, the merge request will be updated within a few
 minutes.
@@ -31,7 +31,7 @@ clicking `Pause sync` on the [CrowdIn integration settings
 page](https://translate.gitlab.com/project/gitlab-ee/settings#integration).
 
 When all failures are resolved, the translations need to be double
-checked once more as discussed in [confidential issue](../../user/project/issues/confidential_issues.md) `https://gitlab.com/gitlab-org/gitlab/issues/19485`.
+checked once more as discussed in [confidential issue](../../user/project/issues/confidential_issues.md) `https://gitlab.com/gitlab-org/gitlab/-/issues/19485`.
 
 ## Merging translations
 
@@ -40,7 +40,7 @@ translations can be merged into the master branch. When merging the translations
 make sure to check the **Remove source branch** checkbox, so CrowdIn recreates the
 `master-i18n` from master after the new translation was merged.
 
-We are discussing [automating this entire process](https://gitlab.com/gitlab-org/gitlab/issues/19896).
+We are discussing [automating this entire process](https://gitlab.com/gitlab-org/gitlab/-/issues/19896).
 
 ## Recreate the merge request
 
@@ -53,3 +53,18 @@ and delete the
 
 This might be needed when the merge request contains failures that
 have been fixed on master.
+
+## Recreate the GitLab integration in CrowdIn
+
+NOTE: ***Note:**
+These instructions work only for GitLab Team Members.
+
+If for some reason the GitLab integration in CrowdIn does not exist, it can be
+recreated by the following steps:
+
+1. Sign in to GitLab as `gitlab-crowdin-bot` (If you're a GitLab Team Member, find credentials in the GitLab shared  [1Password account](https://about.gitlab.com/handbook/security/#1password-for-teams)
+1. Sign in to Crowdin with the GitLab integration
+1. Navigate to Settings > Integrations > GitLab > Set Up Integration
+1. Select `gitlab-org/gitlab` repository
+1. On `Select Branches for Translation`, select `master`
+1. Ensure the `Service Branch Name` is `master-i18n`
diff --git a/doc/development/i18n/proofreader.md b/doc/development/i18n/proofreader.md
index 837da349f7e..8c1f62330f4 100644
--- a/doc/development/i18n/proofreader.md
+++ b/doc/development/i18n/proofreader.md
@@ -5,12 +5,15 @@ are very appreciative of the work done by translators and proofreaders!
 
 ## Proofreaders
 
+<!-- vale gitlab.Spelling = NO -->
 - Albanian
   - Proofreaders needed.
 - Amharic
   - Tsegaselassie Tadesse - [GitLab](https://gitlab.com/tsega), [CrowdIn](https://crowdin.com/profile/tsegaselassi/activity)
 - Arabic
   - Proofreaders needed.
+- Bosnian
+  - Proofreaders needed.
 - Bulgarian
   - Lyubomir Vasilev - [CrowdIn](https://crowdin.com/profile/lyubomirv)
 - Catalan
@@ -26,6 +29,8 @@ are very appreciative of the work done by translators and proofreaders!
 - Chinese Traditional, Hong Kong 繁體中文 (香港)
   - Victor Wu - [GitLab](https://gitlab.com/victorwuky), [CrowdIn](https://crowdin.com/profile/victorwu)
   - Ivan Ip - [GitLab](https://gitlab.com/lifehome), [CrowdIn](https://crowdin.com/profile/lifehome)
+- Croatian
+  - Proofreaders needed.
 - Czech
   - Jan Urbanec - [GitLab](https://gitlab.com/TatranskyMedved), [CrowdIn](https://crowdin.com/profile/Tatranskymedved)
 - Danish
@@ -33,11 +38,11 @@ are very appreciative of the work done by translators and proofreaders!
 - Dutch
   - Emily Hendle - [GitLab](https://gitlab.com/pundachan), [CrowdIn](https://crowdin.com/profile/pandachan)
 - Esperanto
-- Lyubomir Vasilev - [CrowdIn](https://crowdin.com/profile/lyubomirv)
+  - Lyubomir Vasilev - [CrowdIn](https://crowdin.com/profile/lyubomirv)
 - Estonian
   - Proofreaders needed.
 - Filipino
-  - Proofreaders needed.
+  - Andrei Jiroh Halili - [GitLab](https://gitlab.com/AJHalili2006DevPH), [Crowdin](https://crowdin.com/profile/AndreiJirohHaliliDev2006)
 - French
   - Davy Defaud - [GitLab](https://gitlab.com/DevDef), [CrowdIn](https://crowdin.com/profile/DevDef)
 - Galician
@@ -50,6 +55,8 @@ are very appreciative of the work done by translators and proofreaders!
   - Proofreaders needed.
 - Hebrew
   - Yaron Shahrabani - [GitLab](https://gitlab.com/yarons), [CrowdIn](https://crowdin.com/profile/YaronSh)
+- Hindi
+  - Proofreaders needed.
 - Hungarian
   - Proofreaders needed.
 - Indonesian
@@ -62,6 +69,7 @@ are very appreciative of the work done by translators and proofreaders!
   - Hiroyuki Sato - [GitLab](https://gitlab.com/hiroponz), [CrowdIn](https://crowdin.com/profile/hiroponz)
   - Tomo Dote - [GitLab](https://gitlab.com/fu7mu4), [CrowdIn](https://crowdin.com/profile/fu7mu4)
   - Hiromi Nozawa - [GitLab](https://gitlab.com/hir0mi), [CrowdIn](https://crowdin.com/profile/hir0mi)
+  - Takuya Noguchi - [GitLab](https://gitlab.com/tnir), [CrowdIn](https://crowdin.com/profile/tnir)
 - Korean
   - Chang-Ho Cha - [GitLab](https://gitlab.com/changho-cha), [CrowdIn](https://crowdin.com/profile/zzazang)
   - Ji Hun Oh - [GitLab](https://gitlab.com/Baw-Appie), [CrowdIn](https://crowdin.com/profile/BawAppie)
@@ -74,7 +82,6 @@ are very appreciative of the work done by translators and proofreaders!
   - Filip Mech - [GitLab](https://gitlab.com/mehenz), [CrowdIn](https://crowdin.com/profile/mehenz)
   - Maksymilian Roman - [GitLab](https://gitlab.com/villaincandle), [CrowdIn](https://crowdin.com/profile/villaincandle)
 - Portuguese
-  - Proofreaders needed.
   - Diogo Trindade - [GitLab](https://gitlab.com/luisdiogo2071317), [CrowdIn](https://crowdin.com/profile/ldiogotrindade)
 - Portuguese, Brazilian
   - Paulo George Gomes Bezerra - [GitLab](https://gitlab.com/paulobezerra), [CrowdIn](https://crowdin.com/profile/paulogomes.rep)
@@ -88,21 +95,22 @@ are very appreciative of the work done by translators and proofreaders!
   - NickVolynkin - [Crowdin](https://crowdin.com/profile/NickVolynkin)
   - Andrey Komarov - [GitLab](https://gitlab.com/elkamarado), [Crowdin](https://crowdin.com/profile/kamarado)
   - Iaroslav Postovalov - [GitLab](https://gitlab.com/CMDR_Tvis), [Crowdin](https://crowdin.com/profile/CMDR_Tvis)
-- Serbian (Cyrillic)
-  - Proofreaders needed.
-- Serbian (Latin)
+- Serbian (Latin and Cyrillic)
   - Proofreaders needed.
 - Slovak
   - Proofreaders needed.
 - Spanish
   - Pedro Garcia - [GitLab](https://gitlab.com/pedgarrod), [CrowdIn](https://crowdin.com/profile/breaking_pitt)
+- Swedish
+  - Proofreaders needed.
 - Turkish
   - Ali Demirtaş - [GitLab](https://gitlab.com/alidemirtas), [CrowdIn](https://crowdin.com/profile/alidemirtas)
 - Ukrainian
   - Volodymyr Sobotovych - [GitLab](https://gitlab.com/wheleph), [CrowdIn](https://crowdin.com/profile/wheleph)
   - Andrew Vityuk - [GitLab](https://gitlab.com/3_1_3_u), [CrowdIn](https://crowdin.com/profile/andruwa13)
 - Welsh
-  - Proofreaders needed.
+  - Delyth Prys - [GitLab](https://gitlab.com/Delyth), [CrowdIn](https://crowdin.com/profile/DelythPrys)
+<!-- vale gitlab.Spelling = YES -->
 
 ## Become a proofreader
 
diff --git a/doc/development/i18n/translation.md b/doc/development/i18n/translation.md
index e1c02c2c9c2..ed205c20c0d 100644
--- a/doc/development/i18n/translation.md
+++ b/doc/development/i18n/translation.md
@@ -61,8 +61,12 @@ This helps maintain a logical connection and consistency between tools (e.g.
 
 ### Formality
 
-The level of formality used in software varies by language.
-For example, in French we translate `you` as the formal `vous`.
+The level of formality used in software varies by language:
+
+| Language | Formality | Example |
+| -------- | --------- | ------- |
+| 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.
@@ -75,18 +79,22 @@ ethnicity.
 In languages which 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".
+<!-- vale gitlab.Spelling = YES -->
 
 ### Updating the glossary
 
 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).
+[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
 
+<!-- vale gitlab.Spelling = NO -->
 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.
+<!-- vale gitlab.Spelling = YES -->