Merge branch 'v4' of github.com:jumpserver/jumpserver into v4

pull/13283/head
ibuler 2024-05-27 11:20:59 +08:00
commit f127aca5f8
3 changed files with 4 additions and 4 deletions

View File

@ -1439,7 +1439,7 @@ msgstr ">>> 実行する必要があるタスクはありません"
#: assets/automations/base/manager.py:335 #: assets/automations/base/manager.py:335
#, python-brace-format #, python-brace-format
msgid ">>> Begin executing batch {index} of tasks" msgid ">>> Begin executing batch {index} of tasks"
msgstr ">>> 第 {} バッチのタスクの実行を開始" msgstr ">>> 第 {index} バッチのタスクの実行を開始"
#: assets/automations/ping_gateway/manager.py:33 #: assets/automations/ping_gateway/manager.py:33
#: authentication/models/connection_token.py:131 #: authentication/models/connection_token.py:131

View File

@ -1419,7 +1419,7 @@ msgstr ">>> 没有需要执行的任务"
#: assets/automations/base/manager.py:335 #: assets/automations/base/manager.py:335
#, python-brace-format #, python-brace-format
msgid ">>> Begin executing batch {index} of tasks" msgid ">>> Begin executing batch {index} of tasks"
msgstr ">>> 开始执行第 {} 批任务" msgstr ">>> 开始执行第 {index} 批任务"
#: assets/automations/ping_gateway/manager.py:33 #: assets/automations/ping_gateway/manager.py:33
#: authentication/models/connection_token.py:131 #: authentication/models/connection_token.py:131

View File

@ -169,7 +169,7 @@
"AutoPush": "Auto push", "AutoPush": "Auto push",
"Automations": "Automations", "Automations": "Automations",
"AverageTimeCost": "Average spend time", "AverageTimeCost": "Average spend time",
"AwaitingMyApproval": "Assigned", "AwaitingMyApproval": "Approval pending",
"Azure": "Azure (china)", "Azure": "Azure (china)",
"Backup": "Backup", "Backup": "Backup",
"BackupAccountsHelpText": "Backup account information externally. it can be stored in an external system or sent via email, supporting segmented delivery.", "BackupAccountsHelpText": "Backup account information externally. it can be stored in an external system or sent via email, supporting segmented delivery.",
@ -700,7 +700,7 @@
"MoveAssetToNode": "Move assets to nodes", "MoveAssetToNode": "Move assets to nodes",
"MsgSubscribe": "Subscription", "MsgSubscribe": "Subscription",
"MyAssets": "My assets", "MyAssets": "My assets",
"MyTickets": "Submitted", "MyTickets": "I initiated",
"Name": "Name", "Name": "Name",
"NavHelp": "Navigation", "NavHelp": "Navigation",
"NeedReLogin": "Need to re-login", "NeedReLogin": "Need to re-login",