From 328f718fe8ddce845a092b0c849ba781e7e65dc8 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 29 Apr 2024 11:16:09 +0800 Subject: [PATCH] merge: into dev from v4: i18n file --- apps/i18n/core/ja/LC_MESSAGES/django.mo | 4 ++-- apps/i18n/core/ja/LC_MESSAGES/django.po | 4 ---- apps/i18n/core/zh/LC_MESSAGES/django.mo | 4 ++-- apps/i18n/core/zh/LC_MESSAGES/django.po | 17 ----------------- apps/locale/ja/LC_MESSAGES/django.mo | 3 --- apps/locale/zh/LC_MESSAGES/django.mo | 3 --- 6 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 apps/locale/ja/LC_MESSAGES/django.mo delete mode 100644 apps/locale/zh/LC_MESSAGES/django.mo diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 73bb0091c..1a6688238 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.mo +++ b/apps/i18n/core/ja/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fd56734e72b9bed138c98e76424e9bf4b0d95be83e59bec3c75b6a63eac9aff -size 167233 +oid sha256:72af515e8895a91e456eb9d0ef8bea352eb23777c015680a21f6da5708303df6 +size 173912 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 2413ada72..e14c9c98d 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -5081,10 +5081,6 @@ msgstr "タスクセンター" msgid "My assets" msgstr "私の資産" -#: rbac/tree.py:57 -msgid "App ops" -msgstr "アプリ操作" - #: rbac/tree.py:58 terminal/models/applet/applet.py:52 #: terminal/models/applet/applet.py:317 terminal/models/applet/host.py:30 #: terminal/serializers/applet.py:15 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index 8f7b4fa62..8ab207c17 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.mo +++ b/apps/i18n/core/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3453782a925aafc7fe2e05cf07299f8c35dc239f9e09e539d905d10cae15ecea -size 138663 +oid sha256:02464a8bd6b0c6f13f9defc630913ce9a0638777a4a115fd403a0dd59a112b0b +size 142905 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index a94576224..857615832 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -1022,14 +1022,6 @@ msgstr "* 密码长度范围 6-30 位" msgid "Automation task execution" msgstr "自动化任务执行历史" -#: accounts/serializers/automations/change_secret.py:149 audits/const.py:61 -#: audits/models.py:64 audits/signal_handlers/activity_log.py:33 -#: common/const/choices.py:18 ops/const.py:73 ops/serializers/celery.py:48 -#: terminal/const.py:78 terminal/models/session/sharing.py:121 -#: tickets/views/approve.py:117 -msgid "Success" -msgstr "成功" - #: accounts/signal_handlers.py:47 #, python-format msgid "Push related accounts to assets: %s, by system" @@ -3721,19 +3713,10 @@ msgstr "定时触发" msgid "Ready" msgstr "准备" -#: common/const/choices.py:16 terminal/const.py:77 tickets/const.py:30 -#: tickets/const.py:40 -msgid "Pending" -msgstr "待定的" - #: common/const/choices.py:17 ops/const.py:72 msgid "Running" msgstr "运行中" -#: common/const/choices.py:21 -msgid "Canceled" -msgstr "取消" - #: common/const/common.py:5 #, python-format msgid "%(name)s was created successfully" diff --git a/apps/locale/ja/LC_MESSAGES/django.mo b/apps/locale/ja/LC_MESSAGES/django.mo deleted file mode 100644 index 11fda0509..000000000 --- a/apps/locale/ja/LC_MESSAGES/django.mo +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b796ec6f93e1a3855473cc5e4a0bd2ecf44b33ce59b07146fa0e83fd16cd7b46 -size 177281 diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo deleted file mode 100644 index e85ee604d..000000000 --- a/apps/locale/zh/LC_MESSAGES/django.mo +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:baa5feb7e592b529b0a3d5695f236d7542f069f97c236def1ebf9c99f9ea75f8 -size 145065