From 566914fad4e1fdce4923bb0b2dc5bcf278232c0b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 9 May 2020 14:15:07 +0200
Subject: [PATCH] AboutSystem: some updates to the contributors list

- Move Kyle Ambroff-Kao to the maintainers
- Add Diver, Vidrep and Luroh as bug triaging and testing team (your
  work deserves more credit, thanks a lot!)
- Move Koki back into "past website/marketing team"

Change-Id: I3f198277804aaa2dedf0551ced65e5f94393f3ea
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2624
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
---
 src/apps/aboutsystem/AboutSystem.cpp |  9 ++++++++-
 src/apps/aboutsystem/Credits.h       | 12 ++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp
index 41a9a2929a..dd5d71618e 100644
--- a/src/apps/aboutsystem/AboutSystem.cpp
+++ b/src/apps/aboutsystem/AboutSystem.cpp
@@ -594,6 +594,7 @@ AboutView::AboutView()
 				.Add(_CreateLabel("uptimelabel",
 					B_TRANSLATE("Time running:")))
 				.Add(fUptimeView)
+				.AddGlue()
 				.SetInsets(5, 5, 5, 5)
 			.End()
 			// TODO: investigate: adding this causes the time to be cut
@@ -602,7 +603,7 @@ AboutView::AboutView()
 		.Add(_CreateCreditsView());
 
 	float min = fMemView->MinSize().width * 1.1f;
-	fCreditsView->SetExplicitMinSize(BSize(min, min));
+	fCreditsView->SetExplicitMinSize(BSize(min * 3, min));
 }
 
 
@@ -956,6 +957,12 @@ AboutView::_CreateCreditsView()
 	fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
 	fCreditsView->Insert(kPastWebsiteTeam);
 
+	fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
+	fCreditsView->Insert(B_TRANSLATE("Testing and bug triaging:\n"));
+
+	fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
+	fCreditsView->Insert(kTestingTeam);
+
 	fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
 	fCreditsView->Insert(B_TRANSLATE("Contributors:\n"));
 
diff --git a/src/apps/aboutsystem/Credits.h b/src/apps/aboutsystem/Credits.h
index b998794aa7..722ec979b9 100644
--- a/src/apps/aboutsystem/Credits.h
+++ b/src/apps/aboutsystem/Credits.h
@@ -380,6 +380,7 @@ static const Translation kTranslations[] = {
 #define kNumberOfTranslations (sizeof(kTranslations) / sizeof(Translation))
 
 #define kCurrentMaintainers \
+	"Kyle Ambroff-Kao\n" \
 	"Stephan Aßmus\n" \
 	"Augustin Cavalier\n" \
 	"Stefano Ceccherini\n" \
@@ -459,8 +460,13 @@ static const Translation kTranslations[] = {
 	"Siarzhuk Zharski\n" \
 	"\n"
 
+#define kTestingTeam \
+	"luroh\n" \
+	"Robert Mercer (Vidrep)\n" \
+	"Sergei Reznikov\n" \
+	"\n"
+
 #define kContributors \
-	"Kyle Ambroff-Kao\n" \
 	"Andrea Anzani\n" \
 	"Sean Bartell\n" \
 	"Sambuddha Basu\n" \
@@ -521,13 +527,11 @@ static const Translation kTranslations[] = {
 	"Brian Luft\n" \
 	"Christof Lutteroth\n" \
 	"Graham MacDonald\n" \
-	"Jorge G. Mare (Koki)\n" \
 	"Jan Matějek\n" \
 	"Brian Matzon\n" \
 	"Christopher ML Zumwalt May\n" \
 	"Andrew McCall\n" \
 	"Nathan Mentley\n" \
-	"Robert Mercer (Vidrep)\n" \
 	"Marius Middelthon\n" \
 	"Marco Minutoli\n" \
 	"Misza\n" \
@@ -548,7 +552,6 @@ static const Translation kTranslations[] = {
 	"Jeremy Rand\n" \
 	"Hartmut Reh\n" \
 	"Daniel Reinhold\n" \
-	"Sergei Reznikov\n" \
 	"Chris Roberts\n" \
 	"Samuel Rodríguez Pérez\n" \
 	"Thomas Roell\n" \
@@ -583,6 +586,7 @@ static const Translation kTranslations[] = {
 #define kPastWebsiteTeam  \
 	"Phil Greenway\n" \
 	"Gavin James\n" \
+	"Jorge G. Mare (Koki)\n" \
 	"Urias McCullough\n" \
 	"Richie Nyhus\n" \
 	"Jonathan Yoder\n" \