diff --git a/apps/acls/templates/acls/asset_login_reminder.html b/apps/acls/templates/acls/asset_login_reminder.html index 93eb4f263..3291e891d 100644 --- a/apps/acls/templates/acls/asset_login_reminder.html +++ b/apps/acls/templates/acls/asset_login_reminder.html @@ -1,6 +1,6 @@ {% load i18n %} -

{% trans 'Dear' %}: {{ recipient.name }}[{{ recipient.username }}]

+

{% trans 'Dear' %}: {{ recipient_name }}[{{ recipient_username }}]


{% trans 'We would like to inform you that a user has recently logged into the following asset:' %}

{% trans 'Asset details' %}:

diff --git a/apps/authentication/templates/authentication/_msg_oauth_bind.html b/apps/authentication/templates/authentication/_msg_oauth_bind.html index 7a37b9218..45c587dcf 100644 --- a/apps/authentication/templates/authentication/_msg_oauth_bind.html +++ b/apps/authentication/templates/authentication/_msg_oauth_bind.html @@ -11,8 +11,6 @@ {% trans 'Time' %}: {{ time }}
{% trans 'IP' %}: {{ ip }}

- --

{% trans 'If the operation is not your own, unbind and change the password.' %}

diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index a38b5cda3..d8e607fd9 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -9065,11 +9065,11 @@ msgstr "图标" #: terminal/serializers/applet_host.py:24 msgid "Per Device (Device number limit)" -msgstr "每用户 (限制设备数量)" +msgstr "每设备 (限制设备数量)" #: terminal/serializers/applet_host.py:25 msgid "Per User (User number limit)" -msgstr "每设备 (限制用户数量)" +msgstr "每用户 (限制用户数量)" #: terminal/serializers/applet_host.py:37 msgid "Core API" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index cbb8baa85..88204998b 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -1621,5 +1621,6 @@ "userName": "User name", "description": "No data yet", "MsgTemplate": "Msg Template", - "TemplateVariablesHelpText": "You can select a template and use {{ key }} within the template content to read built-in variables.Note: only the {{ }} syntax is supported; other syntaxes such as {% if title %} are not supported." + "TemplateVariablesHelpText": "You can select a template and use {{ key }} within the template content to read built-in variables.Note: only the {{ }} syntax is supported; other syntaxes such as {% if title %} are not supported.", + "ResetSuccessfully": "Reset successfully" } diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 986d84f1e..93b6f35ca 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -1631,5 +1631,6 @@ "description": "暂无数据", "MsgTemplate": "消息模板", "Example": "示例值", - "TemplateVariablesHelpText": "您可以选择一个模板在模板内容中使用 {{ key }} 读取内置变量,注意:只支持 {{ }} 语法,其他语法不支持。例如 {% if title %}" + "TemplateVariablesHelpText": "您可以选择一个模板在模板内容中使用 {{ key }} 读取内置变量,注意:只支持 {{ }} 语法,其他语法不支持。例如 {% if title %}", + "ResetSuccessfully": "重置成功" } diff --git a/apps/users/templates/users/_msg_user_created.html b/apps/users/templates/users/_msg_user_created.html index ee08d137e..4783f04b1 100644 --- a/apps/users/templates/users/_msg_user_created.html +++ b/apps/users/templates/users/_msg_user_created.html @@ -1,7 +1,7 @@ {% load i18n %}

- {{ honorific }} {{ name }}, + {{ honorific }}