From 7980c8cea257399b7e0d2f5f79852ed56e4aa4ae Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Thu, 10 Dec 2020 11:23:47 +0100
Subject: [PATCH] gui: Harmonize architecture names

---
 .../syncthing/core/syncthingController.js      | 18 ++++++++++++------
 .../syncthing/core/syncthingController.js      | 18 ++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js
index 76ea14694..1b6440235 100755
--- a/gui/default/syncthing/core/syncthingController.js
+++ b/gui/default/syncthing/core/syncthingController.js
@@ -2447,12 +2447,18 @@ angular.module('syncthing.core')
             }[$scope.version.os] || $scope.version.os;
 
             var arch = {
-                '386': '32 bit',
-                'amd64': '64 bit',
-                'arm': 'ARM',
-                'arm64': 'AArch64',
-                'ppc64': 'PowerPC',
-                'ppc64le': 'PowerPC (LE)'
+                '386': '32-bit Intel/AMD',
+                'amd64': '64-bit Intel/AMD',
+                'arm': '32-bit ARM',
+                'arm64': '64-bit ARM',
+                'ppc64': '64-bit PowerPC',
+                'ppc64le': '64-bit PowerPC (LE)',
+                'mips': '32-bit MIPS',
+                'mipsle': '32-bit MIPS (LE)',
+                'mips64': '64-bit MIPS',
+                'mips64le': '64-bit MIPS (LE)',
+                'riscv64': '64-bit RISC-V',
+                's390x': '64-bit z/Architecture',
             }[$scope.version.arch] || $scope.version.arch;
 
             return $scope.version.version + ', ' + os + ' (' + arch + ')';
diff --git a/gui/default/untrusted/syncthing/core/syncthingController.js b/gui/default/untrusted/syncthing/core/syncthingController.js
index c70e56acc..5c0dbc031 100755
--- a/gui/default/untrusted/syncthing/core/syncthingController.js
+++ b/gui/default/untrusted/syncthing/core/syncthingController.js
@@ -2490,12 +2490,18 @@ angular.module('syncthing.core')
             }[$scope.version.os] || $scope.version.os;
 
             var arch = {
-                '386': '32 bit',
-                'amd64': '64 bit',
-                'arm': 'ARM',
-                'arm64': 'AArch64',
-                'ppc64': 'PowerPC',
-                'ppc64le': 'PowerPC (LE)'
+                '386': '32-bit Intel/AMD',
+                'amd64': '64-bit Intel/AMD',
+                'arm': '32-bit ARM',
+                'arm64': '64-bit ARM',
+                'ppc64': '64-bit PowerPC',
+                'ppc64le': '64-bit PowerPC (LE)',
+                'mips': '32-bit MIPS',
+                'mipsle': '32-bit MIPS (LE)',
+                'mips64': '64-bit MIPS',
+                'mips64le': '64-bit MIPS (LE)',
+                'riscv64': '64-bit RISC-V',
+                's390x': '64-bit z/Architecture',
             }[$scope.version.arch] || $scope.version.arch;
 
             return $scope.version.version + ', ' + os + ' (' + arch + ')';