Overall enhancement (#785)

* Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update outbound.html * Update tls_settings.html * Update stream_tcp.html * Update stream_ws.html * Update vless.html * Update trojan.html * Update stream_sockopt.html * Update stream_tcp.html * Update stream_tcp.html * Update stream_sockopt.html * Update index.html * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.ru_RU.toml * Update translate.vi_VN.toml * Update translate.zh_Hans.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update outbound.html * Update translate.en_US.toml * Update translate.vi_VN.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.vi_VN.toml * Update translate.ru_RU.toml * Update translate.zh_Hans.toml * Update client.html * Update inbound.html * Update translate.zh_Hans.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update index.html * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update index.html * Update translate.en_US.toml * Update translate.en_US.toml * Update client_bulk_modal.html * Update client.html * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update index.html * Update translate.en_US.toml * Update translate.en_US.toml * Update client_bulk_modal.html * Update client.html * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.ru_RU.toml * Update translate.vi_VN.toml * Update translate.zh_Hans.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update tls_settings.html * Update outbound.html * Update outbound.html * Update trojan.html * Update vless.html * Update tls_settings.html * Update index.html * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update index.html * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update outbound.html * Update shadowsocks.html * Update tls_settings.html * Update tls_settings.html * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.ru_RU.toml * Update translate.vi_VN.toml * Update translate.zh_Hans.toml * Update index.html * Update index.html * Update translate.vi_VN.toml * Update translate.vi_VN.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update tls_settings.html * Update translate.en_US.toml * Update client_modal.html * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update inbound_info_modal.html * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update index.html * Update index.html * Update index.html * Update index.html * Update client_modal.html * Update client_modal.html * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update client_bulk_modal.html * Update client.html * Update inbound.html * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.ru_RU.toml * Update translate.vi_VN.toml * Update translate.zh_Hans.toml * Update client_bulk_modal.html * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.fa_IR.toml * Update outbound.html * Update stream_kcp.html * Update stream_quic.html * Update tls_settings.html * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update stream_sockopt.html * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update vless.html * Update trojan.html * Update client_bulk_modal.html * Update client.html * Update client_bulk_modal.html * Update client.html * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml * Update translate.en_US.toml
2026-03-21 00:05:49 +00:00 · 2024-01-08 16:19:36 +00:00
parent 3a174144c4
commit 94ac29ba7f
23 changed files with 540 additions and 556 deletions
--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/client_bulk_modal.html
@@ -211,4 +211,4 @@
        },
    });
 </script>
-{{end}}
+{{end}}
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -75,7 +75,7 @@
                <template slot="title">
                    0 <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
                </template>
-                {{ i18n "pages.inbounds.totalFlow" }}(GB)
+                {{ i18n "pages.inbounds.totalFlow" }} (GB)
                <a-icon type="question-circle"></a-icon>
            </a-tooltip>
        </template>
@@ -122,4 +122,4 @@
        <a-input-number v-model.number="client.reset" :min="0"></a-input-number>
 </a-form-item>
 </a-form>
-{{end}}
+{{end}}
--- a/web/html/xui/form/inbound.html
+++ b/web/html/xui/form/inbound.html
@@ -37,7 +37,7 @@
                <template slot="title">
                    0 <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
                </template>
-                {{ i18n "pages.inbounds.totalFlow" }}(GB)
+                {{ i18n "pages.inbounds.totalFlow" }} (GB)
                <a-icon type="question-circle"></a-icon>
            </a-tooltip>
        </template>
@@ -110,4 +110,4 @@
 <template v-if="inbound.canSniffing()">
    {{template "form/sniffing"}}
 </template>
-{{end}}
+{{end}}
--- a/web/html/xui/form/outbound.html
+++ b/web/html/xui/form/outbound.html
@@ -132,7 +132,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'>
@@ -147,9 +147,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">WebSocket</a-select-option>
-                <a-select-option value="http">HTTP2</a-select-option>
+                <a-select-option value="http">HTTP/2</a-select-option>
                <a-select-option value="quic">QUIC</a-select-option>
                <a-select-option value="grpc">gRPC</a-select-option>
            </a-select>
