merge: with remote

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

@@ -5394,35 +5394,35 @@ msgid "Period clean"
 msgstr ""
 
 #: settings/serializers/cleaning.py:15
-msgid "Login log keep days (day)"
+msgid "Login log retention days (day)"
 msgstr ""
 
 #: settings/serializers/cleaning.py:19
-msgid "Task log keep days (day)"
+msgid "Task log retention days (day)"
 msgstr ""
 
 #: settings/serializers/cleaning.py:23
-msgid "Operate log keep days (day)"
+msgid "Operate log retention days (day)"
 msgstr ""
 
 #: settings/serializers/cleaning.py:27
-msgid "FTP log keep days (day)"
+msgid "FTP log retention days (day)"
 msgstr ""
 
 #: settings/serializers/cleaning.py:31
-msgid "Cloud sync record keep days (day)"
+msgid "Cloud sync task history retention days (day)"
 msgstr ""
 
 #: settings/serializers/cleaning.py:35
-msgid "job execution keep days (day)"
+msgid "job execution retention days (day)"
 msgstr ""
 
 #: settings/serializers/cleaning.py:39
-msgid "Activity log keep days (day)"
+msgid "Activity log retention days (day)"
 msgstr ""
 
 #: settings/serializers/cleaning.py:42
-msgid "Session keep duration (day)"
+msgid "Session log retention days (day)"
 msgstr ""
 
 #: settings/serializers/cleaning.py:44
@@ -8725,11 +8725,11 @@ msgid "Interface settings"
 msgstr ""
 
 #: xpack/plugins/interface/models.py:23
-msgid "Title of login page"
+msgid "Login title"
 msgstr ""
 
 #: xpack/plugins/interface/models.py:27
-msgid "Image of login page"
+msgid "Login image"
 msgstr ""
 
 #: xpack/plugins/interface/models.py:31
@@ -8737,11 +8737,11 @@ msgid "Website icon"
 msgstr ""
 
 #: xpack/plugins/interface/models.py:35
-msgid "Logo of management page"
+msgid "Index logo"
 msgstr ""
 
 #: xpack/plugins/interface/models.py:39
-msgid "Logo of logout page"
+msgid "Logout logo"
 msgstr ""
 
 #: xpack/plugins/interface/models.py:41

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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:deba66cca5a41120ea382842441d5ad1b6597ee01fc74569dea71b974616e104
-size 167844

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

@@ -5561,35 +5561,35 @@ msgid "Period clean"
 msgstr "定時清掃"
 
 #: settings/serializers/cleaning.py:15
-msgid "Login log keep days (day)"
+msgid "Login log retention days (day)"
 msgstr "ログインログは日数を保持します（天）"
 
 #: settings/serializers/cleaning.py:19
-msgid "Task log keep days (day)"
+msgid "Task log retention days (day)"
 msgstr "タスクログは日数を保持します（天）"
 
 #: settings/serializers/cleaning.py:23
-msgid "Operate log keep days (day)"
+msgid "Operate log retention days (day)"
 msgstr "ログ管理日を操作する（天）"
 
 #: settings/serializers/cleaning.py:27
-msgid "FTP log keep days (day)"
+msgid "FTP log retention days (day)"
 msgstr "ダウンロードのアップロード（天）"
 
 #: settings/serializers/cleaning.py:31
-msgid "Cloud sync record keep days (day)"
+msgid "Cloud sync task history retention days (day)"
 msgstr "クラウド同期レコードは日数を保持します（天）"
 
 #: settings/serializers/cleaning.py:35
-msgid "job execution keep days (day)"
+msgid "job execution retention days (day)"
 msgstr "ジョブセンターの実行履歴 (天) "
 
 #: settings/serializers/cleaning.py:39
-msgid "Activity log keep days (day)"
+msgid "Activity log retention days (day)"
 msgstr "活動ログは日数を保持します（天）"
 
 #: settings/serializers/cleaning.py:42
-msgid "Session keep duration (day)"
+msgid "Session log retention days (day)"
 msgstr "セッション維持期間（天）"
 
 #: settings/serializers/cleaning.py:44
@@ -9062,11 +9062,11 @@ msgid "Interface settings"
 msgstr "インターフェイスの設定"
 
 #: xpack/plugins/interface/models.py:23
-msgid "Title of login page"
+msgid "Login title"
 msgstr "ログインページのタイトル"
 
 #: xpack/plugins/interface/models.py:27
-msgid "Image of login page"
+msgid "Login image"
 msgstr "ログインページのイメージ"
 
 #: xpack/plugins/interface/models.py:31
@@ -9074,11 +9074,11 @@ msgid "Website icon"
 msgstr "ウェブサイトのアイコン"
 
 #: xpack/plugins/interface/models.py:35
-msgid "Logo of management page"
+msgid "Index logo"
 msgstr "管理ページのロゴ"
 
 #: xpack/plugins/interface/models.py:39
-msgid "Logo of logout page"
+msgid "Logout logo"
 msgstr "ログアウトページのロゴ"
 
 #: xpack/plugins/interface/models.py:41

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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:986e7a2879923a9cc545fe35c18265caf8d9d4b9636d5ef4277510cc8ac8f790
-size 138952

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

@@ -5448,35 +5448,35 @@ msgid "Period clean"
 msgstr "定時清掃"
 
 #: settings/serializers/cleaning.py:15
-msgid "Login log keep days (day)"
+msgid "Login log retention days (day)"
 msgstr "登录日志 (天)"
 
 #: settings/serializers/cleaning.py:19
-msgid "Task log keep days (day)"
+msgid "Task log retention days (day)"
 msgstr "任务日志 (天)"
 
 #: settings/serializers/cleaning.py:23
