Merge branch 'wg-easy:master' into master

Dartegnian · Jul 6, 2024 · c6a653d · c6a653d
2 parents 3224f74 + 7ecf7b0
commit c6a653d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/How_to_generate_an_bcrypt_hash.md b/How_to_generate_an_bcrypt_hash.md
@@ -31,9 +31,9 @@ pip3 install bcrypt --break-system-packages
 ```bash
 sudo dnf update
 sudo dnf install python3 python3-pip
-# If you use have install python using apt
+# If you use have install python using dnf
 sudo dnf install python3-bcrypt
-# If don't install python using apt
+# If don't install python using dnf
 pip3 install bcrypt
 # If you got externally-managed-environment error
 pip3 install bcrypt --break-system-packages
@@ -43,9 +43,9 @@ pip3 install bcrypt --break-system-packages
 ```bash
 sudo pacman -Syy
 sudo pacman -S python python-pip
-# If you use have install python using apt
+# If you use have install python using pacman
 sudo pacman -S python-bcrypt
-# If don't install python using apt
+# If don't install python using pacman
 pip3 install bcrypt
 # If you got externally-managed-environment error
 pip3 install bcrypt --break-system-packages
@@ -98,4 +98,4 @@ The hashed password for an docker env is: $$2b$$12$$NRiL4Kw4dKid.ix2WvZltOmaQBZj
 The docker line ``PASSWORD_HASH`` will be:
 ```txt
 PASSWORD_HASH=$$2b$$12$$NRiL4Kw4dKid.ix2WvZltOmaQBZjoX30shjHJXRVdEGshAxYWXXMe
-```
+```
diff --git a/src/www/js/i18n.js b/src/www/js/i18n.js
@@ -445,27 +445,27 @@ const messages = { // eslint-disable-line no-unused-vars
     password: '密碼',
     signIn: '登入',
     logout: '登出',
-    updateAvailable: '有新版本可用！',
+    updateAvailable: '有新版本可以使用！',
     update: '更新',
-    clients: '客戶',
-    new: '新建',
-    deleteClient: '刪除客戶',
+    clients: '使用者',
+    new: '建立',
+    deleteClient: '刪除使用者',
     deleteDialog1: '您確定要刪除',
-    deleteDialog2: '此操作無法撤銷。',
+    deleteDialog2: '此作業無法復原。',
     cancel: '取消',
     create: '建立',
     createdOn: '建立於 ',
-    lastSeen: '最後訪問於 ',
+    lastSeen: '最後存取於 ',
     totalDownload: '總下載: ',
     totalUpload: '總上傳: ',
-    newClient: '新客戶',
-    disableClient: '禁用客戶',
-    enableClient: '啟用客戶',
-    noClients: '目前沒有客戶。',
-    showQR: '顯示二維碼',
-    downloadConfig: '下載配置',
+    newClient: '新用戶',
+    disableClient: '停用使用者',
+    enableClient: '啟用使用者',
+    noClients: '目前沒有使用者。',
+    showQR: '顯示 QR Code',
+    downloadConfig: '下載 Config 檔',
     madeBy: '由',
-    donate: '捐贈',
+    donate: '抖內',
   },
   it: {
     name: 'Nome',