From 211b9666c1cc264abd7c703e41e6d5dab5d3f47d Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Fri, 3 May 2019 08:27:53 +0000
Subject: [PATCH] Bug 21662: (QA follow-up) Minor corrections
Content-Type: text/plain; charset=utf-8

[1] Move doXulting and Universidad ORT Uruguay to Institutions.
    We do not mention the institution for each developer.
[2] Removing Anonymous.
[3] Adding the Bugzilla alias shantanoo as additional transliterated text.
[4] Resolve typo Continious.
[5] Removing three plural unused roles in about.tt.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
 docs/contributors.yaml                           | 10 +---------
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |  7 +++----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/docs/contributors.yaml b/docs/contributors.yaml
index b1ad7183fd..d757729257 100644
--- a/docs/contributors.yaml
+++ b/docs/contributors.yaml
@@ -91,7 +91,6 @@ Andrei V. Toutoukine:
   commits: 4
   first_commit: 1242906545
 Andres Tarallo:
-  notes: Universidad ORT Uruguay
 Andrew Arensburger:
   commits: 163
   first_commit: 1032654635
@@ -115,9 +114,6 @@ Andrew Moore:
   commits: 130
   first_commit: 1205851483
   openhub: https://www.openhub.net/p/koha/contributors/6618544607803
-Anonymous:
-  commits: 30
-  first_commit: 1194351890
 Antoine Farnault:
   commits: 244
   first_commit: 1152020129
@@ -548,7 +544,6 @@ Eric Vantillard:
   commits: 1
   first_commit: 1508525901
 Ernesto Silva:
-  notes: Universidad ORT Uruguay
 Ethan Amohia:
   commits: 3
   first_commit: 1547691807
@@ -1879,12 +1874,9 @@ Zoe Bennett:
 Zoe Schoeler:
   commits: 2
   first_commit: 1484825348
-doXulting:
-  commits: 163
-  first_commit: 1085400878
 'Сергій Дубик {Serhij Dubyk}':
   commits: 6
   first_commit: 1292694738
-शंतनू:
+'शंतनू {shantanoo}':
   commits: 1
   first_commit: 1421282617
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 72324903f8..b908428e7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -503,6 +503,7 @@
                 <li>C &amp; P Bibliography Services, USA</li>
                 <li>Do Space, USA</li>
                 <li>DoverNet, USA</li>
+                <li>doXulting</li>
                 <li>Escuela de Orientacion Lacaniana, Argentina</li>
                 <li>Farmington Public Library, USA</li>
                 <li>FIT</li>
@@ -548,6 +549,7 @@
                 <li>Universidad de El Salvador, El Salvador</li>
                 <li>Universidad Empresarial Siglo 21, Argentina</li>
                 <li>Universidad Nacional de Córdoba, Argentina</li>
+                <li>Universidad ORT Uruguay</li>
                 <li>Université d'Aix-Marseille, France</li>
                 <li>Université de Lyon 3, France</li>
                 <li>Université de Rennes 2, France</li>
@@ -800,21 +802,18 @@
   [%- SWITCH role.key -%]
     [%- CASE 'manager'               -%]Release manager
     [%- CASE 'manager_assistant'     -%]Release manager assistant
-    [%- CASE 'manager_assistants'    -%]Release manager assistant
     [%- CASE 'qa_manager'            -%]Quality assurance manager
     [%- CASE 'qa'                    -%]Quality assurance team
     [%- CASE 'documentation'         -%]Documentation manager
     [%- CASE 'documentation_team'    -%]Documentation team
     [%- CASE 'translation'           -%]Translation manager
-    [%- CASE 'translations'          -%]Translation manager
     [%- CASE 'translation_assistant' -%]Translation manager assistant
     [%- CASE 'te'                    -%]Topic expert
     [%- CASE 'bugwrangler'           -%]Bug wrangler
     [%- CASE 'maintainer'            -%]Release maintainer
     [%- CASE 'maintainer_assistant'  -%]Release maintainer assistant
-    [%- CASE 'maintainer_assistants' -%]Release maintainer assistant
     [%- CASE 'wiki'                  -%]Wiki curator
-    [%- CASE 'ci'                    -%]Continious integration manager
+    [%- CASE 'ci'                    -%]Continuous integration manager
     [%- CASE 'packaging'             -%]Packaging manager
     [%- CASE 'packaging_assistant'   -%]Packaging manager assistant
     [%- CASE 'chairperson'           -%]Meetings chairperson
-- 
2.11.0