diff --git a/apps/assets/templates/assets/_asset_import_modal.html b/apps/assets/templates/assets/_asset_import_modal.html index 64f60863b..ca7729e05 100644 --- a/apps/assets/templates/assets/_asset_import_modal.html +++ b/apps/assets/templates/assets/_asset_import_modal.html @@ -12,7 +12,7 @@
- + {% trans 'If set id, will use this id update asset existed' %}
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 227c79b45..855922a4c 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 601e4314c..1e68bc210 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -716,14 +716,12 @@ msgid "Download" msgstr "下载" #: assets/templates/assets/_asset_import_modal.html:13 -#, fuzzy -#| msgid "Asset excel file" msgid "Asset csv file" -msgstr "资产excel" +msgstr "资产csv文件" #: assets/templates/assets/_asset_import_modal.html:16 msgid "If set id, will use this id update asset existed" -msgstr "" +msgstr "如果设置了id,则会使用该行信息更新该id的资产" #: assets/templates/assets/_system_user.html:16 #: assets/templates/assets/system_user_list.html:9 @@ -1888,16 +1886,16 @@ msgid "Import user" msgstr "导入" #: users/templates/users/_user_import_modal.html:6 -msgid "Download template or use export excel format" +msgid "Download template or use export csv format" msgstr "下载模板" #: users/templates/users/_user_import_modal.html:14 -msgid "Users excel file" -msgstr "用户excel" +msgid "Users csv file" +msgstr "用户csv文件" #: users/templates/users/_user_import_modal.html:16 -msgid "If set id, will use this id update existed" -msgstr "" +msgid "If set id, will use this id update user existed" +msgstr "如果设置了id,则会使用该行信息更新该id的用户" #: users/templates/users/_user_update_pk_modal.html:4 msgid "Update User SSH Public Key" diff --git a/apps/users/templates/users/_user_import_modal.html b/apps/users/templates/users/_user_import_modal.html index 1c6179f6a..678023cfc 100644 --- a/apps/users/templates/users/_user_import_modal.html +++ b/apps/users/templates/users/_user_import_modal.html @@ -3,7 +3,7 @@ {% block modal_id %}user_import_modal{% endblock %} {% block modal_title%}{% trans "Import user" %}{% endblock %} {% block modal_body %} -

{% trans "Download template or use export excel format" %}

+

{% trans "Download template or use export csv format" %}

{% csrf_token %}
@@ -11,9 +11,9 @@ {% trans 'Download' %}
- + - {% trans 'If set id, will use this id update existed' %} + {% trans 'If set id, will use this id update user existed' %}