From 56e8203a3428ab78a30bc2c22ab6c646a1a40052 Mon Sep 17 00:00:00 2001
From: MHSanaei <mc.sanaei@gmail.com>
Date: Sat, 11 Feb 2023 23:52:24 +0330
Subject: trojan grpc link fixed - some en lang edited

upgrade
text to v0.7.0
i18nv2 to v2.2.1
sqlite3 to v1.14.16
toml to v1.2.1

downgrade
sessions to v0.0.4
---
 web/assets/js/model/xray.js          |   2 +-
 web/html/xui/common_sider.html       |   4 +-
 web/html/xui/inbounds.html           |   2 +-
 web/html/xui/index.html              |   4 +-
 web/translation/translate.en_US.toml | 137 +++++++++++++++++------------------
 web/translation/translate.fa_IR.toml |   2 +-
 6 files changed, 75 insertions(+), 76 deletions(-)

(limited to 'web')

diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index 78af69b6..cfa82368 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -1545,7 +1545,7 @@ Inbound.TrojanSettings = class extends Inbound.Settings {
     }
 };
 Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
-    constructor(password=RandomUtil.randomSeq(10), flow = XTLS_FLOW_CONTROL.DIRECT, email='', totalGB=0, expiryTime='') {
+    constructor(password=RandomUtil.randomSeq(10), flow ='', email='', totalGB=0, expiryTime='') {
         super();
         this.password = password;
         this.flow = flow;
diff --git a/web/html/xui/common_sider.html b/web/html/xui/common_sider.html
index f4499eeb..38a55265 100644
--- a/web/html/xui/common_sider.html
+++ b/web/html/xui/common_sider.html
@@ -18,7 +18,7 @@
 <a-sub-menu>
     <template slot="title">
         <a-icon type="link"></a-icon>
-        <span>others</span>
+        <span>{{ i18n "menu.link"}}</span>
     </template>
     <a-menu-item key="https://github.com/mhsanaei/3x-ui/">
         <a-icon type="github"></a-icon>
@@ -26,7 +26,7 @@
     </a-menu-item>
     <a-menu-item key="https://t.me/xxxuiforever">
         <a-icon type="usergroup-add"></a-icon>
-        <span>Telegram Group</span>
+        <span>Telegram</span>
     </a-menu-item>
 </a-sub-menu>
 <a-menu-item key="{{ .base_path }}logout">
diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html
index d7e56612..8d295121 100644
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -54,7 +54,7 @@
                                  style="margin-top: 20px"
                                  @change="() => getDBInbounds()">
                             <template slot="action" slot-scope="text, dbInbound">
-                                <a-icon type="edit" @click="openEditInbound(dbInbound)"></a-icon>
+                                <a-icon type="edit" style="font-size: 25px" @click="openEditInbound(dbInbound)"></a-icon>
                                 <a-dropdown :trigger="['click']">
                                     <a @click="e => e.preventDefault()">{{ i18n "pages.inbounds.operate" }}</a>
                                     <a-menu slot="overlay" @click="a => clickAction(a, dbInbound)">
diff --git a/web/html/xui/index.html b/web/html/xui/index.html
index b4e5be7f..141174dc 100644
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -47,7 +47,7 @@
                                                     :stroke-color="status.swap.color"
                                                     :percent="status.swap.percent"></a-progress>
                                         <div>
-                                            swap: [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]]
+                                            Swap: [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]]
                                         </div>
                                     </a-col>
                                     <a-col :span="12" style="text-align: center">
@@ -99,7 +99,7 @@
                     </a-col>
                     <a-col :sm="24" :md="12">
                         <a-card hoverable>
-                            tcp / udp {{ i18n "pages.index.connectionCount" }}: [[ status.tcpCount ]] / [[ status.udpCount ]]
+                            TCP / UDP {{ i18n "pages.index.connectionCount" }}: [[ status.tcpCount ]] / [[ status.udpCount ]]
                             <a-tooltip>
                                 <template slot="title">
                                     {{ i18n "pages.index.connectionCountDesc" }}
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml
index ef878cf1..4ce2b7a9 100644
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -1,48 +1,47 @@
 "username" = "username"
 "password" = "password"
-"login" = "login"
-"confirm" = "confirm"
-"cancel" = "cancel"
-"close" = "close"
-"copy" = "copy"
-"copied" = "copied"
-"download" = "download"
-"remark" = "remark"
-"enable" = "enable"
-"protocol" = "protocol"
-
+"login" = "Login"
+"confirm" = "Confirm"
+"cancel" = "Cancel"
+"close" = "Close"
+"copy" = "Copy"
+"copied" = "Copied"
+"download" = "Download"
+"remark" = "Remark"
+"enable" = "Enable"
+"protocol" = "Protocol"
 "loading" = "Loading"
-"second" = "second"
-"minute" = "minute"
-"hour" = "hour"
-"day" = "day"
-"check" = "check"
-"indefinite" = "indefinite"
-"unlimited" = "unlimited"
-"none" = "none"
+"second" = "Second"
+"minute" = "Minute"
+"hour" = "Hour"
+"day" = "Day"
+"check" = "Check"
+"indefinite" = "Indefinite"
+"unlimited" = "Unlimited"
+"none" = "None"
 "qrCode" = "QR Code"
-"edit" = "edit"
-"delete" = "delete"
-"reset" = "reset"
+"edit" = "Edit"
+"delete" = "Delete"
+"reset" = "Reset"
 "copySuccess" = "Copy successfully"
 "sure" = "Sure"
