From fec9b252480786077f9c6ab934fcbd8ed435e320 Mon Sep 17 00:00:00 2001
From: Columbiysky <c.7843543@gmail.com>
Date: Sun, 30 Mar 2025 07:29:35 +0300
Subject: [PATCH 1/3] locs(RU\UA): a bit better translate (#2841)

---
 web/translation/translate.ru_RU.toml | 2 +-
 web/translation/translate.uk_UA.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml
index d2149784..931bed54 100644
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -635,7 +635,7 @@
 "allClients" = "Все клиенты"
 
 "addClient" = "Добавить клиента"
-"submitDisable" = "Отправить как отключенный ✅"
+"submitDisable" = "Отправить отключенным ✅"
 "use_default" = "🏷️ Использовать по умолчанию"
 "change_id" = "⚙️🔑 ID"
 "change_password" = "⚙️🔑 Пароль"
diff --git a/web/translation/translate.uk_UA.toml b/web/translation/translate.uk_UA.toml
index b7205714..5ee5b8b1 100644
--- a/web/translation/translate.uk_UA.toml
+++ b/web/translation/translate.uk_UA.toml
@@ -635,7 +635,7 @@
 "allClients" = "Всі Клієнти"
 
 "addClient" = "Додати клієнта"
-"submitDisable" = "Надіслати як вимкнене ✅"
+"submitDisable" = "Надіслати відключеним ✅"
 "use_default" = "🏷️ Використовувати за замовчуванням"
 "change_id" = "⚙️🔑 ID"
 "change_password" = "⚙️🔑 Пароль"

From 7c58bcbb46f73f5307a955ef097002ebbc5fe4fd Mon Sep 17 00:00:00 2001
From: Pk-web6936 <202365630+Pk-web6936@users.noreply.github.com>
Date: Sun, 30 Mar 2025 08:02:42 +0330
Subject: [PATCH 2/3] Consolidate and Optimize .gitignore Files (#2838)

* Update .gitignore
---
 .gitignore | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 781a633d..32f90dc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,39 @@
-.idea
-.vscode
-.cache
+# Ignore editor and IDE settings
+.idea/
+.vscode/
+.cache/
 .sync*
-*.tar.gz
+
+# Ignore log files
 *.log
 access.log
 error.log
-tmp
-main
+
+# Ignore temporary files
+tmp/
+*.tar.gz
+
+# Ignore build and distribution directories
 backup/
 bin/
 dist/
 release/
+node_modules/
+
+# Ignore compiled binaries
+main
+
+# Ignore script and executable files
 /release.sh
 /x-ui
+
+# Ignore OS specific files
+.DS_Store
+Thumbs.db
+
+# Ignore Go specific files
+*.exe
+*.exe~
+
+# Ignore Docker specific files
+docker-compose.override.yml

From 127bea7f73953f63c6a93cc49dcc665632e2b9ae Mon Sep 17 00:00:00 2001
From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com>
Date: Sun, 30 Mar 2025 22:02:05 +0700
Subject: [PATCH 3/3] fix: opening links in the sidebar

---
 web/html/xui/component/aSidebar.html | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/html/xui/component/aSidebar.html b/web/html/xui/component/aSidebar.html
index 0ddaa176..dfaebb17 100644
--- a/web/html/xui/component/aSidebar.html
+++ b/web/html/xui/component/aSidebar.html
@@ -45,27 +45,27 @@
             return {
                 tabs: [
                     {
-                        key: '/panel/',
+                        key: 'panel/',
                         icon: 'dashboard',
                         title: '{{ i18n "menu.dashboard"}}'
                     },
                     {
-                        key: '/panel/inbounds',
+                        key: 'panel/inbounds',
                         icon: 'user',
                         title: '{{ i18n "menu.inbounds"}}'
                     },
                     {
-                        key: '/panel/settings',
+                        key: 'panel/settings',
                         icon: 'setting',
                         title: '{{ i18n "menu.settings"}}'
                     },
                     {
-                        key: '/panel/xray',
+                        key: 'panel/xray',
                         icon: 'tool',
                         title: '{{ i18n "menu.xray"}}'
                     },
                     {
-                        key: '/logout/',
+                        key: 'logout/',
                         icon: 'logout',
                         title: '{{ i18n "menu.logout"}}'
                     },
@@ -79,7 +79,9 @@
         },
         methods: {
             openLink(key) {
-                return key.startsWith('http') ? window.open(key) : location.href = key
+                return key.startsWith('http') ? 
+                    window.open(`{{ .base_path }}${key}`) : 
+                    location.href = `{{ .base_path }}${key}`
             },
             closeDrawer() {
                 this.visible = false;