From 96fc30a1b7f6016b639aad9d0d5ff24987a5b916 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 11 Dec 2025 14:37:51 +0200
Subject: [PATCH] proxy setting fixes

---
 .../settings_modal/helpers/map_setting.vue    |  2 +-
 .../settings_modal/helpers/proxy_setting.vue  | 38 ++++++++++---------
 .../settings_modal/settings_modal.scss        |  4 +-
 src/i18n/en.json                              | 11 ++----
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/components/settings_modal/helpers/map_setting.vue b/src/components/settings_modal/helpers/map_setting.vue
index e3ccbffe6..95adcb314 100644
--- a/src/components/settings_modal/helpers/map_setting.vue
+++ b/src/components/settings_modal/helpers/map_setting.vue
@@ -84,7 +84,7 @@
 
 <script src="./map_setting.js"></script>
 <style lang="scss">
-.ListSetting {
+.MapSetting {
   .btn-group {
     display: flex
   }
diff --git a/src/components/settings_modal/helpers/proxy_setting.vue b/src/components/settings_modal/helpers/proxy_setting.vue
index 020097ef0..869cbcdcc 100644
--- a/src/components/settings_modal/helpers/proxy_setting.vue
+++ b/src/components/settings_modal/helpers/proxy_setting.vue
@@ -18,25 +18,27 @@
       <slot v-else />
     </label>
     {{ ' ' }}
-    <input
-      :id="path"
-      class="input string-input"
-      :class="{ disabled: shouldBeDisabled }"
-      :disabled="shouldBeDisabled"
-      :placeholder="backendDescriptionSuggestions[0]"
-      :value="displayState"
-      @change="event => update({ event })"
-    >
-    {{ ' ' }}
-    <Checkbox
-      :model-value="socksState"
-      :disabled="shouldBeDisabled"
-      :indeterminate="isIndeterminate"
-      @update:model-value="event => update({ event, isProxy: true})"
-    >
-      {{ $t('admin_dash.http.socks5') }}
+    <div class="setting-control">
+      <input
+        :id="path"
+        class="input string-input"
+        :class="{ disabled: shouldBeDisabled }"
+        :disabled="shouldBeDisabled"
+        :placeholder="backendDescriptionSuggestions[0]"
+        :value="displayState"
+        @change="event => update({ event })"
+      >
       {{ ' ' }}
-    </Checkbox>
+      <Checkbox
+        :model-value="socksState"
+        :disabled="shouldBeDisabled"
+        :indeterminate="isIndeterminate"
+        @update:model-value="event => update({ event, isProxy: true})"
+      >
+        SOCKS5
+        {{ ' ' }}
+      </Checkbox>
+    </div>
     {{ ' ' }}
     <ModifiedIndicator
       :changed="isChanged"
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 9d250d9c4..a26937bd7 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -60,8 +60,8 @@
     display: grid;
     grid-template-areas:
       "label control"
-      ".    desc"
-      ".   draft";
+      "label desc"
+      ".     draft";
     grid-template-columns: 4fr 5fr;
     column-gap: 0.5em;
     align-items: baseline;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8527aa2f9..03ff6ec15 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1170,15 +1170,12 @@
     "posts": {
       "global": "Global settings",
       "local": "Local posts",
-      "scheduled_activites": "Scheduled posts",
       "remote": "Remote posts"
     },
     "other": {
       "uncategorized": "Uncategorized",
       "user_backup": "User Backup",
       "reports": "Reports",
-      "feed": "RSS Feed",
-      "feed_title": "Article Title",
       "privileges": "Privileges"
     },
     "monitoring": {
@@ -1191,8 +1188,7 @@
       "activitypub": "ActivityPub"
     },
     "http": {
-      "outbound": "Outbound HTTP requests",
-      "socks5": "SOCKS5"
+      "outbound": "Outbound HTTP requests"
     },
     "auth": {
       "MFA": "Multi-factor Authentication",
@@ -1202,7 +1198,6 @@
       "backup_codes": "Backup codes"
     },
     "job_queues": {
-      "Oban": "Oban queues",
       "Gun": {
         "title": "Gun queues",
         "connections_pools": "Gun connections pool",
@@ -1398,11 +1393,11 @@
         ":connections_pool": {
           ":max_idle_time": {
             "label": "Maximum idle time",
-            "description": "idk"
+            "description": "Maximum idle time before CONFIRM"
           },
           ":retry": {
             "label": "Retry",
-            "description": "idk"
+            "description": "Number of retries for making a connection CONFIRM"
           }
         },
         ":pools": {