-msgid "Operate log keep days (day)"
+msgid "Operate log retention days (day)"
 msgstr "操作日志 (天)"
 
 #: settings/serializers/cleaning.py:27
-msgid "FTP log keep days (day)"
+msgid "FTP log retention days (day)"
 msgstr "上传下载 (天)"
 
 #: settings/serializers/cleaning.py:31
-msgid "Cloud sync record keep days (day)"
+msgid "Cloud sync task history retention days (day)"
 msgstr "云同步记录 (天)"
 
 #: settings/serializers/cleaning.py:35
-msgid "job execution keep days (day)"
+msgid "job execution retention days (day)"
 msgstr "作业中心执行历史 (天)"
 
 #: settings/serializers/cleaning.py:39
-msgid "Activity log keep days (day)"
+msgid "Activity log retention days (day)"
 msgstr "活动记录 (天)"
 
 #: settings/serializers/cleaning.py:42
-msgid "Session keep duration (day)"
+msgid "Session log retention days (day)"
 msgstr "会话日志 (天)"
 
 #: settings/serializers/cleaning.py:44
@@ -8855,11 +8855,11 @@ msgid "Interface settings"
 msgstr "界面设置"
 
 #: xpack/plugins/interface/models.py:23
-msgid "Title of login page"
+msgid "Login title"
 msgstr "登录页面标题"
 
 #: xpack/plugins/interface/models.py:27
-msgid "Image of login page"
+msgid "Login image"
 msgstr "登录页面图片"
 
 #: xpack/plugins/interface/models.py:31
@@ -8867,11 +8867,11 @@ msgid "Website icon"
 msgstr "网站图标"
 
 #: xpack/plugins/interface/models.py:35
-msgid "Logo of management page"
+msgid "Index logo"
 msgstr "管理页面 Logo"
 
 #: xpack/plugins/interface/models.py:39
-msgid "Logo of logout page"
+msgid "Logout logo"
 msgstr "退出页面 Logo"
 
 #: xpack/plugins/interface/models.py:41

apps/i18n/lina/en.json

@@ -369,8 +369,8 @@
     "DeleteWarningMsg": "Are You Sure You Want to Delete",
     "Deploy": "Deployment",
     "Description": "Description",
-    "DestinationIP": "Destination Address",
+    "DestinationIP": "Destination address",
-    "DestinationPort": "Destination Port",
+    "DestinationPort": "Destination port",
     "Detail": "Detail",
     "DeviceCreate": "Create a Asset - Device",
     "DeviceUpdate": "Update the Asset - Device",
@@ -1013,8 +1013,8 @@
     "Skipped": "Skipped",
     "Slack": "Slack",
     "Source": "Source",
-    "SourceIP": "Source Address",
+    "SourceIP": "Source address",
-    "SourcePort": "Source Port",
+    "SourcePort": "Source port",
     "Spec": "Specify",
     "SpecAccount": "Designated Account",
     "SpecAccountTip": "Specify username to choose authorized account",
@@ -1080,7 +1080,7 @@
     "TaskDone": "Task Finished",
     "TaskID": "Task ID",
     "TaskList": "System Tasks",
-    "TaskMonitor": "Task Monitoring",
+    "TaskMonitor": "Monitoring",
     "TechnologyConsult": "Technical Consultation",
     "TempPassword": "The temporary password is valid for 300 seconds and becomes invalid immediately after use",
     "TemplateAdd": "Add from template",
@@ -1237,4 +1237,4 @@
     "Workspace": "Workspace",
     "Yes": "Yes",
     "ZStack": "ZStack"
-}
+}

apps/settings/serializers/cleaning.py

@@ -12,34 +12,34 @@ class CleaningSerializer(serializers.Serializer):
 
     LOGIN_LOG_KEEP_DAYS = serializers.IntegerField(
         min_value=MIN_VALUE, max_value=9999,
-        label=_("Login log keep days (day)"),
+        label=_("Login log retention days (day)"),
     )
     TASK_LOG_KEEP_DAYS = serializers.IntegerField(
         min_value=MIN_VALUE, max_value=9999,
-        label=_("Task log keep days (day)"),
+        label=_("Task log retention days (day)"),
     )
     OPERATE_LOG_KEEP_DAYS = serializers.IntegerField(
         min_value=MIN_VALUE, max_value=9999,
-        label=_("Operate log keep days (day)"),
+        label=_("Operate log retention days (day)"),
     )
     FTP_LOG_KEEP_DAYS = serializers.IntegerField(
         min_value=MIN_VALUE, max_value=9999,
-        label=_("FTP log keep days (day)"),
+        label=_("FTP log retention days (day)"),
     )
     CLOUD_SYNC_TASK_EXECUTION_KEEP_DAYS = serializers.IntegerField(
         min_value=MIN_VALUE, max_value=9999,
-        label=_("Cloud sync record keep days (day)"),
+        label=_("Cloud sync task history retention days (day)"),
     )
     JOB_EXECUTION_KEEP_DAYS = serializers.IntegerField(
         min_value=MIN_VALUE, max_value=9999,
-        label=_("job execution keep days (day)"),
+        label=_("job execution retention days (day)"),
     )
     ACTIVITY_LOG_KEEP_DAYS = serializers.IntegerField(
         min_value=MIN_VALUE, max_value=9999,
-        label=_("Activity log keep days (day)"),
+        label=_("Activity log retention days (day)"),
     )
     TERMINAL_SESSION_KEEP_DURATION = serializers.IntegerField(
-        min_value=MIN_VALUE, max_value=99999, required=True, label=_('Session keep duration (day)'),
+        min_value=MIN_VALUE, max_value=99999, required=True, label=_('Session log retention days (day)'),
         help_text=_(
             'Session, record, command will be delete if more than duration, only in database, OSS will not be affected.')
     )