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

apps/i18n/core/ja/LC_MESSAGES/django.po

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

apps/i18n/core/zh/LC_MESSAGES/django.po

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

apps/i18n/lina/en.json

@@ -169,7 +169,7 @@
     "AutoPush": "Auto push",
     "Automations": "Automations",
     "AverageTimeCost": "Average spend time",
-    "AwaitingMyApproval": "Assigned",
+    "AwaitingMyApproval": "Approval pending",
     "Azure": "Azure (china)",
     "Backup": "Backup",
     "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",
     "MsgSubscribe": "Subscription",
     "MyAssets": "My assets",
-    "MyTickets": "Submitted",
+    "MyTickets": "I initiated",
     "Name": "Name",
     "NavHelp": "Navigation",
     "NeedReLogin": "Need to re-login",