From da5b9be5ca0fedf8604aae20b623f032fe246426 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 28 Sep 2017 20:52:33 +0800 Subject: [PATCH] [Bugfix] Update some translation and set warning, partial fix #646 --- .../templates/assets/_asset_import_modal.html | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 23889 -> 24195 bytes apps/locale/zh/LC_MESSAGES/django.po | 16 +++++++--------- .../templates/users/_user_import_modal.html | 6 +++--- 4 files changed, 11 insertions(+), 13 deletions(-) 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 227c79b45149e44ff3663a8793648b73708186ae..855922a4c1be7f257f38036c48ab1b6d850cdbc0 100644 GIT binary patch delta 8965 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 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' %}