-"encryption" = "encryption"
-"transmission" = "transmission"
-"host" = "host"
-"path" = "path"
-"camouflage" = "camouflage"
-"enabled" = "enabled"
-"disabled" = "disabled"
-"domainName" = "domain name"
-"additional" = "alter"
+"encryption" = "Encryption"
+"transmission" = "Transmission"
+"host" = "Host"
+"path" = "Path"
+"camouflage" = "Camouflage"
+"enabled" = "Enabled"
+"disabled" = "Disabled"
+"domainName" = "Domain Name"
+"additional" = "Alter"
 "monitor" = "Listen IP"
-"certificate" = "certificate"
-"fail" = "fail"
-"success" = " success"
-"getVersion" = "get version"
-"install" = "install"
-"used" = "used"
-"clients" = "clients"
+"certificate" = "Certificate"
+"fail" = "Fail"
+"success" = "Success"
+"getVersion" = "Get Version"
+"install" = "Install"
+"used" = "Used"
+"clients" = "Clients"
 
 [menu]
 "dashboard" = "System Status"
@@ -64,10 +63,10 @@
 
 
 [pages.index]
-"title" = "system status"
-"memory" = "memory"
-"hard" = "hard disk"
-"xrayStatus" = "xray Status"
+"title" = "System Status"
+"memory" = "Memory"
+"hard" = "Hard Disk"
+"xrayStatus" = "Xray Status"
 "xraySwitch" = "Switch Version"
 "xraySwitchClick" = "Click on the version you want to switch"
 "xraySwitchClickDesk" = "Please choose carefully, older versions may have incompatible configurations"
@@ -86,43 +85,43 @@
 
 [pages.inbounds]
 "title" = "Inbounds"
-"totalDownUp" = "Total uploads/downloads"
-"totalUsage" = "Total usage"
-"inboundCount" = "Number of inbound"
+"totalDownUp" = "Total Uploads/Downloads"
+"totalUsage" = "Total Usage"
+"inboundCount" = "Number Of Inbound"
 "operate" = "Actions"
-"enable" = "enable"
-"remark" = "remark"
-"protocol" = "protocol"
-"port" = "port"
-"traffic" = "traffic"
-"details" = "details"
-"transportConfig" = "transport config"
-"expireDate" = "expire date"
-"resetTraffic" = "reset traffic"
-"addInbound" = "addInbound"
+"enable" = "Enable"
+"remark" = "Remark"
+"protocol" = "Protocol"
+"port" = "Port"
+"traffic" = "Traffic"
+"details" = "Details"
+"transportConfig" = "Transport"
+"expireDate" = "Expire Date"
+"resetTraffic" = "Reset Traffic"
+"addInbound" = "Add Inbound"
 "addTo" = "Add To"
-"revise" = "Revise"
+"revise" = "Save"
 "modifyInbound" = "Modify InBound"
 "deleteInbound" = "Delete Inbound"
 "deleteInboundContent" = "Are you sure you want to delete inbound?"
 "resetTrafficContent" = "Are you sure you want to reset traffic?"
 "copyLink" = "Copy Link"
-"address" = "address"
-"network" = "network"
-"destinationPort" = "destination port"
-"targetAddress" = "target address"
+"address" = "Address"
+"network" = "Network"
+"destinationPort" = "Destination port"
+"targetAddress" = "Target Address"
 "disableInsecureEncryption" = "Disable insecure encryption"
 "monitorDesc" = "Leave blank by default"
 "meansNoLimit" = "means no limit"
-"totalFlow" = "total flow"
+"totalFlow" = "Total Traffic"
 "leaveBlankToNeverExpire" = "Leave blank to never expire"
 "noRecommendKeepDefault" = "There are no special requirements to keep the default"
-"certificatePath" = "certificate file path"
-"certificateContent" = "certificate file content"
-"publicKeyPath" = "public key file path"
-"publicKeyContent" = "public key content"
-"keyPath" = "key file path"
-"keyContent" = "key content"
+"certificatePath" = "Certificate File Path"
+"certificateContent" = "Certificate File Content"
+"publicKeyPath" = "Public Key File Path"
+"publicKeyContent" = "public Key Content"
+"keyPath" = "Key File Path"
+"keyContent" = "Key Content"
 "client" = "Client"
 "uid" = "UID"
 
@@ -144,7 +143,7 @@
 "responseHeader" = "response header"
 
 [pages.inbounds.stream.quic]
-"encryption" = "encryption"
+"encryption" = "Encryption"
 
 
 [pages.setting]
@@ -154,7 +153,7 @@
 "restartPanelDesc" = "Are you sure you want to restart the panel? Click OK to restart after 3 seconds. If you cannot access the panel after restarting, please go to the server to view the panel log information"
 "panelConfig" = "Panel Configuration"
 "userSetting" = "User Setting"
-"xrayConfiguration" = "xray Configuration"
+"xrayConfiguration" = "Xray Configuration"
 "TGReminder" = "TG Reminder Related Settings"
 "otherSetting" = "Other Setting"
 "panelListeningIP" = "Panel listening IP"
diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml
index 774f9408..807a08fa 100644
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -102,7 +102,7 @@
 "resetTraffic" = "ریست ترافیک"
 "addInbound" = "اضافه کردن سرویس"
 "addTo" = "اضافه کردن"
-"revise" = "ویرایش"
+"revise" = "ذخیره"
 "modifyInbound" = "ویرایش سرویس"
 "deleteInbound" = "حذف سرویس"
 "deleteInboundContent" = "آیا مطمئن به حذف سرویس هستید ؟"
-- 
cgit v1.2.3