Merge remote-tracking branch 'upstream-next/develop' into feature/i18n-part2

src/public/stylesheets/style.css

@@ -837,18 +837,24 @@ body {
     scrollbar-color: var(--scrollbar-background-color) var(--main-background-color);
 }
 
-::-webkit-scrollbar {
-    width: 12px;
-}
+@supports selector(::-webkit-scrollbar) {
+    body {
+        scrollbar-color: unset;
+    }
 
-::-webkit-scrollbar-thumb {
-    border-radius: 5px;
-    border: 1px solid var(--scrollbar-border-color);
-    background-color: var(--scrollbar-background-color);
-}
-
-::-webkit-scrollbar-corner {
-    background-color: inherit;
+    ::-webkit-scrollbar {
+        width: 12px;
+    }
+    
+    ::-webkit-scrollbar-thumb {
+        border-radius: 5px;
+        border: 1px solid var(--scrollbar-border-color);
+        background-color: var(--scrollbar-background-color);
+    }
+    
+    ::-webkit-scrollbar-corner {
+        background-color: inherit;
+    }
 }
 
 [data-toggle="tooltip"]:not(.button-widget) span {

src/routes/api/options.ts

@@ -137,9 +137,13 @@ function getSupportedLocales() {
             "id": "en",
             "name": "English"
         },
+        {
+            "id": "es",
+            "name": "Español"
+        },
         {
             "id": "cn",
-            "name": "Chinese"
+            "name": "简体中文"
         }
     ];
 }