diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml
new file mode 100644
index 00000000..4958cac5
--- /dev/null
+++ b/.github/workflows/docker-image-build.yml
@@ -0,0 +1,78 @@
+name: Docker Image Build
+
+on:
+ push:
+ paths:
+ - "src/**"
+ - "migrations/**"
+ - "Cargo.*"
+ - "build.rs"
+ - "rust-toolchain.toml"
+ - "rustfmt.toml"
+ - "diesel.toml"
+ - "docker/Dockerfile.j2"
+ - "docker/DockerSettings.yaml"
+ workflow_dispatch:
+
+env:
+ ALI_REG: registry.cn-beijing.aliyuncs.com
+ ALI_PATH: registry.cn-beijing.aliyuncs.com/andrew-vaultwarden/vaultwarden
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ name: build
+ steps:
+ - name: Checkout
+ uses: actions/checkout@master
+ with:
+ fetch-depth: 0
+
+ - name: Get current time
+ uses: josStorer/get-current-time@master
+ id: time
+ with:
+ format: YYYY.MM.DD.HHmm
+ utcOffset: "+08:00"
+
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@master
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Login to Docker Aliyun registry
+ uses: docker/login-action@master
+ with:
+ registry: ${{ env.ALI_REG }}
+ username: ${{ secrets.DOCKER_USERNAME }}
+ password: ${{ secrets.DOCKER_PASSWORD }}
+
+ # Start Docker Buildx
+ - name: Setup Docker Buildx
+ uses: docker/setup-buildx-action@v3
+ # https://github.com/moby/buildkit/issues/3969
+ # Also set max parallelism to 2, the default of 4 breaks GitHub Actions and causes OOMKills
+ with:
+ buildkitd-config-inline: |
+ [worker.oci]
+ max-parallelism = 2
+ driver-opts: network=host
+
+ - name: Build the Docker image
+ uses: docker/build-push-action@master
+ with:
+ context: .
+ file: Dockerfile
+ push: true
+ tags: ${{ env.ALI_PATH }}:v${{ steps.time.outputs.formattedTime }}
+ build-args: DB=sqlite
+ cache-to: type=gha,mode=max
+ cache-from: type=gha
+
+ - name: Logout from Docker Registries
+ run: docker logout ${{ env.ALI_REG }}
+
+ - name: Logout from Docker Registries
+ run: docker logout ghcr.io
diff --git a/.github/workflows/docker-image-cleanup.yml b/.github/workflows/docker-image-cleanup.yml
new file mode 100644
index 00000000..cc097324
--- /dev/null
+++ b/.github/workflows/docker-image-cleanup.yml
@@ -0,0 +1,37 @@
+name: Docker Image Cleanup
+
+on:
+ schedule:
+ - cron: "0 3 * * SAT"
+ workflow_dispatch:
+
+env:
+ ALI_BJ_REGISTER: registry.cn-beijing.aliyuncs.com
+ ALI_BJ_REPOSITORY: andrew-vaultwarden
+
+jobs:
+ manage-images:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Login to Docker Registry
+ uses: docker/login-action@master
+ with:
+ registry: ${{ env.ALI_BJ_REGISTER }}
+ username: ${{ secrets.DOCKER_USERNAME }}
+ password: ${{ secrets.DOCKER_PASSWORD }}
+
+ - name: List Images from Specific Repository
+ run: |
+ images=$(docker images ${{ env.ALI_BJ_REPOSITORY }} --format "{{.Created}}\t{{.ID}}" | sort)
+ echo "$images"
+ ids_to_delete=("${images[@]:3}")
+ if [ ${#ids_to_delete[@]} -ne 0 ]; then
+ for id in "${ids_to_delete[@]}"; do
+ echo "Del $id"
+ docker image rm $id
+ done
+ fi
+
+ - name: Logout
+ run: docker logout ${{ env.ALI_BJ_REGISTER }}
diff --git a/.github/workflows/fork-update.yml b/.github/workflows/fork-update.yml
new file mode 100644
index 00000000..0a867fbc
--- /dev/null
+++ b/.github/workflows/fork-update.yml
@@ -0,0 +1,34 @@
+name: Upstream Sync
+
+permissions:
+ contents: write
+
+on:
+ schedule:
+ - cron: "0 3 * * THU"
+ workflow_dispatch:
+
+jobs:
+ sync_with_upstream:
+ name: Sync with Upstream
+ runs-on: ubuntu-latest
+ if: ${{ github.event.repository.fork }}
+
+ steps:
+ - name: Checkout target repo
+ uses: actions/checkout@master
+
+ - name: Sync Upstream
+ uses: aormsby/Fork-Sync-With-Upstream-action@main
+ with:
+ target_repo_token: ${{ secrets.GITHUB_TOKEN }}
+ upstream_sync_repo: dani-garcia/vaultwarden
+ upstream_sync_branch: main
+ target_sync_branch: main
+ test_mode: false
+
+ - name: Check for Failure
+ if: failure()
+ run: |
+ echo "[Error] Due to a change in the workflow file of the upstream repository, GitHub has automatically suspended the scheduled automatic update. You need to manually sync your fork."
+ exit 1
diff --git a/src/static/templates/email/admin_reset_password.hbs b/src/static/templates/email/admin_reset_password.hbs
index f70423f1..8ce4aaae 100644
--- a/src/static/templates/email/admin_reset_password.hbs
+++ b/src/static/templates/email/admin_reset_password.hbs
@@ -1,4 +1,4 @@
-Master Password Has Been Changed
+主密码已更改
-The master password for {{user_name}} has been changed by an administrator in your {{org_name}} organization. If you did not initiate this request, please reach out to your administrator immediately.
+{{org_name}} 组织中的管理员已更改 {{user_name}} 的主密码。如果您未发起此请求,请立即联系您的管理员。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/admin_reset_password.html.hbs b/src/static/templates/email/admin_reset_password.html.hbs
index d9749d22..863a825b 100644
--- a/src/static/templates/email/admin_reset_password.html.hbs
+++ b/src/static/templates/email/admin_reset_password.html.hbs
@@ -1,11 +1,11 @@
-Master Password Has Been Changed
+主密码已更改
{{> email/email_header }}
- The master password for {{user_name}} has been changed by an administrator in your {{org_name}} organization. If you did not initiate this request, please reach out to your administrator immediately.
+ {{user_name}} 在您的 {{org_name}} 组织中的管理员已更改主密码。如果您未发起此请求,请立即联系您的管理员。
|
-{{> email/email_footer }}
+{{> email/email_footer }}
\ No newline at end of file
diff --git a/src/static/templates/email/change_email.hbs b/src/static/templates/email/change_email.hbs
index f5276512..2291a7ec 100644
--- a/src/static/templates/email/change_email.hbs
+++ b/src/static/templates/email/change_email.hbs
@@ -1,6 +1,6 @@
-Your Email Change
+您的电子邮件更改
-To finalize changing your email address enter the following code in web vault: {{token}}
+为了完成更改您的电子邮件地址,请在 Web 密码库中输入以下代码:{{token}}
-If you did not try to change your email address, contact your administrator.
-{{> email/email_footer_text }}
+如果您没有尝试更改您的电子邮件地址,请联系您的管理员。
+{{> email/email_footer_text }}
\ No newline at end of file
diff --git a/src/static/templates/email/change_email.html.hbs b/src/static/templates/email/change_email.html.hbs
index 488b085c..2e0327cf 100644
--- a/src/static/templates/email/change_email.html.hbs
+++ b/src/static/templates/email/change_email.html.hbs
@@ -1,15 +1,15 @@
-Your Email Change
+您的电子邮件更改
{{> email/email_header }}
- To finalize changing your email address enter the following code in web vault: {{token}}
+ 为了完成更改您的电子邮件地址,请在Web Vault中输入以下代码:{{token}}
|
- If you did not try to change your email address, contact your administrator.
+ 如果您没有尝试更改您的电子邮件地址,请联系您的管理员。
|
diff --git a/src/static/templates/email/delete_account.hbs b/src/static/templates/email/delete_account.hbs
index 56ef5c7d..5b874b73 100644
--- a/src/static/templates/email/delete_account.hbs
+++ b/src/static/templates/email/delete_account.hbs
@@ -1,8 +1,8 @@
-Delete Your Account
+删除您的帐户
-Click the link below to delete your account.
+点击下面的链接以删除您的帐户。
-Delete Your Account: {{url}}/#/verify-recover-delete?userId={{user_id}}&token={{token}}&email={{email}}
+删除您的帐户:{{url}}/#/verify-recover-delete?userId={{user_id}}&token={{token}}&email={{email}}
-If you did not request this email to delete your account, you can safely ignore this email.
+如果您没有请求通过此电子邮件删除您的帐户,请安全地忽略此电子邮件。
{{> email/email_footer_text }}
\ No newline at end of file
diff --git a/src/static/templates/email/delete_account.html.hbs b/src/static/templates/email/delete_account.html.hbs
index 431f6165..45cfaf5c 100644
--- a/src/static/templates/email/delete_account.html.hbs
+++ b/src/static/templates/email/delete_account.html.hbs
@@ -1,23 +1,23 @@
-Delete Your Account
+删除您的帐户
{{> email/email_header }}
- Click the link below to delete your account.
+ 点击下面的链接以删除您的帐户。
|
- Delete Your Account
+ 删除您的帐户
|
- If you did not request this email to delete your account, you can safely ignore this email.
+ 如果您没有请求通过此电子邮件删除您的帐户,请安全地忽略此电子邮件。
|
diff --git a/src/static/templates/email/email_footer.hbs b/src/static/templates/email/email_footer.hbs
index cbc19c7c..f454d544 100644
--- a/src/static/templates/email/email_footer.hbs
+++ b/src/static/templates/email/email_footer.hbs
@@ -10,7 +10,7 @@
-  |
+  |
|
diff --git a/src/static/templates/email/email_footer_text.hbs b/src/static/templates/email/email_footer_text.hbs
index c741b954..9ddd209f 100644
--- a/src/static/templates/email/email_footer_text.hbs
+++ b/src/static/templates/email/email_footer_text.hbs
@@ -1,3 +1,3 @@
===
-Github: https://github.com/dani-garcia/vaultwarden
+Github: https://github.com/zituoguan/vaultwarden-lang-zh_CN
diff --git a/src/static/templates/email/emergency_access_invite_accepted.hbs b/src/static/templates/email/emergency_access_invite_accepted.hbs
index 88382b1b..3253eba0 100644
--- a/src/static/templates/email/emergency_access_invite_accepted.hbs
+++ b/src/static/templates/email/emergency_access_invite_accepted.hbs
@@ -1,8 +1,8 @@
-Emergency access contact {{{grantee_email}}} accepted
+紧急访问联系人 {{{grantee_email}}} 已接受
-This email is to notify you that {{grantee_email}} has accepted your invitation to become an emergency access contact.
+此电子邮件是通知您,{{grantee_email}} 已接受您的邀请成为紧急访问联系人。
-To confirm this user, log into the web vault ({{url}}), go to settings and confirm the user.
+要确认此用户,请登录 Web 密码库 ({{url}}),转到设置并确认用户。
-If you do not wish to confirm this user, you can also remove them on the same page.
+如果您不希望确认此用户,您也可以在同一页面上将其移除。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/emergency_access_invite_accepted.html.hbs b/src/static/templates/email/emergency_access_invite_accepted.html.hbs
index 003b0c1d..547f164a 100644
--- a/src/static/templates/email/emergency_access_invite_accepted.html.hbs
+++ b/src/static/templates/email/emergency_access_invite_accepted.html.hbs
@@ -1,20 +1,20 @@
-Emergency access contact {{{grantee_email}}} accepted
+紧急访问联系人 {{{grantee_email}}} 已接受
{{> email/email_header }}
- This email is to notify you that {{grantee_email}} has accepted your invitation to become an emergency access contact.
+ 此邮件通知您,{{grantee_email}} 已接受您的邀请成为紧急访问联系人。
|
- To confirm this user, log into the web vault, go to settings and confirm the user.
+ 要确认此用户,请登录 Web 密码库,转到设置并确认用户。
|
- If you do not wish to confirm this user, you can also remove them on the same page.
+ 如果您不希望确认此用户,您也可以在同一页面上将其移除。
|
diff --git a/src/static/templates/email/emergency_access_invite_confirmed.hbs b/src/static/templates/email/emergency_access_invite_confirmed.hbs
index 1417bb6b..cde4baf4 100644
--- a/src/static/templates/email/emergency_access_invite_confirmed.hbs
+++ b/src/static/templates/email/emergency_access_invite_confirmed.hbs
@@ -1,6 +1,6 @@
-Emergency access contact for {{{grantor_name}}} confirmed
+紧急访问联系人已确认,由 {{{grantor_name}}} 指定
-This email is to notify you that you have been confirmed as an emergency access contact for *{{grantor_name}}*.
+此电子邮件是通知您,您已被确认为 *{{grantor_name}}* 的紧急访问联系人。
-You can now initiate emergency access requests from the web vault ({{url}}).
+您现在可以从 Web 密码库 ({{url}}) 发起紧急访问请求。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/emergency_access_invite_confirmed.html.hbs b/src/static/templates/email/emergency_access_invite_confirmed.html.hbs
index a8dd6f62..50946de0 100644
--- a/src/static/templates/email/emergency_access_invite_confirmed.html.hbs
+++ b/src/static/templates/email/emergency_access_invite_confirmed.html.hbs
@@ -1,15 +1,15 @@
-Emergency access contact for {{{grantor_name}}} confirmed
+已确认 {{{grantor_name}}} 的紧急访问联系人身份
{{> email/email_header }}
- This email is to notify you that you have been confirmed as an emergency access contact for {{grantor_name}}.
+ 此电子邮件是通知您,您已被确认为 {{grantor_name}} 的紧急访问联系人。
|
- You can now initiate emergency access requests from the web vault.
+ 您现在可以从 Web 密码库 发起紧急访问请求。
|
diff --git a/src/static/templates/email/emergency_access_recovery_approved.hbs b/src/static/templates/email/emergency_access_recovery_approved.hbs
index 8c2a7cc9..f7fd2144 100644
--- a/src/static/templates/email/emergency_access_recovery_approved.hbs
+++ b/src/static/templates/email/emergency_access_recovery_approved.hbs
@@ -1,4 +1,4 @@
-Emergency access request for {{{grantor_name}}} approved
+已批准 {{{grantor_name}}} 的紧急访问请求
-{{grantor_name}} has approved your emergency access request. You may now login on the web vault ({{url}}) and access their account.
+{{grantor_name}} 已批准您的紧急访问请求。您现在可以登录 Web 密码库 ({{url}}) 并访问其帐户。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/emergency_access_recovery_approved.html.hbs b/src/static/templates/email/emergency_access_recovery_approved.html.hbs
index 90875f03..08bb4329 100644
--- a/src/static/templates/email/emergency_access_recovery_approved.html.hbs
+++ b/src/static/templates/email/emergency_access_recovery_approved.html.hbs
@@ -1,10 +1,10 @@
-Emergency access request for {{{grantor_name}}} approved
+已批准 {{{grantor_name}}} 的紧急访问请求
{{> email/email_header }}
- {{grantor_name}} has approved your emergency access request. You may now login on the web vault and access their account.
+ {{grantor_name}} 已批准您的紧急访问请求。您现在可以登录 Web 密码库 并访问其帐户。
|
diff --git a/src/static/templates/email/emergency_access_recovery_initiated.hbs b/src/static/templates/email/emergency_access_recovery_initiated.hbs
index 072428ac..1e3d548c 100644
--- a/src/static/templates/email/emergency_access_recovery_initiated.hbs
+++ b/src/static/templates/email/emergency_access_recovery_initiated.hbs
@@ -1,6 +1,6 @@
-Emergency access request by {{{grantee_name}}} initiated
+{{{grantee_name}}} 启动了紧急访问请求
-{{grantee_name}} has initiated an emergency access request to {{atype}} your account. You may login on the web vault ({{url}}) and manually approve or reject this request.
+{{grantee_name}} 已启动对您帐户的紧急访问请求,{{atype}}。您可以登录 Web 密码库 ({{url}}) 并手动批准或拒绝此请求。
-If you do nothing, the request will automatically be approved after {{wait_time_days}} day(s).
+如果您不采取任何措施,该请求将在 {{wait_time_days}} 天后自动批准。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/emergency_access_recovery_initiated.html.hbs b/src/static/templates/email/emergency_access_recovery_initiated.html.hbs
index 3d847798..9c960dba 100644
--- a/src/static/templates/email/emergency_access_recovery_initiated.html.hbs
+++ b/src/static/templates/email/emergency_access_recovery_initiated.html.hbs
@@ -1,15 +1,15 @@
-Emergency access request by {{{grantee_name}}} initiated
+{{{grantee_name}}} 启动了紧急访问请求
{{> email/email_header }}
- {{grantee_name}} has initiated an emergency access request to {{atype}} your account. You may login on the web vault and manually approve or reject this request.
+ {{grantee_name}} 启动了对您帐户的紧急访问请求,{{atype}}。您可以登录 Web 密码库 并手动批准或拒绝此请求。
|
- If you do nothing, the request will automatically be approved after {{wait_time_days}} day(s).
+ 如果您不采取任何措施,该请求将在 {{wait_time_days}} 天后自动批准。
|
diff --git a/src/static/templates/email/emergency_access_recovery_rejected.hbs b/src/static/templates/email/emergency_access_recovery_rejected.hbs
index 674a2e5f..b2504951 100644
--- a/src/static/templates/email/emergency_access_recovery_rejected.hbs
+++ b/src/static/templates/email/emergency_access_recovery_rejected.hbs
@@ -1,4 +1,4 @@
-Emergency access request to {{{grantor_name}}} rejected
+紧急访问请求被 {{{grantor_name}}} 拒绝
-{{grantor_name}} has rejected your emergency access request.
+{{grantor_name}} 拒绝了您的紧急访问请求。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/emergency_access_recovery_rejected.html.hbs b/src/static/templates/email/emergency_access_recovery_rejected.html.hbs
index 69f9ca51..1705e50f 100644
--- a/src/static/templates/email/emergency_access_recovery_rejected.html.hbs
+++ b/src/static/templates/email/emergency_access_recovery_rejected.html.hbs
@@ -1,10 +1,10 @@
-Emergency access request to {{{grantor_name}}} rejected
+紧急访问请求被 {{{grantor_name}}} 拒绝
{{> email/email_header }}
- {{grantor_name}} has rejected your emergency access request.
+ {{grantor_name}} 拒绝了您的紧急访问请求。
|
diff --git a/src/static/templates/email/emergency_access_recovery_reminder.hbs b/src/static/templates/email/emergency_access_recovery_reminder.hbs
index c2f912f5..8522918d 100644
--- a/src/static/templates/email/emergency_access_recovery_reminder.hbs
+++ b/src/static/templates/email/emergency_access_recovery_reminder.hbs
@@ -1,6 +1,6 @@
-Emergency access request by {{{grantee_name}}} is pending
+{{{grantee_name}}} 的紧急访问请求正在等待中
-{{grantee_name}} has a pending emergency access request to {{atype}} your account. You may login on the web vault ({{url}}) and manually approve or reject this request.
+{{grantee_name}} 已发起对您的帐户进行{{atype}}的紧急访问请求。您可以登录到 Web 密码库 并手动批准或拒绝此请求。
-If you do nothing, the request will automatically be approved after {{days_left}} day(s).
+如果您不采取任何措施,该请求将在 {{days_left}} 天后自动批准。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/emergency_access_recovery_reminder.html.hbs b/src/static/templates/email/emergency_access_recovery_reminder.html.hbs
index ce2d6b37..b0f14ee3 100644
--- a/src/static/templates/email/emergency_access_recovery_reminder.html.hbs
+++ b/src/static/templates/email/emergency_access_recovery_reminder.html.hbs
@@ -1,15 +1,15 @@
-Emergency access request by {{{grantee_name}}} is pending
+紧急访问请求由 {{{grantee_name}}} 提出,目前处于待处理状态
{{> email/email_header }}
- {{grantee_name}} has a pending emergency access request to {{atype}} your account. You may login on the web vault and manually approve or reject this request.
+ {{grantee_name}} 正在对您的帐户提出紧急访问请求,请求类型为 {{atype}}。您可以登录到 Web 密码库 手动批准或拒绝此请求。
|
- If you do nothing, the request will automatically be approved after {{days_left}} day(s).
+ 如果您不采取任何措施,请求将在 {{days_left}} 天后自动批准。
|
diff --git a/src/static/templates/email/emergency_access_recovery_timed_out.hbs b/src/static/templates/email/emergency_access_recovery_timed_out.hbs
index a4d564c8..0278d2fc 100644
--- a/src/static/templates/email/emergency_access_recovery_timed_out.hbs
+++ b/src/static/templates/email/emergency_access_recovery_timed_out.hbs
@@ -1,4 +1,4 @@
-Emergency access request by {{{grantee_name}}} granted
+紧急访问请求由 {{{grantee_name}}} 批准
-{{grantee_name}} has been granted emergency access to {{atype}} your account. You may login on the web vault ({{url}}) and manually revoke this request.
+{{grantee_name}} 已被授予对您的帐户的紧急访问权限,访问类型为 {{atype}}。您可以登录到 Web 密码库 ({{url}}) 并手动撤销此请求。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/emergency_access_recovery_timed_out.html.hbs b/src/static/templates/email/emergency_access_recovery_timed_out.html.hbs
index 74918bbe..b9ed774f 100644
--- a/src/static/templates/email/emergency_access_recovery_timed_out.html.hbs
+++ b/src/static/templates/email/emergency_access_recovery_timed_out.html.hbs
@@ -1,10 +1,10 @@
-Emergency access request by {{{grantee_name}}} granted
+紧急访问请求由 {{{grantee_name}}} 批准
{{> email/email_header }}
- {{grantee_name}} has been granted emergency access to {{atype}} your account. You may login on the web vault and manually revoke this request.
+ {{grantee_name}} 已被授予对您的帐户的紧急访问权限,访问类型为 {{atype}}。您可以登录到 Web 密码库 并手动撤销此请求。
|
diff --git a/src/static/templates/email/incomplete_2fa_login.hbs b/src/static/templates/email/incomplete_2fa_login.hbs
index d9ff3950..5414ac69 100644
--- a/src/static/templates/email/incomplete_2fa_login.hbs
+++ b/src/static/templates/email/incomplete_2fa_login.hbs
@@ -1,10 +1,10 @@
-Incomplete Two-Step Login From {{{device}}}
+不完整的两步登录来自 {{{device}}}
-Someone attempted to log into your account with the correct master password, but did not provide the correct token or action required to complete the two-step login process within {{time_limit}} minutes of the initial login attempt.
+有人尝试使用正确的主密码登录您的帐户,但在初始登录尝试后的 {{time_limit}} 分钟内未提供正确的令牌或完成两步登录过程所需的操作。
-* Date: {{datetime}}
-* IP Address: {{ip}}
-* Device Type: {{device}}
+* 日期:{{datetime}}
+* IP 地址:{{ip}}
+* 设备类型:{{device}}
-If this was not you or someone you authorized, then you should change your master password as soon as possible, as it is likely to be compromised.
+如果这不是您或您授权的人进行的操作,那么您应尽快更改主密码,因为可能已经遭到破坏。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/incomplete_2fa_login.html.hbs b/src/static/templates/email/incomplete_2fa_login.html.hbs
index 8bc1ce21..d30daa84 100644
--- a/src/static/templates/email/incomplete_2fa_login.html.hbs
+++ b/src/static/templates/email/incomplete_2fa_login.html.hbs
@@ -1,30 +1,30 @@
-Incomplete Two-Step Login From {{{device}}}
+不完整的两步登录来自 {{{device}}}
{{> email/email_header }}
- Someone attempted to log into your account with the correct master password, but did not provide the correct token or action required to complete the two-step login process within {{time_limit}} minutes of the initial login attempt.
+ 有人尝试使用正确的主密码登录您的帐户,但在初始登录尝试后的 {{time_limit}} 分钟内未提供正确的令牌或完成两步登录过程所需的操作。
|
- Date: {{datetime}}
+ 日期: {{datetime}}
|
- IP Address: {{ip}}
+ IP 地址: {{ip}}
|
- Device Type: {{device}}
+ 设备类型: {{device}}
|
- If this was not you or someone you authorized, then you should change your master password as soon as possible, as it is likely to be compromised.
+ 如果这不是您或您授权的人进行的操作,那么您应尽快更改主密码,因为可能已经遭到破坏。
|
diff --git a/src/static/templates/email/invite_accepted.hbs b/src/static/templates/email/invite_accepted.hbs
index abe3d10b..93f3edb1 100644
--- a/src/static/templates/email/invite_accepted.hbs
+++ b/src/static/templates/email/invite_accepted.hbs
@@ -1,5 +1,5 @@
-Invitation to {{{org_name}}} accepted
+邀请加入 {{{org_name}}} 已接受
-This email is to notify you that {{email}} has accepted your invitation to join {{org_name}}.
-Please log in via {{url}} to the vaultwarden server and confirm them from the organization management page.
-{{> email/email_footer_text }}
\ No newline at end of file
+此电子邮件是通知您,{{email}} 已接受您的邀请加入 {{org_name}}。
+请通过 {{url}} 登录到 Vaultwarden 服务器,并在组织管理页面确认其加入。
+{{> email/email_footer_text }}
diff --git a/src/static/templates/email/invite_accepted.html.hbs b/src/static/templates/email/invite_accepted.html.hbs
index c02fd3ac..9e4ec2d6 100644
--- a/src/static/templates/email/invite_accepted.html.hbs
+++ b/src/static/templates/email/invite_accepted.html.hbs
@@ -1,21 +1,21 @@
-Invitation to {{{org_name}}} accepted
+邀请加入 {{{org_name}}} 已接受
{{> email/email_header }}
- This email is to notify you that {{email}} has accepted your invitation to join {{org_name}}.
+ 此电子邮件是通知您,{{email}} 已接受您的邀请加入 {{org_name}}。
|
- Please log in to the vaultwarden server and confirm them from the organization management page.
+ 请通过 登录 到 Vaultwarden 服务器,并在组织管理页面确认其加入。
|
- If you do not wish to confirm this user, you can also remove them from the organization on the same page.
+ 如果您不希望确认此用户,您也可以在同一页上将其从组织中删除。
|
-{{> email/email_footer }}
\ No newline at end of file
+{{> email/email_footer }}
diff --git a/src/static/templates/email/invite_confirmed.hbs b/src/static/templates/email/invite_confirmed.hbs
index e14153b8..9da5ac13 100644
--- a/src/static/templates/email/invite_confirmed.hbs
+++ b/src/static/templates/email/invite_confirmed.hbs
@@ -1,5 +1,5 @@
-Invitation to {{{org_name}}} confirmed
+邀请加入 {{{org_name}}} 已确认
-This email is to notify you that you have been confirmed as a user of {{org_name}}.
-Any collections and logins being shared with you by this organization will now appear in your Vaultwarden vault at {{url}}.
-{{> email/email_footer_text }}
\ No newline at end of file
+此电子邮件是通知您,您已被确认为 {{org_name}} 的用户。
+此组织共享给您的任何收藏和登录信息现在将出现在您的 Vaultwarden 密码库中,网址为 {{url}}。
+{{> email/email_footer_text }}
diff --git a/src/static/templates/email/invite_confirmed.html.hbs b/src/static/templates/email/invite_confirmed.html.hbs
index d6edb9f9..c417304a 100644
--- a/src/static/templates/email/invite_confirmed.html.hbs
+++ b/src/static/templates/email/invite_confirmed.html.hbs
@@ -1,17 +1,17 @@
-Invitation to {{{org_name}}} confirmed
+邀请加入 {{{org_name}}} 已确认
{{> email/email_header }}
- This email is to notify you that you have been confirmed as a user of {{org_name}}.
+ 此电子邮件是通知您,您已被确认为 {{org_name}} 的用户。
|
- Any collections and logins being shared with you by this organization will now appear in your Vaultwarden vault.
- Log in
+ 此组织与您分享的任何收藏和登录信息现在将显示在您的 Vaultwarden 密码库中。
+ 登录
|
-{{> email/email_footer }}
\ No newline at end of file
+{{> email/email_footer }}
diff --git a/src/static/templates/email/new_device_logged_in.hbs b/src/static/templates/email/new_device_logged_in.hbs
index 9734dcbe..693a6aa3 100644
--- a/src/static/templates/email/new_device_logged_in.hbs
+++ b/src/static/templates/email/new_device_logged_in.hbs
@@ -1,10 +1,10 @@
-New Device Logged In From {{{device}}}
+从新设备登录到您的帐户
-Your account was just logged into from a new device.
+您的帐户刚刚从新设备登录。
-* Date: {{datetime}}
-* IP Address: {{ip}}
-* Device Type: {{device}}
+* 日期:{{datetime}}
+* IP 地址:{{ip}}
+* 设备类型:{{device}}
-You can deauthorize all devices that have access to your account from the web vault ( {{url}} ) under Settings > My Account > Deauthorize Sessions.
-{{> email/email_footer_text }}
\ No newline at end of file
+您可以在 Web 密码库({{url}})的“设置” > “我的帐户” > “取消授权会话”下取消所有访问您帐户的设备的授权。
+{{> email/email_footer_text }}
diff --git a/src/static/templates/email/new_device_logged_in.html.hbs b/src/static/templates/email/new_device_logged_in.html.hbs
index 763e7994..82d5ef84 100644
--- a/src/static/templates/email/new_device_logged_in.html.hbs
+++ b/src/static/templates/email/new_device_logged_in.html.hbs
@@ -1,30 +1,30 @@
-New Device Logged In From {{{device}}}
+从新设备登录到您的帐户
{{> email/email_header }}
- Your account was just logged into from a new device.
+ 您的帐户刚刚从新设备登录。
|
- Date: {{datetime}}
+ 日期: {{datetime}}
|
- IP Address: {{ip}}
+ IP 地址: {{ip}}
|
- Device Type: {{device}}
+ 设备类型: {{device}}
|
- You can deauthorize all devices that have access to your account from the web vault under Settings > My Account > Deauthorize Sessions.
+ 您可以在 Web 密码库 的“设置” > “我的帐户” > “取消授权会话”下取消所有访问您帐户的设备的授权。
|
diff --git a/src/static/templates/email/protected_action.hbs b/src/static/templates/email/protected_action.hbs
index 98564199..e7ad6b8e 100644
--- a/src/static/templates/email/protected_action.hbs
+++ b/src/static/templates/email/protected_action.hbs
@@ -1,6 +1,6 @@
-Your Vaultwarden Verification Code
+您的 Vaultwarden 验证码
-Your email verification code is: {{token}}
+您的电子邮件验证码是:{{token}}
-Use this code to complete the protected action in Vaultwarden.
+使用此代码完成 Vaultwarden 中的受保护操作。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/protected_action.html.hbs b/src/static/templates/email/protected_action.html.hbs
index 894447bc..d7941e4a 100644
--- a/src/static/templates/email/protected_action.html.hbs
+++ b/src/static/templates/email/protected_action.html.hbs
@@ -1,15 +1,15 @@
-Your Vaultwarden Verification Code
+您的 Vaultwarden 验证码
{{> email/email_header }}
- Your email verification code is: {{token}}
+ 您的电子邮件验证码是:{{token}}
|
- Use this code to complete the protected action in Vaultwarden.
+ 使用此代码完成 Vaultwarden 中的受保护操作。
|
diff --git a/src/static/templates/email/pw_hint_none.hbs b/src/static/templates/email/pw_hint_none.hbs
index 88c7465e..ecb73138 100644
--- a/src/static/templates/email/pw_hint_none.hbs
+++ b/src/static/templates/email/pw_hint_none.hbs
@@ -1,8 +1,8 @@
-Your master password hint
+您的主密码提示
-You (or someone) recently requested your master password hint. Unfortunately, your account does not have a master password hint.
+您(或其他人)最近请求了您的主密码提示。不幸的是,您的帐户没有主密码提示。
-If you cannot remember your master password, there is no way to recover your data. The only option to gain access to your account again is to delete the account ( {{url}}/#/recover-delete ) so that you can register again and start over. All data associated with your account will be deleted.
+如果您无法记住主密码,则无法恢复您的数据。再次访问帐户的唯一选择是删除帐户({{url}}/#/recover-delete),然后您可以重新注册并重新开始。与您的帐户关联的所有数据将被删除。
-If you did not request your master password hint you can safely ignore this email.
-{{> email/email_footer_text }}
\ No newline at end of file
+如果您没有请求主密码提示,可以安全地忽略此电子邮件。
+{{> email/email_footer_text }}
diff --git a/src/static/templates/email/pw_hint_none.html.hbs b/src/static/templates/email/pw_hint_none.html.hbs
index f9f7b853..a9736621 100644
--- a/src/static/templates/email/pw_hint_none.html.hbs
+++ b/src/static/templates/email/pw_hint_none.html.hbs
@@ -1,21 +1,21 @@
-Sorry, you have no password hint...
+对不起,您没有密码提示...
{{> email/email_header }}
- You (or someone) recently requested your master password hint. Unfortunately, your account does not have a master password hint.
+ 您(或其他人)最近请求了您的主密码提示。不幸的是,您的帐户没有主密码提示。
|
- If you cannot remember your master password, there is no way to recover your data. The only option to gain access to your account again is to delete the account so that you can register again and start over. All data associated with your account will be deleted.
+ 如果您无法记住主密码,则无法恢复您的数据。再次访问帐户的唯一选择是删除帐户,然后您可以重新注册并重新开始。与您的帐户关联的所有数据将被删除。
|
- If you did not request your master password hint you can safely ignore this email.
+ 如果您没有请求主密码提示,可以安全地忽略此电子邮件。
|
-{{> email/email_footer }}
\ No newline at end of file
+{{> email/email_footer }}
diff --git a/src/static/templates/email/pw_hint_some.hbs b/src/static/templates/email/pw_hint_some.hbs
index 514d43c7..47cffab6 100644
--- a/src/static/templates/email/pw_hint_some.hbs
+++ b/src/static/templates/email/pw_hint_some.hbs
@@ -1,11 +1,11 @@
-Your master password hint
+您的主密码提示
-You (or someone) recently requested your master password hint.
+您(或他人)最近请求了您的主密码提示。
-Your hint is: *{{hint}}*
-Log in to the web vault: {{url}}
+提示为:*{{hint}}*
+登录到 Web 密码库:{{url}}
-If you cannot remember your master password, there is no way to recover your data. The only option to gain access to your account again is to delete the account ( {{url}}/#/recover-delete ) so that you can register again and start over. All data associated with your account will be deleted.
+如果您无法记住主密码,那么恢复数据的方法是不存在的。您再次访问账户的唯一选项是删除账户({{url}}/#/recover-delete),然后可以重新注册并重新开始。与您的账户相关的所有数据将被删除。
-If you did not request your master password hint you can safely ignore this email.
-{{> email/email_footer_text }}
\ No newline at end of file
+如果您未请求主密码提示,请安全地忽略此电子邮件。
+{{> email/email_footer_text }}
diff --git a/src/static/templates/email/pw_hint_some.html.hbs b/src/static/templates/email/pw_hint_some.html.hbs
index 095b7aae..d9554e2f 100644
--- a/src/static/templates/email/pw_hint_some.html.hbs
+++ b/src/static/templates/email/pw_hint_some.html.hbs
@@ -1,27 +1,27 @@
-Your master password hint
+您的主密码提示
{{> email/email_header }}
- You (or someone) recently requested your master password hint.
+ 您(或其他人)最近请求了您的主密码提示。
|
- Your hint is: "{{hint}}"
- Log in: Web Vault
+ 您的提示是:“{{hint}}”
+ 登录:Web 密码库
|
- If you cannot remember your master password, there is no way to recover your data. The only option to gain access to your account again is to delete the account so that you can register again and start over. All data associated with your account will be deleted.
+ 如果您无法记住主密码,那么恢复数据的方法是不存在的。您再次访问账户的唯一选项是删除账户,然后可以重新注册并重新开始。与您的账户相关的所有数据将被删除。
|
- If you did not request your master password hint you can safely ignore this email.
+ 如果您未请求主密码提示,请安全地忽略此电子邮件。
|
-{{> email/email_footer }}
\ No newline at end of file
+{{> email/email_footer }}
diff --git a/src/static/templates/email/send_2fa_removed_from_org.hbs b/src/static/templates/email/send_2fa_removed_from_org.hbs
index 79956bbb..f229c770 100644
--- a/src/static/templates/email/send_2fa_removed_from_org.hbs
+++ b/src/static/templates/email/send_2fa_removed_from_org.hbs
@@ -1,7 +1,7 @@
-Removed from {{{org_name}}}
+已从{{{org_name}}}中移除
-You have been removed from organization *{{org_name}}* because your account does not have Two-step Login enabled.
+您已从组织 *{{org_name}}* 中移除,因为您的帐户未启用两步登录。
-You can enable Two-step Login in your account settings.
-{{> email/email_footer_text }}
+您可以在帐户设置中启用两步登录。
+{{> email/email_footer_text }}
\ No newline at end of file
diff --git a/src/static/templates/email/send_2fa_removed_from_org.html.hbs b/src/static/templates/email/send_2fa_removed_from_org.html.hbs
index 6588a320..84d8f41e 100644
--- a/src/static/templates/email/send_2fa_removed_from_org.html.hbs
+++ b/src/static/templates/email/send_2fa_removed_from_org.html.hbs
@@ -1,15 +1,15 @@
-Removed from {{{org_name}}}
+已从{{{org_name}}}中移除
{{> email/email_header }}
- You have been removed from organization {{org_name}} because your account does not have Two-step Login enabled.
+ 您已从组织 {{org_name}} 中移除,因为您的帐户未启用两步登录。
|
- You can enable Two-step Login in your account settings.
+ 您可以在帐户设置中启用两步登录。
|
diff --git a/src/static/templates/email/send_emergency_access_invite.hbs b/src/static/templates/email/send_emergency_access_invite.hbs
index 9dc114c0..9db5b907 100644
--- a/src/static/templates/email/send_emergency_access_invite.hbs
+++ b/src/static/templates/email/send_emergency_access_invite.hbs
@@ -1,8 +1,8 @@
-Emergency access for {{{grantor_name}}}
+应急访问权限已授予{{{grantor_name}}}
-You have been invited to become an emergency contact for {{grantor_name}}. To accept this invite, click the following link:
+您已被邀请成为{{grantor_name}}的紧急联系人。要接受此邀请,请单击以下链接:
-Click here to join: {{url}}/#/accept-emergency/?id={{emer_id}}&name={{grantor_name}}&email={{email}}&token={{token}}
+单击此处加入:{{url}}/#/accept-emergency/?id={{emer_id}}&name={{grantor_name}}&email={{email}}&token={{token}}
-If you do not wish to become an emergency contact for {{grantor_name}}, you can safely ignore this email.
+如果您不希望成为{{grantor_name}}的紧急联系人,则可以安全地忽略此电子邮件。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/send_emergency_access_invite.html.hbs b/src/static/templates/email/send_emergency_access_invite.html.hbs
index fd1c0400..0a5b10b1 100644
--- a/src/static/templates/email/send_emergency_access_invite.html.hbs
+++ b/src/static/templates/email/send_emergency_access_invite.html.hbs
@@ -1,24 +1,24 @@
-Emergency access for {{{grantor_name}}}
+紧急访问权限已授予{{{grantor_name}}}
{{> email/email_header }}
- You have been invited to become an emergency contact for {{grantor_name}}.
+ 您已被邀请成为{{grantor_name}}的紧急联系人。
|
- Become emergency contact
+ 成为紧急联系人
|
- If you do not wish to become an emergency contact for {{grantor_name}}, you can safely ignore this email.
+ 如果您不希望成为{{grantor_name}}的紧急联系人,则可以安全地忽略此电子邮件。
|
-{{> email/email_footer }}
\ No newline at end of file
+{{> email/email_footer }}
diff --git a/src/static/templates/email/send_org_invite.hbs b/src/static/templates/email/send_org_invite.hbs
index b2c46f50..ae098020 100644
--- a/src/static/templates/email/send_org_invite.hbs
+++ b/src/static/templates/email/send_org_invite.hbs
@@ -1,10 +1,10 @@
-Join {{{org_name}}}
+加入 {{{org_name}}}
-You have been invited to join the *{{org_name}}* organization.
+您已被邀请加入*{{org_name}}*组织。
-Click here to join: {{url}}
+点击这里加入: {{url}}/#/accept-organization/?organizationId={{org_id}}&organizationUserId={{org_user_id}}&email={{email}}&organizationName={{org_name_encoded}}&token={{token}}
-If you do not wish to join this organization, you can safely ignore this email.
+如果您不希望加入这个组织,您可以安全地忽略此电子邮件。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/send_org_invite.html.hbs b/src/static/templates/email/send_org_invite.html.hbs
index a78a89e9..2a812d3f 100644
--- a/src/static/templates/email/send_org_invite.html.hbs
+++ b/src/static/templates/email/send_org_invite.html.hbs
@@ -1,23 +1,23 @@
-Join {{{org_name}}}
+加入 {{{org_name}}}
{{> email/email_header }}
- You have been invited to join the {{org_name}} organization.
+ 您已被邀请加入 {{org_name}} 组织。
|
-
- Join Organization Now
+ 立即加入组织
|
- If you do not wish to join this organization, you can safely ignore this email.
+ 如果您不希望加入这个组织,您可以安全地忽略此电子邮件。
|
diff --git a/src/static/templates/email/send_single_org_removed_from_org.hbs b/src/static/templates/email/send_single_org_removed_from_org.hbs
index ec77cf63..492bcd9b 100644
--- a/src/static/templates/email/send_single_org_removed_from_org.hbs
+++ b/src/static/templates/email/send_single_org_removed_from_org.hbs
@@ -1,4 +1,4 @@
-You have been removed from {{{org_name}}}
+您已从 {{{org_name}}} 中移除
-Your user account has been removed from the *{{org_name}}* organization because you are a part of another organization. The {{org_name}} organization has enabled a policy that prevents users from being a part of multiple organizations. Before you can re-join this organization you need to leave all other organizations or join with a different account.
+您的用户账户已从 *{{org_name}}* 组织中移除,因为您属于另一个组织。{{org_name}} 组织已启用了一个阻止用户加入多个组织的策略。在您能重新加入此组织之前,您需要退出所有其他组织,或使用不同的账户加入。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/send_single_org_removed_from_org.html.hbs b/src/static/templates/email/send_single_org_removed_from_org.html.hbs
index e4026628..d152aee3 100644
--- a/src/static/templates/email/send_single_org_removed_from_org.html.hbs
+++ b/src/static/templates/email/send_single_org_removed_from_org.html.hbs
@@ -1,10 +1,10 @@
-You have been removed from {{{org_name}}}
+您已从 {{{org_name}}} 中移除
{{> email/email_header }}
- Your user account has been removed from the {{org_name}} organization because you are a part of another organization. The {{org_name}} organization has enabled a policy that prevents users from being a part of multiple organizations. Before you can re-join this organization you need to leave all other organizations or join with a different account.
+ 您的用户帐户已从 {{org_name}} 组织中移除,因为您是另一个组织的成员。{{org_name}} 组织已启用了一个政策,阻止用户成为多个组织的一部分。在您重新加入此组织之前,您需要离开所有其他组织或使用不同的帐户加入。
|
diff --git a/src/static/templates/email/smtp_test.hbs b/src/static/templates/email/smtp_test.hbs
index f177b092..2076fa63 100644
--- a/src/static/templates/email/smtp_test.hbs
+++ b/src/static/templates/email/smtp_test.hbs
@@ -1,6 +1,6 @@
-Vaultwarden SMTP Test
+Vaultwarden SMTP 测试
-This is a test email to verify the SMTP configuration for {{url}}.
+这是一封测试电子邮件,用于验证 {{url}} 的 SMTP 配置。
-When you can read this email it is probably configured correctly.
-{{> email/email_footer_text }}
\ No newline at end of file
+当您能够阅读此电子邮件时,SMTP 配置可能已正确设置。
+{{> email/email_footer_text }}
diff --git a/src/static/templates/email/smtp_test.html.hbs b/src/static/templates/email/smtp_test.html.hbs
index 36653f5d..519e8333 100644
--- a/src/static/templates/email/smtp_test.html.hbs
+++ b/src/static/templates/email/smtp_test.html.hbs
@@ -1,16 +1,16 @@
-Vaultwarden SMTP Test
+Vaultwarden SMTP 测试
{{> email/email_header }}
- This is a test email to verify the SMTP configuration for {{url}}.
+ 这是一封测试电子邮件,用于验证 {{url}} 的 SMTP 配置。
|
- When you can read this email it is probably configured correctly.
+ 当您能够阅读此电子邮件时,SMTP 配置可能已正确设置。
|
-{{> email/email_footer }}
\ No newline at end of file
+{{> email/email_footer }}
diff --git a/src/static/templates/email/twofactor_email.hbs b/src/static/templates/email/twofactor_email.hbs
index 01d79e9f..857f9090 100644
--- a/src/static/templates/email/twofactor_email.hbs
+++ b/src/static/templates/email/twofactor_email.hbs
@@ -1,6 +1,6 @@
-Vaultwarden Login Verification Code
+Vaultwarden 登录验证码
-Your two-step verification code is: {{token}}
+您的两步验证代码是: {{token}}
-Use this code to complete logging in with Vaultwarden.
+使用此代码完成在 Vaultwarden 中的登录。
{{> email/email_footer_text }}
diff --git a/src/static/templates/email/twofactor_email.html.hbs b/src/static/templates/email/twofactor_email.html.hbs
index 30990d9e..ca06d1bd 100644
--- a/src/static/templates/email/twofactor_email.html.hbs
+++ b/src/static/templates/email/twofactor_email.html.hbs
@@ -1,15 +1,15 @@
-Vaultwarden Login Verification Code
+Vaultwarden 登录验证码
{{> email/email_header }}
- Your two-step verification code is: {{token}}
+ 您的两步验证代码是: {{token}}
|
- Use this code to complete logging in with Vaultwarden.
+ 使用此代码完成在 Vaultwarden 中的登录。
|
diff --git a/src/static/templates/email/verify_email.hbs b/src/static/templates/email/verify_email.hbs
index 5c8dd557..64f1001f 100644
--- a/src/static/templates/email/verify_email.hbs
+++ b/src/static/templates/email/verify_email.hbs
@@ -1,8 +1,8 @@
-Verify Your Email
+验证您的电子邮件
-Verify this email address for your account by clicking the link below.
+通过点击下面的链接验证您账户的电子邮件地址。
-Verify Email Address Now: {{url}}/#/verify-email/?userId={{user_id}}&token={{token}}
+立即验证电子邮件地址:{{url}}/#/verify-email/?userId={{user_id}}&token={{token}}
-If you did not request to verify your account, you can safely ignore this email.
-{{> email/email_footer_text }}
\ No newline at end of file
+如果您没有请求验证您的账户,您可以放心地忽略此电子邮件。
+{{> email/email_footer_text }}
diff --git a/src/static/templates/email/verify_email.html.hbs b/src/static/templates/email/verify_email.html.hbs
index c37cf36d..622c7f69 100644
--- a/src/static/templates/email/verify_email.html.hbs
+++ b/src/static/templates/email/verify_email.html.hbs
@@ -1,24 +1,24 @@
-Verify Your Email
+验证您的电子邮件
{{> email/email_header }}
- Verify this email address for your account by clicking the link below.
+ 通过点击下面的链接验证您账户的电子邮件地址。
|
- Verify Email Address Now
+ 立即验证电子邮件地址
|
- If you did not request to verify your account, you can safely ignore this email.
+ 如果您没有请求验证您的账户,您可以放心地忽略此电子邮件。
|
-{{> email/email_footer }}
\ No newline at end of file
+{{> email/email_footer }}
diff --git a/src/static/templates/email/welcome.hbs b/src/static/templates/email/welcome.hbs
index f08e9beb..efe48b97 100644
--- a/src/static/templates/email/welcome.hbs
+++ b/src/static/templates/email/welcome.hbs
@@ -1,6 +1,6 @@
-Welcome
+欢迎
-Thank you for creating an account at {{url}}. You may now log in with your new account.
+感谢您在 {{url}} 创建账户。您现在可以使用新账户登录。
-If you did not request to create an account, you can safely ignore this email.
-{{> email/email_footer_text }}
\ No newline at end of file
+如果您没有请求创建账户,您可以放心地忽略此电子邮件。
+{{> email/email_footer_text }}
diff --git a/src/static/templates/email/welcome.html.hbs b/src/static/templates/email/welcome.html.hbs
index ad7ff2fd..6b63b124 100644
--- a/src/static/templates/email/welcome.html.hbs
+++ b/src/static/templates/email/welcome.html.hbs
@@ -1,16 +1,16 @@
-Welcome
+欢迎
{{> email/email_header }}
- Thank you for creating an account at {{url}}. You may now log in with your new account.
+ 感谢您在 {{url}} 创建账户。您现在可以使用新账户登录。
|
- If you did not request to create an account, you can safely ignore this email.
+ 如果您没有请求创建账户,您可以放心地忽略此电子邮件。
|
-{{> email/email_footer }}
\ No newline at end of file
+{{> email/email_footer }}
diff --git a/src/static/templates/email/welcome_must_verify.hbs b/src/static/templates/email/welcome_must_verify.hbs
index 11d8803c..3013742c 100644
--- a/src/static/templates/email/welcome_must_verify.hbs
+++ b/src/static/templates/email/welcome_must_verify.hbs
@@ -1,8 +1,8 @@
-Welcome
+欢迎
-Thank you for creating an account at {{url}}. Before you can login with your new account, you must verify this email address by clicking the link below.
+感谢您在{{url}}上创建账户。在使用新账户登录之前,您必须通过点击下面的链接验证此电子邮件地址。
-Verify Email Address Now: {{url}}/#/verify-email/?userId={{user_id}}&token={{token}}
+立即验证电子邮件地址: {{url}}/#/verify-email/?userId={{user_id}}&token={{token}}
-If you did not request to create an account, you can safely ignore this email.
-{{> email/email_footer_text }}
\ No newline at end of file
+如果您没有请求创建账户,您可以放心地忽略此电子邮件。
+{{> email/email_footer_text }}
diff --git a/src/static/templates/email/welcome_must_verify.html.hbs b/src/static/templates/email/welcome_must_verify.html.hbs
index 2179ea9c..0ac88250 100644
--- a/src/static/templates/email/welcome_must_verify.html.hbs
+++ b/src/static/templates/email/welcome_must_verify.html.hbs
@@ -1,24 +1,24 @@
-Welcome
+欢迎
{{> email/email_header }}
- Thank you for creating an account at {{url}}. Before you can login with your new account, you must verify this email address by clicking the link below.
+ 感谢您在{{url}}上创建账户。在使用新账户登录之前,您必须通过点击下面的链接验证此电子邮件地址。
|
- Verify Email Address Now
+ 立即验证电子邮件地址
|
- If you did not request to create an account, you can safely ignore this email.
+ 如果您没有请求创建账户,您可以放心地忽略此电子邮件。
|
-{{> email/email_footer }}
\ No newline at end of file
+{{> email/email_footer }}