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

src/public/stylesheets/style.css

@@ -837,6 +837,11 @@ body {
     scrollbar-color: var(--scrollbar-background-color) var(--main-background-color);
 }
 
+@supports selector(::-webkit-scrollbar) {
+    body {
+        scrollbar-color: unset;
+    }
+
     ::-webkit-scrollbar {
         width: 12px;
     }
@@ -850,6 +855,7 @@ body {
     ::-webkit-scrollbar-corner {
         background-color: inherit;
     }
+}
 
 [data-toggle="tooltip"]:not(.button-widget) span {
     padding-bottom: 0;

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": "简体中文"
         }
     ];
 }