[gnome-control-center] info-overview: Remove redundant/elaborate info

[Bastien Nocera <hadess src gnome org>]

commit 4b17d9be8e843df59bb44544be6164c3b4565e3a
Author: Norbert Pfeiler <norbert pfeiler+git gmail com>
Date:   Sat Jan 29 10:31:17 2022 +0100

    info-overview: Remove redundant/elaborate info
    
    Remove redundant/elaborate in strings like CPU, Core and Processor.

 panels/info-overview/info-cleanup.c |  1 +
 tests/info/info-cleanup-test.txt    | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
index f0e8cc772..21ea83dd3 100644
--- a/panels/info-overview/info-cleanup.c
+++ b/panels/info-overview/info-cleanup.c
@@ -40,6 +40,7 @@ prettify_info (const char *info)
     { "[(]R[)]", "\302\256"},
     { "[(](tm|TM)[)]", "\342\204\242"},
     { "Gallium \\d+\\.\\d+ on (.*)", "\\1"},
+    { " CPU| Processor| \\S+-Core", ""},
     { " x86|/MMX|/SSE2|/PCIe", ""},
     { " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""},
     { "Graphics Controller", "Graphics"},
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
index ce8084305..6de8e0bc5 100644
--- a/tests/info/info-cleanup-test.txt
+++ b/tests/info/info-cleanup-test.txt
@@ -1,4 +1,4 @@
-Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz       Intel® Core™ i5-4590T CPU @ 2.00GHz
+Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz       Intel® Core™ i5-4590T @ 2.00GHz
 Intel(R) Ivybridge Mobile      Intel® Ivybridge Mobile
 Intel(R)  Ivybridge Mobile     Intel® Ivybridge Mobile
 Gallium 0.4 on AMD KAVERI      AMD KAVERI
@@ -6,12 +6,12 @@ AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3)       AMD KAVERI
 AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI
 Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI
 Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3  AMD KAVERI
-AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X 16-Core Processor
+AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X
 AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 
Series
-AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor
+AMD EPYC 7251 8-Core Processor AMD EPYC 7251
 Gallium 0.4 on SVGA3D  SVGA3D
 Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits)   llvmpipe
-AMD FX(tm)-8350 Eight-Core Processor   AMD FX™-8350 Eight-Core Processor
-AMD Athlon(tm) II X3 435 Processor     AMD Athlon™ II X3 435 Processor
+AMD FX(tm)-8350 Eight-Core Processor   AMD FX™-8350
+AMD Athlon(tm) II X3 435 Processor     AMD Athlon™ II X3 435
 NVIDIA GeForce GT 710/PCIe/SSE2        NVIDIA GeForce GT 710
 Mesa DRI Intel(R) 965GM x86/MMX/SSE2   Intel® 965GM