[gnome-control-center] info-overview: Add some commonly used trademarks
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] info-overview: Add some commonly used trademarks
- Date: Wed, 23 Mar 2022 09:56:49 +0000 (UTC)
commit a57d31f0cf86ee763fd16a4dd6bb49c1ddef6704
Author: Norbert Pfeiler <norbert pfeiler+git gmail com>
Date: Sat Jan 29 11:10:04 2022 +0100
info-overview: Add some commonly used trademarks
Those are not always present in the device string.
Guidance was taken from the usage on vendor websites.
NVIDIA actually has the rights to GTX™ but doesn’t seem to use it,
in contrast to RTX™.
panels/info-overview/info-cleanup.c | 1 +
tests/info/info-cleanup-test.txt | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
index 7d640bb64..ceeb61025 100644
--- a/panels/info-overview/info-cleanup.c
+++ b/panels/info-overview/info-cleanup.c
@@ -39,6 +39,7 @@ prettify_info (const char *info)
{ "Mesa DRI ", ""},
{ "[(]R[)]", "\302\256"},
{ "[(](tm|TM)[)]", "\342\204\242"},
+ { "(ATI|EPYC|AMD FX|Radeon|Ryzen|Threadripper|GeForce RTX) ", "\\1\342\204\242 "},
{ "Gallium \\d+\\.\\d+ on (.*)", "\\1"},
{ " CPU| Processor| \\S+-Core| @ \\d+\\.\\d+GHz", ""},
{ " x86|/MMX|/SSE2|/PCIe", ""},
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
index 72b92071a..80be85135 100644
--- a/tests/info/info-cleanup-test.txt
+++ b/tests/info/info-cleanup-test.txt
@@ -6,12 +6,13 @@ 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
-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
+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
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
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
+NVIDIA GeForce RTX 3090/PCIe/SSE2 NVIDIA GeForce RTX™ 3090
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]