@@ -175,12 +175,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" }}'>
@@ -192,19 +192,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>
@@ -233,9 +233,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" }}'>
@@ -243,12 +243,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 (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>
    </template>
@@ -258,7 +258,7 @@
        <a-form-item label='Service Name'>
            <a-input v-model.trim="outbound.stream.grpc.serviceName"></a-input>
        </a-form-item>
-        <a-form-item label='MultiMode'>
+        <a-form-item label='Multi Mode'>
            <a-switch v-model="outbound.stream.grpc.multiMode"></a-switch>
        </a-form-item>
    </template>
@@ -309,7 +309,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">
--- a/web/html/xui/form/protocol/shadowsocks.html
+++ b/web/html/xui/form/protocol/shadowsocks.html
@@ -16,42 +16,26 @@
                    <td>[[ client.email ]]</td>
                    <td>[[ client.password ]]</td>
                </tr>
-            </table>
-        </a-collapse-panel>
-    </a-collapse>
-</template>
-<table width="100%" class="ant-table-tbody">
-    <tr>
-        <td>{{ i18n "encryption" }}</td>
-        <td>
-            <a-form-item>
-                <a-select v-model="inbound.settings.method" style="width: 250px;" @change="SSMethodChange" :dropdown-class-name="themeSwitcher.currentTheme">
-                    <a-select-option v-for="method in SSMethods" :value="method">[[ method ]]</a-select-option>
-                </a-select>
-            </a-form-item>
-        </td>
-    </tr>
-    <tr v-if="inbound.isSS2022">
-        <td>{{ i18n "password" }}
-            <a-icon @click="inbound.settings.password = RandomUtil.randomShadowsocksPassword()" type="sync"> </a-icon>
-        </td>
-        <td>
-            <a-form-item>
-                <a-input v-model.trim="inbound.settings.password" style="width: 250px"></a-input>
-            </a-form-item>
-        </td>
-    </tr>
-    <tr>
-        <td>{{ i18n "pages.inbounds.network" }}</td>
-        <td>
-            <a-form-item>
-                <a-select v-model="inbound.settings.network" style="width: 100px;" :dropdown-class-name="themeSwitcher.currentTheme">
-                    <a-select-option value="tcp,udp">TCP+UDP</a-select-option>
-                    <a-select-option value="tcp">TCP</a-select-option>
-                    <a-select-option value="udp">UDP</a-select-option>
-                </a-select>
-            </a-form-item>
-        </td>
-    </tr>
-</table>
+                <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,method_name) in SSMethods" :value="method">[[ method_name ]]</a-select-option>
+        </a-select>
+    </a-form-item>
+    <a-form-item v-if="inbound.isSS2022">
+        <template slot="label">
+            <span>{{ i18n "password" }}</span>
+            <a-icon @click="inbound.settings.password = RandomUtil.randomShadowsocksPassword()" type="sync"></a-icon>
+        </template>
+        <a-input v-model.trim="inbound.settings.password"></a-input>
+    </a-form-item>
+    <a-form-item label='{{ i18n "pages.inbounds.network" }}'>
+        <a-select v-model="inbound.settings.network" :dropdown-class-name="themeSwitcher.currentTheme">
+            <a-select-option value="tcp,udp">TCP+UDP</a-select-option>
+            <a-select-option value="tcp">TCP</a-select-option>
+            <a-select-option value="udp">UDP</a-select-option>
+        </a-select>
+    </a-form-item>
+</a-form>
+<a-divider style="margin:0;"></a-divider>
 {{end}}
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -33,11 +33,11 @@
    <!-- trojan fallbacks -->
    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
        <a-divider style="margin:0;">
-            Fallback[[ index + 1 ]]
+            Fallback [[ index + 1 ]]
            <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'>
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -35,11 +35,11 @@
    <!-- vless fallbacks -->
    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }">
        <a-divider style="margin:0;">
-            Fallback[[ index + 1 ]]
+            Fallback [[ index + 1 ]]
            <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'>
--- a/web/html/xui/form/stream/stream_grpc.html
+++ b/web/html/xui/form/stream/stream_grpc.html
@@ -3,8 +3,8 @@
    <a-form-item label="Service Name">
        <a-input v-model.trim="inbound.stream.grpc.serviceName" style="width: 250px;"></a-input>
    </a-form-item>
-    <a-form-item label="MultiMode">
+    <a-form-item label="Multi Mode">
        <a-switch v-model="inbound.stream.grpc.multiMode"></a-switch>
    </a-form-item>
 </a-form>
