From 984b469c6feffa6d3523ab5e2caf44fe847c5af7 Mon Sep 17 00:00:00 2001
From: shahin-io <115543613+shahin-io@users.noreply.github.com>
Date: Tue, 9 Jan 2024 09:10:40 +0000
Subject: Overall Enhancement  (#1524)

---
 web/html/xui/form/outbound.html               | 48 +++++++++++++--------------
 web/html/xui/form/protocol/shadowsocks.html   |  2 +-
 web/html/xui/form/protocol/trojan.html        |  2 +-
 web/html/xui/form/protocol/vless.html         |  2 +-
 web/html/xui/form/stream/stream_kcp.html      | 12 +++----
 web/html/xui/form/stream/stream_quic.html     | 18 +++++-----
 web/html/xui/form/stream/stream_settings.html |  4 +--
 web/html/xui/form/stream/stream_sockopt.html  | 12 +++----
 web/html/xui/form/stream/stream_tcp.html      |  4 +--
 web/html/xui/form/stream/stream_ws.html       |  2 +-
 web/html/xui/form/tls_settings.html           | 10 +++---
 web/html/xui/inbound_info_modal.html          |  4 +--
 web/html/xui/index.html                       |  2 +-
 13 files changed, 61 insertions(+), 61 deletions(-)

(limited to 'web/html')

diff --git a/web/html/xui/form/outbound.html b/web/html/xui/form/outbound.html
index df54395f..7c128b75 100644
--- a/web/html/xui/form/outbound.html
+++ b/web/html/xui/form/outbound.html
@@ -106,7 +106,7 @@
             <a-form-item label='PreShared Key'>
                 <a-input v-model.trim="peer.preSharedKey"></a-input>
             </a-form-item>
-            <a-form-item label='keepAlive'>
+            <a-form-item label='Keep Alive'>
                 <a-input type="number" min="0" v-model.number="peer.keepAlive"></a-input>
             </a-form-item>
 
@@ -189,7 +189,7 @@
     <template v-if="outbound.protocol === Protocols.Shadowsocks">
         <a-form-item label='{{ i18n "encryption" }}'>
             <a-select v-model="outbound.settings.method" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option v-for="method in SSMethods" :value="method">[[ method ]]</a-select-option>
+                <a-select-option v-for="(method,method_name) in SSMethods" :value="method">[[ method_name ]]</a-select-option>
             </a-select>
         </a-form-item>
         <a-form-item label='UDP over TCP'>
@@ -204,9 +204,9 @@
             <a-select v-model="outbound.stream.network" @change="streamNetworkChange"
                     :dropdown-class-name="themeSwitcher.currentTheme">
                 <a-select-option value="tcp">TCP</a-select-option>
-                <a-select-option value="kcp">KCP</a-select-option>
+                <a-select-option value="kcp">mKCP</a-select-option>
                 <a-select-option value="ws">WS</a-select-option>
-                <a-select-option value="http">HTTP2</a-select-option>
+                <a-select-option value="http">H2</a-select-option>
                 <a-select-option value="quic">QUIC</a-select-option>
                 <a-select-option value="grpc">gRPC</a-select-option>
             </a-select>
@@ -232,12 +232,12 @@
     <template v-if="outbound.stream.network === 'kcp'">
         <a-form-item label='{{ i18n "camouflage" }}'>
             <a-select v-model="outbound.stream.kcp.type" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option value="none">none (not camouflage)</a-select-option>
-                <a-select-option value="srtp">srtp (video call)</a-select-option>
-                <a-select-option value="utp">utp (BT download)</a-select-option>
-                <a-select-option value="wechat-video">wechat-video (WeChat video)</a-select-option>
-                <a-select-option value="dtls">dtls (DTLS 1.2 packages)</a-select-option>
-                <a-select-option value="wireguard">wireguard (wireguard packages)</a-select-option>
+                <a-select-option value="none">None</a-select-option>
+                <a-select-option value="srtp">SRTP</a-select-option>
+                <a-select-option value="utp">uTP</a-select-option>
+                <a-select-option value="wechat-video">WeChat</a-select-option>
+                <a-select-option value="dtls">DTLS 1.2</a-select-option>
+                <a-select-option value="wireguard">wireGuard</a-select-option>
             </a-select>
         </a-form-item>
         <a-form-item label='{{ i18n "password" }}'>
@@ -249,19 +249,19 @@
         <a-form-item label='TTI (ms)'>
             <a-input-number v-model.number="outbound.stream.kcp.tti"></a-input-number>
         </a-form-item>
-        <a-form-item label='Uplink Capacity (MB/s)'>
+        <a-form-item label='Uplink (MB/s)'>
             <a-input-number v-model.number="outbound.stream.kcp.upCap"></a-input-number>
         </a-form-item> 
-        <a-form-item label='Downlink Capacity (MB/s)'>
+        <a-form-item label='Downlink (MB/s)'>
             <a-input-number v-model.number="outbound.stream.kcp.downCap"></a-input-number>
         </a-form-item>
         <a-form-item label='Congestion'>
             <a-switch v-model="outbound.stream.kcp.congestion"></a-switch>
         </a-form-item>
-        <a-form-item label='Read Buffer Size (MB)'>
+        <a-form-item label='Read Buffer (MB)'>
             <a-input-number v-model.number="outbound.stream.kcp.readBuffer"></a-input-number>
         </a-form-item>
-        <a-form-item label='Write Buffer Size (MB)'>
+        <a-form-item label='Write Buffer (MB)'>
             <a-input-number v-model.number="outbound.stream.kcp.writeBuffer"></a-input-number>
         </a-form-item>
     </template>
@@ -290,9 +290,9 @@
     <template v-if="outbound.stream.network === 'quic'">
         <a-form-item label='{{ i18n "pages.inbounds.stream.quic.encryption" }}'>
             <a-select v-model="outbound.stream.quic.security" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option value="none">none</a-select-option>
-                <a-select-option value="aes-128-gcm">aes-128-gcm</a-select-option>
-                <a-select-option value="chacha20-poly1305">chacha20-poly1305</a-select-option>
+                <a-select-option value="none">None</a-select-option>
+                <a-select-option value="aes-128-gcm">AES-128-GCM</a-select-option>
+                <a-select-option value="chacha20-poly1305">CHACHA20-POLY1305</a-select-option>
             </a-select>
         </a-form-item>
         <a-form-item label='{{ i18n "password" }}'>
@@ -300,12 +300,12 @@
         </a-form-item> 
         <a-form-item label='{{ i18n "camouflage" }}'>
             <a-select v-model="outbound.stream.quic.type" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option value="none">none (No Obfuscation)</a-select-option>
-                <a-select-option value="srtp">SRTP (Video Call)</a-select-option>
-                <a-select-option value="utp">uTP (Bittorrent)</a-select-option>
-                <a-select-option value="wechat-video">WeChat Video</a-select-option>
-                <a-select-option value="dtls">DTLS (DTLS 1.2 packages)</a-select-option>
-                <a-select-option value="wireguard">WireGuard (WireGuard Packages)</a-select-option>
+                <a-select-option value="none">None</a-select-option>
+                <a-select-option value="srtp">SRTP</a-select-option>
+                <a-select-option value="utp">uTP</a-select-option>
+                <a-select-option value="wechat-video">WeChat</a-select-option>
+                <a-select-option value="dtls">DTLS 1.2</a-select-option>
+                <a-select-option value="wireguard">WireGuard</a-select-option>
             </a-select>
         </a-form-item>
     </template>
@@ -366,7 +366,7 @@
                         <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
                     </a-select>
                 </a-form-item>
-                <a-form-item label="Short IDs">
+                <a-form-item label="Short ID">
                     <a-input v-model.trim="outbound.stream.reality.shortId" style="width:250px"></a-input>
                 </a-form-item>
                 <a-form-item label="SpiderX">
diff --git a/web/html/xui/form/protocol/shadowsocks.html b/web/html/xui/form/protocol/shadowsocks.html
index 79281614..baed82e0 100644
--- a/web/html/xui/form/protocol/shadowsocks.html
+++ b/web/html/xui/form/protocol/shadowsocks.html
@@ -23,7 +23,7 @@
 <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
     <a-form-item label='{{ i18n "encryption" }}'>
         <a-select v-model="inbound.settings.method" @change="SSMethodChange" :dropdown-class-name="themeSwitcher.currentTheme">
-            <a-select-option v-for="method in SSMethods" :value="method">[[ method ]]</a-select-option>
+            <a-select-option v-for="(method,method_name) in SSMethods" :value="method">[[ method_name ]]</a-select-option>
         </a-select>
     </a-form-item>
     <a-form-item v-if="inbound.isSS2022">
diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html
index 5a7ba3c4..3f1d830b 100644
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -37,7 +37,7 @@
             <a-icon type="delete" @click="() => inbound.settings.delFallback(index)"
                     style="color: rgb(255, 77, 79);cursor: pointer;"/>
         </a-divider>
-        <a-form-item label='Name'>
+        <a-form-item label='SNI'>
             <a-input v-model="fallback.name"></a-input>
         </a-form-item>            
         <a-form-item label='ALPN'>
diff --git a/web/html/xui/form/protocol/vless.html b/web/html/xui/form/protocol/vless.html
index 7c18c048..73859ad5 100644
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -39,7 +39,7 @@
             <a-icon type="delete" @click="() => inbound.settings.delFallback(index)"
                     style="color: rgb(255, 77, 79);cursor: pointer;"/>
         </a-divider>
-        <a-form-item label='Name'>
+        <a-form-item label='SNI'>
             <a-input v-model="fallback.name"></a-input>
         </a-form-item>            
         <a-form-item label='ALPN'>
diff --git a/web/html/xui/form/stream/stream_kcp.html b/web/html/xui/form/stream/stream_kcp.html
index b792e1cd..8a45669d 100644
--- a/web/html/xui/form/stream/stream_kcp.html
+++ b/web/html/xui/form/stream/stream_kcp.html
@@ -2,12 +2,12 @@
 <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
     <a-form-item label='{{ i18n "camouflage" }}'>
         <a-select v-model="inbound.stream.kcp.type" :dropdown-class-name="themeSwitcher.currentTheme">
-            <a-select-option value="none">none (No Obfuscation)</a-select-option>
-            <a-select-option value="srtp">SRTP (Video Call)</a-select-option>
-            <a-select-option value="utp">uTP (Bittorrent)</a-select-option>
-            <a-select-option value="wechat-video">WeChat Video</a-select-option>
-            <a-select-option value="dtls">DTLS (DTLS 1.2 packages)</a-select-option>
-            <a-select-option value="wireguard">WireGuard (WireGuard packages)</a-select-option>
+            <a-select-option value="none">None</a-select-option>
+            <a-select-option value="srtp">SRTP</a-select-option>
+            <a-select-option value="utp">uTP</a-select-option>
+            <a-select-option value="wechat-video">WeChat</a-select-option>
+            <a-select-option value="dtls">DTLS 1.2</a-select-option>
+            <a-select-option value="wireguard">WireGuard</a-select-option>
         </a-select>
     </a-form-item>
     <a-form-item label='{{ i18n "password" }}'>
diff --git a/web/html/xui/form/stream/stream_quic.html b/web/html/xui/form/stream/stream_quic.html
index 8a2167c4..d9175061 100644
--- a/web/html/xui/form/stream/stream_quic.html
+++ b/web/html/xui/form/stream/stream_quic.html
@@ -2,9 +2,9 @@
 <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
     <a-form-item label='{{ i18n "pages.inbounds.stream.quic.encryption" }}'>
         <a-select v-model="inbound.stream.quic.security" :dropdown-class-name="themeSwitcher.currentTheme">
-            <a-select-option value="none">none</a-select-option>
-            <a-select-option value="aes-128-gcm">aes-128-gcm</a-select-option>
-            <a-select-option value="chacha20-poly1305">chacha20-poly1305</a-select-option>
+            <a-select-option value="none">None</a-select-option>
+            <a-select-option value="aes-128-gcm">AES-128-GCM</a-select-option>
+            <a-select-option value="chacha20-poly1305">CHACHA20-POLY1305</a-select-option>
         </a-select>
     </a-form-item>
     <a-form-item label='{{ i18n "password" }}'>
@@ -12,12 +12,12 @@
     </a-form-item> 
     <a-form-item label='{{ i18n "camouflage" }}'>
         <a-select v-model="inbound.stream.quic.type" :dropdown-class-name="themeSwitcher.currentTheme">
-            <a-select-option value="none">none (No Obfuscation)</a-select-option>
-            <a-select-option value="srtp">SRTP (Video Call)</a-select-option>
-            <a-select-option value="utp">uTP (Bittorrent)</a-select-option>
-            <a-select-option value="wechat-video">WeChat Video</a-select-option>
-            <a-select-option value="dtls">DTLS (DTLS 1.2 packages)</a-select-option>
-            <a-select-option value="wireguard">WireGuard (WireGuard Packages)</a-select-option>
+            <a-select-option value="none">None</a-select-option>
+            <a-select-option value="srtp">SRTP</a-select-option>
+            <a-select-option value="utp">uTP</a-select-option>
+            <a-select-option value="wechat-video">WeChat</a-select-option>
+            <a-select-option value="dtls">DTLS 1.2</a-select-option>
+            <a-select-option value="wireguard">WireGuard</a-select-option>
         </a-select>
     </a-form-item>
 </a-form>
diff --git a/web/html/xui/form/stream/stream_settings.html b/web/html/xui/form/stream/stream_settings.html
index 85935af0..57a4f850 100644
--- a/web/html/xui/form/stream/stream_settings.html
+++ b/web/html/xui/form/stream/stream_settings.html
@@ -5,7 +5,7 @@
         <a-select v-model="inbound.stream.network" @change="streamNetworkChange"
             :dropdown-class-name="themeSwitcher.currentTheme">
             <a-select-option value="tcp">TCP</a-select-option>
-            <a-select-option value="kcp">KCP</a-select-option>
+            <a-select-option value="kcp">mKCP</a-select-option>
             <a-select-option value="ws">WS</a-select-option>
             <a-select-option value="http">H2</a-select-option>
             <a-select-option value="quic">QUIC</a-select-option>
@@ -47,4 +47,4 @@
 <template>
     {{template "form/streamSockopt"}}
 </template>
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/web/html/xui/form/stream/stream_sockopt.html b/web/html/xui/form/stream/stream_sockopt.html
index 7291b740..92dcd7b5 100644
--- a/web/html/xui/form/stream/stream_sockopt.html
+++ b/web/html/xui/form/stream/stream_sockopt.html
@@ -1,24 +1,24 @@
 {{define "form/streamSockopt"}}
 <a-divider style="margin:5px 0 0;"></a-divider>
 <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label="Transparent Proxy">
+    <a-form-item label="TPROXY">
         <a-switch v-model="inbound.stream.sockoptSwitch"></a-switch>
     </a-form-item>
     <template v-if="inbound.stream.sockoptSwitch">
-        <a-form-item label="Accept Proxy Protocol">
+        <a-form-item label=PROXY Protocol">
             <a-switch v-model="inbound.stream.sockopt.acceptProxyProtocol"></a-switch>
         </a-form-item>
-        <a-form-item label="TCP FastOpen">
+        <a-form-item label="TCP Fast Open">
             <a-switch v-model.trim="inbound.stream.sockopt.tcpFastOpen"></a-switch>
         </a-form-item>
         <a-form-item label="Route Mark">
             <a-input-number v-model="inbound.stream.sockopt.mark" :min="0"></a-input-number>
         </a-form-item>
-        <a-form-item label="T-Proxy">
+        <a-form-item label="TPROXY">
             <a-select v-model="inbound.stream.sockopt.tproxy" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option value="off">OFF</a-select-option>
+                <a-select-option value="off">Off</a-select-option>
                 <a-select-option value="redirect">Redirect</a-select-option>
-                <a-select-option value="tproxy">T-Proxy</a-select-option>
+                <a-select-option value="tproxy">TPROXY</a-select-option>
             </a-select>
         </a-form-item>
     </template>
diff --git a/web/html/xui/form/stream/stream_tcp.html b/web/html/xui/form/stream/stream_tcp.html
index 941a3d79..1c6edf3f 100644
--- a/web/html/xui/form/stream/stream_tcp.html
+++ b/web/html/xui/form/stream/stream_tcp.html
@@ -1,7 +1,7 @@
 {{define "form/streamTCP"}}
 <!-- tcp type -->
 <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label="Accept Proxy Protocol" v-if="inbound.canEnableTls()">
+    <a-form-item label="PROXY Protocol" v-if="inbound.canEnableTls()">
         <a-switch v-model="inbound.stream.tcp.acceptProxyProtocol"></a-switch>
     </a-form-item>
     <a-form-item label='HTTP {{ i18n "camouflage" }}'>
@@ -73,4 +73,4 @@
         </a-input-group>
     </a-form-item>
 </a-form>
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/web/html/xui/form/stream/stream_ws.html b/web/html/xui/form/stream/stream_ws.html
index 14d09999..43f4a951 100644
--- a/web/html/xui/form/stream/stream_ws.html
+++ b/web/html/xui/form/stream/stream_ws.html
@@ -1,6 +1,6 @@
 {{define "form/streamWS"}}
 <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label="Accept Proxy Protocol">
+    <a-form-item label=PROXY Protocol">
         <a-switch v-model="inbound.stream.ws.acceptProxyProtocol"></a-switch>
     </a-form-item>
     <a-form-item label='{{ i18n "path" }}'>
diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html
index f265cb43..e83d4c3f 100644
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -26,9 +26,9 @@
         <a-form-item label="SNI" placeholder="Server Name Indication">
             <a-input v-model.trim="inbound.stream.tls.sni"></a-input>
         </a-form-item>
-        <a-form-item label="CipherSuites">
+        <a-form-item label="Cipher Suites">
             <a-select v-model="inbound.stream.tls.cipherSuites" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option value="">auto</a-select-option>
+                <a-select-option value="">Auto</a-select-option>
                 <a-select-option v-for="key,value in TLS_CIPHER_OPTION" :value="key">[[ value ]]</a-select-option>
             </a-select>
         </a-form-item>
@@ -92,7 +92,7 @@
                     <a-input type="textarea" :rows="3" v-model="cert.key"></a-input>
                 </a-form-item>
             </template>
-            <a-form-item label='ocspStapling'>
+            <a-form-item label='OCSP stapling'>
                 <a-input-number v-model.number="cert.ocspStapling" :min="0"></a-input-number>
             </a-form-item>
         </template>
@@ -162,7 +162,7 @@
         <a-form-item label='Dest'>
             <a-input v-model.trim="inbound.stream.reality.dest"></a-input>
         </a-form-item>
-        <a-form-item label='Server Names'>
+        <a-form-item label='SNI'>
             <a-input v-model.trim="inbound.stream.reality.serverNames"></a-input>
         </a-form-item>
         <a-form-item>
@@ -187,7 +187,7 @@
             <a-input v-model.trim="inbound.stream.reality.settings.publicKey"></a-input>
         </a-form-item>
         <a-form-item label=" ">
-            <a-button type="primary" icon="import" @click="getNewX25519Cert">Get new cert</a-button>
+            <a-button type="primary" icon="import" @click="getNewX25519Cert">Get New Cert</a-button>
         </a-form-item>
     </template>
 </a-form>
diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html
index 0d8f850d..cf1a032b 100644
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -164,7 +164,7 @@
             </tr>
         </table>
         <template v-if="app.subSettings.enable && infoModal.clientSettings.subId">
-            <a-divider>Subscription link</a-divider>
+            <a-divider>Subscription URL</a-divider>
             <a-row>
                 <a-col :sx="24" :md="22"><a :href="[[ infoModal.subLink ]]" target="_blank">[[ infoModal.subLink ]]</a></a-col>
                 <a-col :sx="24" :md="2" style="text-align: right;">
@@ -349,4 +349,4 @@
     });
 
 </script>
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/web/html/xui/index.html b/web/html/xui/index.html
index 50c46b03..55b46d08 100644
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -96,7 +96,7 @@
                             <a-tag :color="status.xray.color">[[ status.xray.state ]]</a-tag>
                             <a-popover v-if="status.xray.state === State.Error"
                                 :overlay-class-name="themeSwitcher.currentTheme">
-                                <span slot="title" style="font-size: 12pt">Error in running xray-core
+                                <span slot="title" style="font-size: 12pt">An error occurred while running Xray
                                     <a-tag color="purple" style="cursor: pointer; float: right;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
                                 </span>
                                 <template slot="content">
-- 
cgit v1.2.3