-{{end}}
+{{end}}
--- 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 (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" }}'>
@@ -19,19 +19,19 @@
    <a-form-item label='TTI (ms)'>
        <a-input-number v-model.number="inbound.stream.kcp.tti"></a-input-number>
    </a-form-item>
-    <a-form-item label='Uplink (Mb/s)'>
+    <a-form-item label='Uplink (MB/s)'>
        <a-input-number v-model.number="inbound.stream.kcp.upCap"></a-input-number>
    </a-form-item> 
-    <a-form-item label='Downlink (Mb/s)'>
+    <a-form-item label='Downlink (MB/s)'>
        <a-input-number v-model.number="inbound.stream.kcp.downCap"></a-input-number>
    </a-form-item>
    <a-form-item label='Congestion'>
        <a-switch v-model="inbound.stream.kcp.congestion"></a-switch>
    </a-form-item>
-    <a-form-item label='Read buffer (MB)'>
+    <a-form-item label='Read Buffer (MB)'>
        <a-input-number v-model.number="inbound.stream.kcp.readBuffer"></a-input-number>
    </a-form-item>
-    <a-form-item label='Write buffer (MB)'>
+    <a-form-item label='Write Buffer (MB)'>
        <a-input-number v-model.number="inbound.stream.kcp.writeBuffer"></a-input-number>
    </a-form-item>
 </a-form>
--- 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,13 +12,13 @@
    </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 (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>
-{{end}}
+{{end}}
--- a/web/html/xui/form/stream/stream_settings.html
+++ b/web/html/xui/form/stream/stream_settings.html
@@ -5,9 +5,9 @@
        <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">WebSocket</a-select-option>
-            <a-select-option value="http">HTTP2</a-select-option>
+            <a-select-option value="http">HTTP/2</a-select-option>
            <a-select-option value="quic">QUIC</a-select-option>
            <a-select-option value="grpc">gRPC</a-select-option>
        </a-select>
@@ -47,4 +47,4 @@
 <template>
    {{template "form/streamSockopt"}}
 </template>
-{{end}}
+{{end}}
--- a/web/html/xui/form/stream/stream_sockopt.html
+++ b/web/html/xui/form/stream/stream_sockopt.html
@@ -1,26 +1,26 @@
 {{define "form/streamSockopt"}}
 <a-divider style="margin: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>
 </a-form>
-{{end}}
+{{end}}
--- 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" }}">
--- 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" }}'>
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -15,9 +15,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>
@@ -80,7 +80,7 @@
            <a-input type="textarea" :rows="3" style="width:250px;" 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>
@@ -103,7 +103,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>
@@ -128,7 +128,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>
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -160,7 +160,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;">
@@ -345,4 +345,4 @@
    });

 </script>
-{{end}}
+{{end}}
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -44,7 +44,7 @@
                                        <a-progress type="dashboard" status="normal"
                                                    :stroke-color="status.cpu.color"
                                                    :percent="status.cpu.percent"></a-progress>
-                                        <div>CPU: ([[ status.cpuCount ]]core)</div>
+                                        <div>CPU: [[ status.cpuCount ]] Core(s)</div>
                                    </a-col>
                                    <a-col :span="12" style="text-align: center">
                                        <a-progress type="dashboard" status="normal"
@@ -83,9 +83,9 @@
            <transition name="list" appear>
                <a-row>
                    <a-col :sm="24" :md="12">
-                        <a-card hoverable>
-                            X-UI: <a href="https://github.com/alireza0/x-ui/releases" target="_blank"><a-tag color="blue">{{ .cur_ver }}</a-tag></a>
-                            Xray:
+                        <a-card hoverable> 
+                            X-UI <a href="https://github.com/alireza0/x-ui/releases" target="_blank"><a-tag color="blue">{{ .cur_ver }}</a-tag></a>
+                            Xray
                            <a-tooltip title='{{ i18n "pages.index.xraySwitch" }}'>
                                <a-tag color="blue" style="cursor: pointer;" @click="openSelectV2rayVersion">[[ status.xray.version ]]</a-tag>
                            </a-tooltip>
@@ -112,7 +112,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">
--- a/web/html/xui/xray_rule_modal.html
+++ b/web/html/xui/xray_rule_modal.html
@@ -20,7 +20,7 @@
            <a-input v-model.trim="ruleModal.rule.source"></a-input>
        </a-form-item>
        <a-form-item>
-            <template slot="label">Source Port
+            <template slot="label">
                <a-tooltip>
                    <template slot="title">
                        <span>{{ i18n "pages.xray.rules.useComma" }}</span>