diff --git a/apps/accounts/automations/change_secret/host/aix/main.yml b/apps/accounts/automations/change_secret/host/aix/main.yml index fe3ca82c8..625dd8826 100644 --- a/apps/accounts/automations/change_secret/host/aix/main.yml +++ b/apps/accounts/automations/change_secret/host/aix/main.yml @@ -70,7 +70,7 @@ - home_dir_stat.stat.exists == false ignore_errors: yes - - name: Remove jumpserver ssh key + - name: Remove ssh key created by system ansible.builtin.lineinfile: dest: "{{ home_dir.stdout.strip() }}/.ssh/authorized_keys" regexp: "{{ ssh_params.regexp }}" diff --git a/apps/accounts/automations/change_secret/host/posix/main.yml b/apps/accounts/automations/change_secret/host/posix/main.yml index 01ccd1e6c..ebd4bc79a 100644 --- a/apps/accounts/automations/change_secret/host/posix/main.yml +++ b/apps/accounts/automations/change_secret/host/posix/main.yml @@ -70,7 +70,7 @@ - home_dir_stat.stat.exists == false ignore_errors: yes - - name: Remove jumpserver ssh key + - name: Remove ssh key created by system ansible.builtin.lineinfile: dest: "{{ home_dir.stdout.strip() }}/.ssh/authorized_keys" regexp: "{{ ssh_params.regexp }}" diff --git a/apps/accounts/automations/push_account/host/aix/main.yml b/apps/accounts/automations/push_account/host/aix/main.yml index 4bdc84f75..f9531fdec 100644 --- a/apps/accounts/automations/push_account/host/aix/main.yml +++ b/apps/accounts/automations/push_account/host/aix/main.yml @@ -70,7 +70,7 @@ - home_dir_stat.stat.exists == false ignore_errors: yes - - name: Remove jumpserver ssh key + - name: Remove ssh key created by system ansible.builtin.lineinfile: dest: "{{ home_dir.stdout.strip() }}/.ssh/authorized_keys" regexp: "{{ ssh_params.regexp }}" diff --git a/apps/accounts/automations/push_account/host/posix/main.yml b/apps/accounts/automations/push_account/host/posix/main.yml index 3e2d1dc43..6a5aba389 100644 --- a/apps/accounts/automations/push_account/host/posix/main.yml +++ b/apps/accounts/automations/push_account/host/posix/main.yml @@ -70,7 +70,7 @@ - home_dir_stat.stat.exists == false ignore_errors: yes - - name: Remove jumpserver ssh key + - name: Remove ssh key created by system ansible.builtin.lineinfile: dest: "{{ home_dir.stdout.strip() }}/.ssh/authorized_keys" regexp: "{{ ssh_params.regexp }}" diff --git a/apps/accounts/const/automation.py b/apps/accounts/const/automation.py index b0ba7723a..b1a04fd31 100644 --- a/apps/accounts/const/automation.py +++ b/apps/accounts/const/automation.py @@ -56,7 +56,7 @@ class SecretStrategy(models.TextChoices): class SSHKeyStrategy(models.TextChoices): # add = 'add', _('Append SSH KEY') - set_jms = 'set_jms', _('Replace (Replace only keys pushed by JumpServer) ') + set_jms = 'set_jms', _('Replace (Replace only keys pushed by system) ') set = 'set', _('Empty and append SSH KEY') diff --git a/apps/accounts/migrations/0002_auto_20220616_0021.py b/apps/accounts/migrations/0002_auto_20220616_0021.py index c5bfb0d99..ac6e8ac38 100644 --- a/apps/accounts/migrations/0002_auto_20220616_0021.py +++ b/apps/accounts/migrations/0002_auto_20220616_0021.py @@ -52,7 +52,7 @@ class Migration(migrations.Migration): ('password_rules', models.JSONField(default=dict, verbose_name='Password rules')), ('ssh_key_change_strategy', models.CharField( choices=[ - ("set_jms", "Replace (Replace only keys pushed by JumpServer) "), + ("set_jms", "Replace (Replace only keys pushed by system) "), ("set", "Empty and append SSH KEY"), ], default="set_jms", @@ -86,7 +86,7 @@ class Migration(migrations.Migration): ('password_rules', models.JSONField(default=dict, verbose_name='Password rules')), ('ssh_key_change_strategy', models.CharField( choices=[ - ("set_jms", "Replace (Replace only keys pushed by JumpServer) "), + ("set_jms", "Replace (Replace only keys pushed by system) "), ("set", "Empty and append SSH KEY"), ], default="set_jms", diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 412b60691..1f2da2c4c 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -271,7 +271,7 @@ msgid "Random generate" msgstr "" #: accounts/const/automation.py:59 ops/const.py:17 -msgid "Replace (Replace only keys pushed by JumpServer) " +msgid "Replace (Replace only keys pushed by system) " msgstr "" #: accounts/const/automation.py:60 ops/const.py:16 @@ -7317,7 +7317,7 @@ msgstr "" #: settings/serializers/auth/cas.py:36 msgid "" "User attribute mapping, where the `key` is the CAS service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" #: settings/serializers/auth/dingtalk.py:16 @@ -7326,13 +7326,13 @@ msgstr "" #: settings/serializers/auth/dingtalk.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the DingTalk service user attribute name" msgstr "" #: settings/serializers/auth/feishu.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the FeiShu service user attribute name" msgstr "" @@ -7342,7 +7342,7 @@ msgstr "" #: settings/serializers/auth/lark.py:19 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Lark service user attribute name" msgstr "" @@ -7387,7 +7387,7 @@ msgstr "" #: settings/serializers/auth/ldap.py:69 settings/serializers/auth/ldap_ha.py:51 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the LDAP service user attribute name" msgstr "" @@ -7486,7 +7486,7 @@ msgstr "" #: settings/serializers/auth/oauth2.py:62 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OAuth2 service user attribute name" msgstr "" @@ -7521,7 +7521,7 @@ msgstr "" #: settings/serializers/auth/oidc.py:41 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OIDC service user attribute name" msgstr "" @@ -7646,7 +7646,7 @@ msgstr "" #: settings/serializers/auth/saml2.py:37 msgid "" "User attribute mapping, where the `key` is the SAML2 service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" #: settings/serializers/auth/saml2.py:43 @@ -7655,7 +7655,7 @@ msgstr "" #: settings/serializers/auth/slack.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Slack service user attribute name" msgstr "" @@ -7759,7 +7759,7 @@ msgstr "" #: settings/serializers/auth/wecom.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the WeCom service user attribute name" msgstr "" diff --git a/apps/i18n/core/es/LC_MESSAGES/django.po b/apps/i18n/core/es/LC_MESSAGES/django.po index e625600c0..e40f01150 100644 --- a/apps/i18n/core/es/LC_MESSAGES/django.po +++ b/apps/i18n/core/es/LC_MESSAGES/django.po @@ -301,8 +301,8 @@ msgid "Random generate" msgstr "Generar aleatoriamente" #: accounts/const/automation.py:59 ops/const.py:17 -msgid "Replace (Replace only keys pushed by JumpServer) " -msgstr "Reemplazar (solo reemplazar las claves enviadas por JumpServer)" +msgid "Replace (Replace only keys pushed by system) " +msgstr "Reemplazar (solo reemplazar las claves enviadas por el sistema)" #: accounts/const/automation.py:60 ops/const.py:16 msgid "Empty and append SSH KEY" @@ -7902,10 +7902,10 @@ msgstr "" "se creará automáticamente. \n" "Habilitar autenticación de DingTalk \n" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo de " -"usuario de JumpServer, y `value` es el nombre del atributo de usuario del " +"usuario del sistema, y `value` es el nombre del atributo de usuario del " "servicio DingTalk. \n" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo de " -"usuario de JumpServer, y `value` es el nombre del atributo de usuario del " +"usuario del sistema, y `value` es el nombre del atributo de usuario del " "servicio FeiShu." #: settings/serializers/auth/cas.py:12 settings/serializers/auth/cas.py:14 @@ -7950,7 +7950,7 @@ msgstr "Mapear atributos" #: settings/serializers/auth/cas.py:36 msgid "" "User attribute mapping, where the `key` is the CAS service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo de " "usuario del servicio CAS, y `value` es el nombre del atributo de usuario de " @@ -7962,20 +7962,20 @@ msgstr "Habilitar autenticación de DingTalk" #: settings/serializers/auth/dingtalk.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the DingTalk service user attribute name" msgstr "" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo de " -"usuario de JumpServer, y `value` es el nombre del atributo de usuario del " +"usuario del sistema, y `value` es el nombre del atributo de usuario del " "servicio DingTalk" #: settings/serializers/auth/feishu.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the FeiShu service user attribute name" msgstr "" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo de " -"usuario de JumpServer, y `value` es el nombre del atributo de usuario del " +"usuario del sistema, y `value` es el nombre del atributo de usuario del " "servicio Feishu" #: settings/serializers/auth/lark.py:13 users/models/user/_source.py:24 @@ -7984,11 +7984,11 @@ msgstr "Lark" #: settings/serializers/auth/lark.py:19 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Lark service user attribute name" msgstr "" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo de " -"usuario de JumpServer y `value` es el nombre del atributo de usuario del " +"usuario del sistema y `value` es el nombre del atributo de usuario del " "servicio Lark. \n" "LDAP \n" "Dominio del servicio LDAP \n" @@ -8001,7 +8001,7 @@ msgstr "" "Filtro de usuario \n" "Las opciones posibles son (cn o uid o sAMAccountName=%(user)s) \n" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo de " -"usuario de JumpServer y `value` es el nombre del atributo de usuario del " +"usuario del sistema y `value` es el nombre del atributo de usuario del " "servicio LDAP. \n" "Tiempo de espera para la conexión (segundos) \n" "Tiempo de espera para el caché de User DN (segundos) \n" @@ -8055,11 +8055,11 @@ msgstr "Las posibles opciones son (cn o uid o sAMAccountName=%(user)s)" #: settings/serializers/auth/ldap.py:69 settings/serializers/auth/ldap_ha.py:51 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the LDAP service user attribute name" msgstr "" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo del " -"usuario en JumpServer, y `value` es el nombre del atributo del usuario en el " +"usuario del sistema, y `value` es el nombre del atributo del usuario en el " "servicio LDAP" #: settings/serializers/auth/ldap.py:85 settings/serializers/auth/ldap_ha.py:67 @@ -8169,11 +8169,11 @@ msgstr "" #: settings/serializers/auth/oauth2.py:62 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OAuth2 service user attribute name" msgstr "" "Mapeo de atributos del usuario, donde `key` es el nombre del atributo de " -"usuario de JumpServer y `value` es el nombre del atributo de usuario del " +"usuario del sistema y `value` es el nombre del atributo de usuario del " "servicio OAuth2." #: settings/serializers/auth/oauth2.py:67 settings/serializers/auth/oidc.py:117 @@ -8208,11 +8208,11 @@ msgstr "Ignorar la verificación del certificado SSL" #: settings/serializers/auth/oidc.py:41 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OIDC service user attribute name" msgstr "" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo de " -"usuario de JumpServer y `value` es el nombre del atributo de usuario del " +"usuario del sistema y `value` es el nombre del atributo de usuario del " "servicio OIDC" #: settings/serializers/auth/oidc.py:45 @@ -8347,7 +8347,7 @@ msgstr "Certificado SP" #: settings/serializers/auth/saml2.py:37 msgid "" "User attribute mapping, where the `key` is the SAML2 service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo de " "usuario del servicio SAML2 y `value` es el nombre del atributo de usuario de " @@ -8359,11 +8359,11 @@ msgstr "Al salir, los usuarios también se desconectarán del servidor SAML2" #: settings/serializers/auth/slack.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Slack service user attribute name" msgstr "" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo de " -"usuario de JumpServer y `value` es el nombre del atributo de usuario del " +"usuario del sistema y `value` es el nombre del atributo de usuario del " "servicio Slack" #: settings/serializers/auth/sms.py:18 @@ -8472,11 +8472,11 @@ msgstr "Unidad: segundos" #: settings/serializers/auth/wecom.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the WeCom service user attribute name" msgstr "" "Mapeo de atributos de usuario, donde `key` es el nombre del atributo del " -"usuario en JumpServer y `value` es el nombre del atributo del usuario del " +"usuario del sistema y `value` es el nombre del atributo del usuario del " "servicio de WeChat empresarial" #: settings/serializers/basic.py:11 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 1433cc5ee..3519b9357 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -275,8 +275,8 @@ msgid "Random generate" msgstr "ランダム生成" #: accounts/const/automation.py:59 ops/const.py:17 -msgid "Replace (Replace only keys pushed by JumpServer) " -msgstr "置換（JumpServer によってプッシュされたキーのみを置換）" +msgid "Replace (Replace only keys pushed by system) " +msgstr "置換（システムによってプッシュされたキーのみを置換）" #: accounts/const/automation.py:60 ops/const.py:16 msgid "Empty and append SSH KEY" @@ -7724,10 +7724,10 @@ msgstr "マッピングのプロパティ" #: settings/serializers/auth/cas.py:36 msgid "" "User attribute mapping, where the `key` is the CAS service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "ユーザー属性のマッピング、ここで `key` は CAS サービスのユーザー属性名で、" -"`value` は JumpServer のユーザー属性名です" +"`value` はこのシステムのユーザー属性名です" #: settings/serializers/auth/dingtalk.py:16 msgid "Dingtalk" @@ -7735,18 +7735,18 @@ msgstr "ピン認証の有効化" #: settings/serializers/auth/dingtalk.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the DingTalk service user attribute name" msgstr "" -"ユーザー属性のマッピング、ここで `key` は JumpServer のユーザー属性名で、" +"ユーザー属性のマッピング、ここで `key` はこのシステムのユーザー属性名で、" "`value` は ディントーク サービスのユーザー属性名です" #: settings/serializers/auth/feishu.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the FeiShu service user attribute name" msgstr "" -"ユーザー属性のマッピング、ここで `key` は JumpServer のユーザー属性名で、" +"ユーザー属性のマッピング、ここで `key` はこのシステムのユーザー属性名で、" "`value` は フェイシュ サービスのユーザー属性名です" #: settings/serializers/auth/lark.py:13 users/models/user/_source.py:24 @@ -7755,10 +7755,10 @@ msgstr "Lark" #: settings/serializers/auth/lark.py:19 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Lark service user attribute name" msgstr "" -"ユーザー属性のマッピング、ここで `key` は JumpServer のユーザー属性名で、" +"ユーザー属性のマッピング、ここで `key` はこのシステムのユーザー属性名で、" "`value` は Lark サービスのユーザー属性名です" #: settings/serializers/auth/ldap.py:42 settings/serializers/auth/ldap.py:108 @@ -7803,10 +7803,10 @@ msgstr "選択は (cnまたはuidまたはsAMAccountName)=%(user)s)" #: settings/serializers/auth/ldap.py:69 settings/serializers/auth/ldap_ha.py:51 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the LDAP service user attribute name" msgstr "" -"ユーザー属性のマッピング、ここで `key` は JumpServer のユーザー属性名で、" +"ユーザー属性のマッピング、ここで `key` はこのシステムのユーザー属性名で、" "`value` は LDAP サービスのユーザー属性名です" #: settings/serializers/auth/ldap.py:85 settings/serializers/auth/ldap_ha.py:67 @@ -7912,10 +7912,10 @@ msgstr "ユーザーがログアウトすると、OAuth2 サーバからもロ #: settings/serializers/auth/oauth2.py:62 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OAuth2 service user attribute name" msgstr "" -"ユーザー属性のマッピング、ここで `key` は JumpServer のユーザー属性名で、" +"ユーザー属性のマッピング、ここで `key` はこのシステムのユーザー属性名で、" "`value` は OAuth2 サービスのユーザー属性名です" #: settings/serializers/auth/oauth2.py:67 settings/serializers/auth/oidc.py:117 @@ -7949,10 +7949,10 @@ msgstr "Ssl検証を無視する" #: settings/serializers/auth/oidc.py:41 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OIDC service user attribute name" msgstr "" -"ユーザー属性のマッピング、ここで `key` は JumpServer のユーザー属性名で、" +"ユーザー属性のマッピング、ここで `key` はこのシステムのユーザー属性名で、" "`value` は OIDC サービスのユーザー属性名です" #: settings/serializers/auth/oidc.py:45 @@ -8085,10 +8085,10 @@ msgstr "SP 証明書" #: settings/serializers/auth/saml2.py:37 msgid "" "User attribute mapping, where the `key` is the SAML2 service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "ユーザー属性マッピング（`key`はSAML2サービスのユーザー属性名、`value`は" -"JumpServerのユーザー属性名）" +"このシステムのユーザー属性名）" #: settings/serializers/auth/saml2.py:43 msgid "When the user signs out, they also be logged out from the SAML2 server" @@ -8096,10 +8096,10 @@ msgstr "ユーザーがログアウトすると、SAML2サーバーからもロ #: settings/serializers/auth/slack.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Slack service user attribute name" msgstr "" -"ユーザー属性のマッピング、ここで `key` は JumpServer のユーザー属性名で、" +"ユーザー属性のマッピング、ここで `key` はこのシステムのユーザー属性名で、" "`value` は Slack サービスのユーザー属性名です" #: settings/serializers/auth/sms.py:18 @@ -8206,10 +8206,10 @@ msgstr "単位: 秒" #: settings/serializers/auth/wecom.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the WeCom service user attribute name" msgstr "" -"ユーザー属性のマッピング、ここで `key` は JumpServer のユーザー属性名で、" +"ユーザー属性のマッピング、ここで `key` はこのシステムのユーザー属性名で、" "`value` は エンタープライズ WeChat サービスのユーザー属性名です" #: settings/serializers/basic.py:11 diff --git a/apps/i18n/core/ko/LC_MESSAGES/django.po b/apps/i18n/core/ko/LC_MESSAGES/django.po index 19552a937..459ae4592 100644 --- a/apps/i18n/core/ko/LC_MESSAGES/django.po +++ b/apps/i18n/core/ko/LC_MESSAGES/django.po @@ -275,8 +275,8 @@ msgid "Random generate" msgstr "무작위 생성" #: accounts/const/automation.py:59 ops/const.py:17 -msgid "Replace (Replace only keys pushed by JumpServer) " -msgstr "대체 (JumpServer가 푸시한 키만 대체)" +msgid "Replace (Replace only keys pushed by system) " +msgstr "대체 (시스템이 푸시한 키만 대체)" #: accounts/const/automation.py:60 ops/const.py:16 msgid "Empty and append SSH KEY" @@ -7713,10 +7713,10 @@ msgstr "속성 매핑" #: settings/serializers/auth/cas.py:36 msgid "" "User attribute mapping, where the `key` is the CAS service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "사용자 속성 매핑에서 `key`는 CAS 서비스의 사용자 속성 이름이고, `value`는 " -"JumpServer 사용자 속성 이름입니다." +"이 시스템 사용자 속성 이름입니다." #: settings/serializers/auth/dingtalk.py:16 msgid "Dingtalk" @@ -7724,18 +7724,18 @@ msgstr "딩딩 인증 활성화" #: settings/serializers/auth/dingtalk.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the DingTalk service user attribute name" msgstr "" -"사용자 속성 매핑에서 `key`는 JumpServer 사용자 속성 이름이고, `value`는 딩딩 " +"사용자 속성 매핑에서 `key`는 이 시스템 사용자 속성 이름이고, `value`는 딩딩 " "서비스의 사용자 속성 이름입니다." #: settings/serializers/auth/feishu.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the FeiShu service user attribute name" msgstr "" -"사용자 속성 매핑에서 `key`는 JumpServer 사용자 속성 이름이고, `value`는 페이" +"사용자 속성 매핑에서 `key`는 이 시스템 사용자 속성 이름이고, `value`는 페이" "서 서비스의 사용자 속성 이름입니다." #: settings/serializers/auth/lark.py:13 users/models/user/_source.py:24 @@ -7744,10 +7744,10 @@ msgstr "Lark" #: settings/serializers/auth/lark.py:19 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Lark service user attribute name" msgstr "" -"사용자 속성 매핑에서 `key`는 JumpServer 사용자 속성 이름이고, `value`는 Lark " +"사용자 속성 매핑에서 `key`는 이 시스템 사용자 속성 이름이고, `value`는 Lark " "서비스의 사용자 속성 이름입니다." #: settings/serializers/auth/ldap.py:42 settings/serializers/auth/ldap.py:108 @@ -7792,10 +7792,10 @@ msgstr "가능한 옵션은 (cn 또는 uid 또는 sAMAccountName=%(user)s)입니 #: settings/serializers/auth/ldap.py:69 settings/serializers/auth/ldap_ha.py:51 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the LDAP service user attribute name" msgstr "" -"사용자 속성 매핑에서 `key`는 JumpServer 사용자 속성 이름이고, `value`는 LDAP " +"사용자 속성 매핑에서 `key`는 이 시스템 사용자 속성 이름이고, `value`는 LDAP " "서비스 사용자 속성 이름입니다." #: settings/serializers/auth/ldap.py:85 settings/serializers/auth/ldap_ha.py:67 @@ -7901,10 +7901,10 @@ msgstr "사용자가 로그아웃할 때, 그들은 OAuth2 서버에서도 로 #: settings/serializers/auth/oauth2.py:62 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OAuth2 service user attribute name" msgstr "" -"사용자 속성 매핑, 여기서 `key`는 JumpServer 사용자 속성 이름이고, `value`는 " +"사용자 속성 매핑, 여기서 `key`는 이 시스템 사용자 속성 이름이고, `value`는 " "OAuth2 서비스 사용자 속성 이름입니다" #: settings/serializers/auth/oauth2.py:67 settings/serializers/auth/oidc.py:117 @@ -7938,10 +7938,10 @@ msgstr "SSL 인증서 검증 무시" #: settings/serializers/auth/oidc.py:41 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OIDC service user attribute name" msgstr "" -"사용자 속성 매핑, 여기서 `key`는 JumpServer 사용자 속성 이름이고, `value`는 " +"사용자 속성 매핑, 여기서 `key`는 이 시스템 사용자 속성 이름이고, `value`는 " "OIDC 서비스 사용자 속성 이름입니다" #: settings/serializers/auth/oidc.py:45 @@ -8073,10 +8073,10 @@ msgstr "SP 인증서" #: settings/serializers/auth/saml2.py:37 msgid "" "User attribute mapping, where the `key` is the SAML2 service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "사용자 속성 매핑, 여기서 `key`는 SAML2 서비스 사용자 속성 이름이고, `value`" -"는 JumpServer 사용자 속성 이름입니다." +"는 이 시스템 사용자 속성 이름입니다." #: settings/serializers/auth/saml2.py:43 msgid "When the user signs out, they also be logged out from the SAML2 server" @@ -8084,10 +8084,10 @@ msgstr "사용자가 로그아웃하면 SAML2 서버에서도 로그아웃됩니 #: settings/serializers/auth/slack.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Slack service user attribute name" msgstr "" -"사용자 속성 매핑, 여기서 `key`는 JumpServer 사용자 속성 이름이고, `value`는 " +"사용자 속성 매핑, 여기서 `key`는 이 시스템 사용자 속성 이름이고, `value`는 " "Slack 서비스 사용자 속성 이름입니다." #: settings/serializers/auth/sms.py:18 @@ -8195,10 +8195,10 @@ msgstr "단위: 초" #: settings/serializers/auth/wecom.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the WeCom service user attribute name" msgstr "" -"사용자 속성 매핑, 여기서 `key`는 JumpServer 사용자 속성 이름이고, `value`는 " +"사용자 속성 매핑, 여기서 `key`는 이 시스템 사용자 속성 이름이고, `value`는 " "기업 WeChat 서비스 사용자 속성 이름입니다." #: settings/serializers/basic.py:11 diff --git a/apps/i18n/core/pt_BR/LC_MESSAGES/django.po b/apps/i18n/core/pt_BR/LC_MESSAGES/django.po index 5c8c66659..293cc05e7 100644 --- a/apps/i18n/core/pt_BR/LC_MESSAGES/django.po +++ b/apps/i18n/core/pt_BR/LC_MESSAGES/django.po @@ -275,9 +275,9 @@ msgid "Random generate" msgstr "Gerar Aleatoriamente" #: accounts/const/automation.py:59 ops/const.py:17 -msgid "Replace (Replace only keys pushed by JumpServer) " +msgid "Replace (Replace only keys pushed by system) " msgstr "" -"Substituir (Substituir apenas as chaves impulsionadas pelo JumpServer) " +"Substituir (Substituir apenas as chaves impulsionadas pelo sistema) " #: accounts/const/automation.py:60 ops/const.py:16 msgid "Empty and append SSH KEY" @@ -7789,10 +7789,10 @@ msgstr "Mapear atributos" #: settings/serializers/auth/cas.py:36 msgid "" "User attribute mapping, where the `key` is the CAS service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "Mapeamento de atributos do usuário, onde `key` é o nome do atributo do " -"usuário do serviço CAS, e `value` é o nome do atributo do usuário JumpServer" +"usuário do serviço CAS, e `value` é o nome do atributo do usuário do sistema" #: settings/serializers/auth/dingtalk.py:16 msgid "Dingtalk" @@ -7800,20 +7800,20 @@ msgstr "Habilitar autenticação DingTalk" #: settings/serializers/auth/dingtalk.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the DingTalk service user attribute name" msgstr "" "Mapeamento de atributos do usuário, onde `key` é o nome do atributo do " -"usuário JumpServer, e `value` é o nome do atributo do usuário do serviço " +"usuário do sistema, e `value` é o nome do atributo do usuário do serviço " "DingTalk" #: settings/serializers/auth/feishu.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the FeiShu service user attribute name" msgstr "" "Mapeamento de atributos do usuário, onde `key` é o nome do atributo do " -"usuário JumpServer, e `value` é o nome do atributo do usuário do serviço " +"usuário do sistema, e `value` é o nome do atributo do usuário do serviço " "Feishu." #: settings/serializers/auth/lark.py:13 users/models/user/_source.py:24 @@ -7822,11 +7822,11 @@ msgstr "Lark" #: settings/serializers/auth/lark.py:19 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Lark service user attribute name" msgstr "" "Mapeamento de atributos do usuário, onde `key` é o nome do atributo do " -"usuário JumpServer e `value` é o nome do atributo do usuário do serviço Lark" +"usuário do sistema e `value` é o nome do atributo do usuário do serviço Lark" #: settings/serializers/auth/ldap.py:42 settings/serializers/auth/ldap.py:108 msgid "LDAP" @@ -7871,11 +7871,11 @@ msgstr "As opções possíveis são (cn ou uid ou sAMAccountName=%(user)s)" #: settings/serializers/auth/ldap.py:69 settings/serializers/auth/ldap_ha.py:51 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the LDAP service user attribute name" msgstr "" "Mapeamento de atributos do usuário, onde `key` é o nome do atributo do " -"usuário JumpServer e `value` é o nome do atributo do usuário do serviço LDAP" +"usuário do sistema e `value` é o nome do atributo do usuário do serviço LDAP" #: settings/serializers/auth/ldap.py:85 settings/serializers/auth/ldap_ha.py:67 msgid "Connect timeout (s)" @@ -7982,11 +7982,11 @@ msgstr "Quando os usuários saem, eles também sairão do servidor OAuth2" #: settings/serializers/auth/oauth2.py:62 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OAuth2 service user attribute name" msgstr "" "Mapeamento de atributos do usuário, onde `key` é o nome do atributo do " -"usuário JumpServer, e `value` é o nome do atributo do usuário do serviço " +"usuário do sistema, e `value` é o nome do atributo do usuário do serviço " "OAuth2." #: settings/serializers/auth/oauth2.py:67 settings/serializers/auth/oidc.py:117 @@ -8020,11 +8020,11 @@ msgstr "Ignorar validação do certificado SSL" #: settings/serializers/auth/oidc.py:41 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OIDC service user attribute name" msgstr "" "Mapeamento de atributos do usuário, onde `key` é o nome do atributo do " -"usuário JumpServer e `value` é o nome do atributo do usuário do serviço OIDC" +"usuário do sistema e `value` é o nome do atributo do usuário do serviço OIDC" #: settings/serializers/auth/oidc.py:45 msgid "Enable PKCE" @@ -8157,7 +8157,7 @@ msgstr "Certificado SP" #: settings/serializers/auth/saml2.py:37 msgid "" "User attribute mapping, where the `key` is the SAML2 service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "Mapeamento de atributos do usuário, onde `key` é o nome do atributo do " "usuário do serviço SAML2, `value` é o nome do atributo do usuário do " @@ -8170,11 +8170,11 @@ msgstr "" #: settings/serializers/auth/slack.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Slack service user attribute name" msgstr "" "Mapeamento de atributos do usuário, onde `key` é o nome do atributo do " -"usuário do JumpServer, `value` é o nome do atributo do usuário do serviço " +"usuário do sistema, `value` é o nome do atributo do usuário do serviço " "Slack" #: settings/serializers/auth/sms.py:18 @@ -8283,11 +8283,11 @@ msgstr "Unidade: segundos" #: settings/serializers/auth/wecom.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the WeCom service user attribute name" msgstr "" "Mapeamento de atributos do usuário, onde `key` é o nome do atributo do " -"usuário JumpServer e `value` é o nome do atributo do usuário do serviço " +"usuário do sistema e `value` é o nome do atributo do usuário do serviço " "corporativo WeChat" #: settings/serializers/basic.py:11 diff --git a/apps/i18n/core/ru/LC_MESSAGES/django.po b/apps/i18n/core/ru/LC_MESSAGES/django.po index ad93d3567..fb4b273f9 100644 --- a/apps/i18n/core/ru/LC_MESSAGES/django.po +++ b/apps/i18n/core/ru/LC_MESSAGES/django.po @@ -279,8 +279,8 @@ msgid "Random generate" msgstr "Случайно созданный" #: accounts/const/automation.py:59 ops/const.py:17 -msgid "Replace (Replace only keys pushed by JumpServer) " -msgstr "Сменить (только опубликованные с JumpServer ключи можно сменить) " +msgid "Replace (Replace only keys pushed by system) " +msgstr "Сменить (только опубликованные системой ключи можно сменить) " #: accounts/const/automation.py:60 ops/const.py:16 msgid "Empty and append SSH KEY" @@ -6856,7 +6856,7 @@ msgstr "Журнал задач" #: ops/variables.py:24 msgid "The current user`s username of JumpServer" -msgstr "Имя текущего пользователя JumpServer" +msgstr "Имя текущего пользователя системы" #: ops/variables.py:25 msgid "The id of the asset in the JumpServer" @@ -7812,10 +7812,10 @@ msgstr "Атрибуты пользователя" #: settings/serializers/auth/cas.py:36 msgid "" "User attribute mapping, where the `key` is the CAS service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "Сопоставление атрибутов пользователя, где \"ключ\" — это название атрибута " -"пользователя CAS, а \"значение\" — название атрибута пользователя JumpServer" +"пользователя CAS, а \"значение\" — название атрибута пользователя системы" #: settings/serializers/auth/dingtalk.py:16 msgid "Dingtalk" @@ -7823,20 +7823,20 @@ msgstr "Dingtalk" #: settings/serializers/auth/dingtalk.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the DingTalk service user attribute name" msgstr "" "Сопоставление атрибутов пользователя, где \"ключ\" — это название атрибута " -"пользователя JumpServer, а \"значение\" — название атрибута пользователя " +"пользователя системы, а \"значение\" — название атрибута пользователя " "службы DingTalk" #: settings/serializers/auth/feishu.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the FeiShu service user attribute name" msgstr "" "Сопоставление атрибутов пользователя, где \"ключ\" — это название атрибута " -"пользователя JumpServer, а \"значение\" — название атрибута пользователя " +"пользователя системы, а \"значение\" — название атрибута пользователя " "службы Feishu" #: settings/serializers/auth/lark.py:13 users/models/user/_source.py:24 @@ -7845,11 +7845,11 @@ msgstr "Lark" #: settings/serializers/auth/lark.py:19 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Lark service user attribute name" msgstr "" "Сопоставление атрибутов пользователя, где \"ключ\" — это имя атрибута " -"пользователя JumpServer, а \"значение\" — это имя атрибута пользователя " +"пользователя системы, а \"значение\" — это имя атрибута пользователя " "службы Lark" #: settings/serializers/auth/ldap.py:42 settings/serializers/auth/ldap.py:108 @@ -7896,11 +7896,11 @@ msgstr "Возможные варианты: (cn или uid или sAMAccountNam #: settings/serializers/auth/ldap.py:69 settings/serializers/auth/ldap_ha.py:51 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the LDAP service user attribute name" msgstr "" "Сопоставление атрибутов пользователя, где \"ключ\" — это имя атрибута " -"пользователя JumpServer, а \"значение\" — это имя атрибута пользователя " +"пользователя системы, а \"значение\" — это имя атрибута пользователя " "службы LDAP" #: settings/serializers/auth/ldap.py:85 settings/serializers/auth/ldap_ha.py:67 @@ -8008,11 +8008,11 @@ msgstr "При выходе пользователя из системы он т #: settings/serializers/auth/oauth2.py:62 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OAuth2 service user attribute name" msgstr "" "Сопоставление атрибутов пользователя, где \"ключ\" - это название атрибута " -"пользователя JumpServer, а \"значение\" - название атрибута пользователя " +"пользователя системы, а \"значение\" - название атрибута пользователя " "сервиса OAuth2" #: settings/serializers/auth/oauth2.py:67 settings/serializers/auth/oidc.py:117 @@ -8046,11 +8046,11 @@ msgstr "Игнорировать проверку SSL" #: settings/serializers/auth/oidc.py:41 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OIDC service user attribute name" msgstr "" "Сопоставление атрибутов пользователя, где \"ключ\" - это имя атрибута " -"пользователя JumpServer, а \"значение\" - это имя атрибута пользователя OIDC " +"пользователя системы, а \"значение\" - это имя атрибута пользователя OIDC " "службы" #: settings/serializers/auth/oidc.py:45 @@ -8183,10 +8183,10 @@ msgstr "Сертификат SP" #: settings/serializers/auth/saml2.py:37 msgid "" "User attribute mapping, where the `key` is the SAML2 service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "Сопоставление атрибутов пользователя, где \"ключ\" — это имя атрибута " -"пользователя SAML2, а \"значение\" — имя атрибута пользователя JumpServer" +"пользователя SAML2, а \"значение\" — имя атрибута пользователя системы" #: settings/serializers/auth/saml2.py:43 msgid "When the user signs out, they also be logged out from the SAML2 server" @@ -8194,11 +8194,11 @@ msgstr "При выходе пользователя из системы он т #: settings/serializers/auth/slack.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Slack service user attribute name" msgstr "" "Сопоставление атрибутов пользователя, где \"ключ\" — это имя атрибута " -"пользователя JumpServer, а \"значение\" — имя атрибута пользователя Slack " +"пользователя системы, а \"значение\" — имя атрибута пользователя Slack " "сервиса" #: settings/serializers/auth/sms.py:18 @@ -8306,11 +8306,11 @@ msgstr "Единицы: секунды" #: settings/serializers/auth/wecom.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the WeCom service user attribute name" msgstr "" "Сопоставление атрибутов пользователя, где \"ключ\" — это название атрибута " -"пользователя JumpServer, а \"значение\" — это название атрибута пользователя " +"пользователя системы, а \"значение\" — это название атрибута пользователя " "сервиса WeCom" #: settings/serializers/basic.py:11 diff --git a/apps/i18n/core/vi/LC_MESSAGES/django.po b/apps/i18n/core/vi/LC_MESSAGES/django.po index 0590abe71..cd05229d1 100644 --- a/apps/i18n/core/vi/LC_MESSAGES/django.po +++ b/apps/i18n/core/vi/LC_MESSAGES/django.po @@ -276,8 +276,8 @@ msgid "Random generate" msgstr "Tạo ngẫu nhiên" #: accounts/const/automation.py:59 ops/const.py:17 -msgid "Replace (Replace only keys pushed by JumpServer) " -msgstr "Thay thế (chỉ thay thế các khóa do JumpServer gửi)" +msgid "Replace (Replace only keys pushed by system) " +msgstr "Thay thế (chỉ thay thế các khóa do hệ thống gửi)" #: accounts/const/automation.py:60 ops/const.py:16 msgid "Empty and append SSH KEY" @@ -7808,10 +7808,10 @@ msgstr "Ánh xạ thuộc tính." #: settings/serializers/auth/cas.py:36 msgid "" "User attribute mapping, where the `key` is the CAS service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "Bản đồ thuộc tính người dùng, trong đó `key` là tên thuộc tính người dùng " -"dịch vụ CAS, `value` là tên thuộc tính người dùng JumpServer" +"dịch vụ CAS, `value` là tên thuộc tính người dùng hệ thống" #: settings/serializers/auth/dingtalk.py:16 msgid "Dingtalk" @@ -7819,19 +7819,19 @@ msgstr "Kích hoạt xác thực DingTalk" #: settings/serializers/auth/dingtalk.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the DingTalk service user attribute name" msgstr "" "Bản đồ thuộc tính người dùng, trong đó `key` là tên thuộc tính người dùng " -"JumpServer, `value` là tên thuộc tính người dùng dịch vụ DingTalk" +"hệ thống, `value` là tên thuộc tính người dùng dịch vụ DingTalk" #: settings/serializers/auth/feishu.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the FeiShu service user attribute name" msgstr "" "Bản đồ thuộc tính người dùng, trong đó `key` là tên thuộc tính người dùng " -"JumpServer, `value` là tên thuộc tính người dùng dịch vụ FeiShu" +"hệ thống, `value` là tên thuộc tính người dùng dịch vụ FeiShu" #: settings/serializers/auth/lark.py:13 users/models/user/_source.py:24 msgid "Lark" @@ -7839,11 +7839,11 @@ msgstr "Lark" #: settings/serializers/auth/lark.py:19 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Lark service user attribute name" msgstr "" "Bản đồ thuộc tính người dùng, trong đó `key` là tên thuộc tính người dùng " -"JumpServer, `value` là tên thuộc tính người dùng dịch vụ Lark" +"hệ thống, `value` là tên thuộc tính người dùng dịch vụ Lark" #: settings/serializers/auth/ldap.py:42 settings/serializers/auth/ldap.py:108 msgid "LDAP" @@ -7886,7 +7886,7 @@ msgid "Selection could include (cn|uid|sAMAccountName=%(user)s)" msgstr "" "Các tùy chọn khả thi là (cn hoặc uid hoặc sAMAccountName=%(user)s) <---SEP---" "> ánh xạ thuộc tính người dùng, trong đó `key` là tên thuộc tính người dùng " -"của JumpServer, `value` là tên thuộc tính người dùng của dịch vụ LDAP <---" +"của hệ thống, `value` là tên thuộc tính người dùng của dịch vụ LDAP <---" "SEP---> Thời gian vượt thời gian kết nối (giây) <---SEP---> Chế độ nghiêm " "ngặt <---SEP---> Khi chế độ nghiêm ngặt được bật, việc đồng bộ toàn bộ hoặc " "tự động sẽ vô hiệu hóa những người dùng không được phát hiện trong LDAP <---" @@ -7903,11 +7903,11 @@ msgstr "" #: settings/serializers/auth/ldap.py:69 settings/serializers/auth/ldap_ha.py:51 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the LDAP service user attribute name" msgstr "" "Ánh xạ thuộc tính của người dùng, trong đó `key` là tên thuộc tính người " -"dùng JumpServer, `value` là tên thuộc tính người dùng dịch vụ LDAP" +"dùng hệ thống, `value` là tên thuộc tính người dùng dịch vụ LDAP" #: settings/serializers/auth/ldap.py:85 settings/serializers/auth/ldap_ha.py:67 msgid "Connect timeout (s)" @@ -8014,11 +8014,11 @@ msgstr "Khi người dùng đăng xuất, họ cũng sẽ thoát khỏi máy ch #: settings/serializers/auth/oauth2.py:62 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OAuth2 service user attribute name" msgstr "" "Ánh xạ thuộc tính người dùng, trong đó `key` là tên thuộc tính người dùng " -"của JumpServer, `value` là tên thuộc tính người dùng của dịch vụ OAuth2" +"của hệ thống, `value` là tên thuộc tính người dùng của dịch vụ OAuth2" #: settings/serializers/auth/oauth2.py:67 settings/serializers/auth/oidc.py:117 #: settings/serializers/auth/saml2.py:45 @@ -8051,11 +8051,11 @@ msgstr "Bỏ qua xác thực chứng chỉ SSL" #: settings/serializers/auth/oidc.py:41 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OIDC service user attribute name" msgstr "" "Ánh xạ thuộc tính người dùng, trong đó `key` là tên thuộc tính người dùng " -"của JumpServer, `value` là tên thuộc tính người dùng của dịch vụ OIDC" +"của hệ thống, `value` là tên thuộc tính người dùng của dịch vụ OIDC" #: settings/serializers/auth/oidc.py:45 msgid "Enable PKCE" @@ -8189,10 +8189,10 @@ msgstr "Chứng chỉ SP" #: settings/serializers/auth/saml2.py:37 msgid "" "User attribute mapping, where the `key` is the SAML2 service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" "Ánh xạ thuộc tính người dùng, trong đó `key` là tên thuộc tính người dùng " -"dịch vụ SAML2, `value` là tên thuộc tính người dùng JumpServer" +"dịch vụ SAML2, `value` là tên thuộc tính người dùng hệ thống" #: settings/serializers/auth/saml2.py:43 msgid "When the user signs out, they also be logged out from the SAML2 server" @@ -8200,11 +8200,11 @@ msgstr "Khi người dùng đăng xuất, họ cũng sẽ bị đăng xuất kh #: settings/serializers/auth/slack.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Slack service user attribute name" msgstr "" "Ánh xạ thuộc tính người dùng, trong đó `key` là tên thuộc tính người dùng " -"JumpServer, `value` là tên thuộc tính người dùng dịch vụ Slack" +"hệ thống, `value` là tên thuộc tính người dùng dịch vụ Slack" #: settings/serializers/auth/sms.py:18 msgid "Enable Short Message Service (SMS)" @@ -8311,11 +8311,11 @@ msgstr "Đơn vị: giây" #: settings/serializers/auth/wecom.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the WeCom service user attribute name" msgstr "" "Ánh xạ thuộc tính người dùng, trong đó `key` là tên thuộc tính người dùng " -"JumpServer, `value` là tên thuộc tính người dùng dịch vụ WeChat doanh nghiệp" +"hệ thống, `value` là tên thuộc tính người dùng dịch vụ WeChat doanh nghiệp" #: settings/serializers/basic.py:11 msgid "Site URL" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 6281daf31..203ac7eb4 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -273,8 +273,8 @@ msgid "Random generate" msgstr "随机生成" #: accounts/const/automation.py:59 ops/const.py:17 -msgid "Replace (Replace only keys pushed by JumpServer) " -msgstr "替换 (只替换由 JumpServer 推送的密钥)" +msgid "Replace (Replace only keys pushed by system) " +msgstr "替换 (只替换由本系统推送的密钥)" #: accounts/const/automation.py:60 ops/const.py:16 msgid "Empty and append SSH KEY" @@ -7413,9 +7413,9 @@ msgstr "映射属性" #: settings/serializers/auth/cas.py:36 msgid "" "User attribute mapping, where the `key` is the CAS service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" -"用户属性映射，其中 `key` 是 CAS 服务用户属性名称，`value` 是 JumpServer 用户" +"用户属性映射，其中 `key` 是 CAS 服务用户属性名称，`value` 是本系统用户" "属性名称" #: settings/serializers/auth/dingtalk.py:16 @@ -7424,18 +7424,18 @@ msgstr "启用钉钉认证" #: settings/serializers/auth/dingtalk.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the DingTalk service user attribute name" msgstr "" -"用户属性映射，其中 `key` 是 JumpServer 用户属性名称，`value` 是钉钉服务用户属" +"用户属性映射，其中 `key` 是本系统用户属性名称，`value` 是钉钉服务用户属" "性名称" #: settings/serializers/auth/feishu.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the FeiShu service user attribute name" msgstr "" -"用户属性映射，其中 `key` 是 JumpServer 用户属性名称，`value` 是飞书服务用户属" +"用户属性映射，其中 `key` 是本系统用户属性名称，`value` 是飞书服务用户属" "性名称" #: settings/serializers/auth/lark.py:13 users/models/user/_source.py:24 @@ -7444,10 +7444,10 @@ msgstr "Lark" #: settings/serializers/auth/lark.py:19 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Lark service user attribute name" msgstr "" -"用户属性映射，其中 `key` 是 JumpServer 用户属性名称，`value` 是 Lark 服务用户" +"用户属性映射，其中 `key` 是本系统用户属性名称，`value` 是 Lark 服务用户" "属性名称" #: settings/serializers/auth/ldap.py:42 settings/serializers/auth/ldap.py:108 @@ -7491,10 +7491,10 @@ msgstr "可能的选项是(cn或uid或sAMAccountName=%(user)s)" #: settings/serializers/auth/ldap.py:69 settings/serializers/auth/ldap_ha.py:51 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the LDAP service user attribute name" msgstr "" -"用户属性映射，其中 `key` 是 JumpServer 用户属性名称，`value` 是 LDAP 服务用户" +"用户属性映射，其中 `key` 是本系统用户属性名称，`value` 是 LDAP 服务用户" "属性名称" #: settings/serializers/auth/ldap.py:85 settings/serializers/auth/ldap_ha.py:67 @@ -7596,10 +7596,10 @@ msgstr "当用户退出时，他们也会从 OAuth2 服务器退出" #: settings/serializers/auth/oauth2.py:62 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OAuth2 service user attribute name" msgstr "" -"用户属性映射，其中 `key` 是 JumpServer 用户属性名称，`value` 是 OAuth2 服务用" +"用户属性映射，其中 `key` 是本系统用户属性名称，`value` 是 OAuth2 服务用" "户属性名称" #: settings/serializers/auth/oauth2.py:67 settings/serializers/auth/oidc.py:117 @@ -7633,10 +7633,10 @@ msgstr "忽略 SSL 证书验证" #: settings/serializers/auth/oidc.py:41 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OIDC service user attribute name" msgstr "" -"用户属性映射，其中 `key` 是 JumpServer 用户属性名称，`value` 是 OIDC 服务用户" +"用户属性映射，其中 `key` 是本系统用户属性名称，`value` 是 OIDC 服务用户" "属性名称" #: settings/serializers/auth/oidc.py:45 @@ -7765,9 +7765,9 @@ msgstr "SP 证书" #: settings/serializers/auth/saml2.py:37 msgid "" "User attribute mapping, where the `key` is the SAML2 service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" -"用户属性映射，其中 `key` 是 SAML2 服务用户属性名称，`value` 是 JumpServer 用" +"用户属性映射，其中 `key` 是 SAML2 服务用户属性名称，`value` 是本系统用" "户属性名称" #: settings/serializers/auth/saml2.py:43 @@ -7776,10 +7776,10 @@ msgstr "当用户退出时，他们也会从 SAML2 服务器注销" #: settings/serializers/auth/slack.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Slack service user attribute name" msgstr "" -"用户属性映射，其中 `key` 是 JumpServer 用户属性名称，`value` 是 Slack 服务用" +"用户属性映射，其中 `key` 是本系统用户属性名称，`value` 是 Slack 服务用" "户属性名称" #: settings/serializers/auth/sms.py:18 @@ -7884,10 +7884,10 @@ msgstr "单位: 秒" #: settings/serializers/auth/wecom.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the WeCom service user attribute name" msgstr "" -"用户属性映射，其中 `key` 是 JumpServer 用户属性名称，`value` 是企业微信服务用" +"用户属性映射，其中 `key` 是本系统用户属性名称，`value` 是企业微信服务用" "户属性名称" #: settings/serializers/basic.py:11 diff --git a/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po b/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po index 7684d6973..c97d34f83 100644 --- a/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po @@ -275,8 +275,8 @@ msgid "Random generate" msgstr "隨機生成" #: accounts/const/automation.py:59 ops/const.py:17 -msgid "Replace (Replace only keys pushed by JumpServer) " -msgstr "替換 (只替換由 JumpServer 推送的金鑰)" +msgid "Replace (Replace only keys pushed by system) " +msgstr "替換 (只替換由本系統建立的金鑰)" #: accounts/const/automation.py:60 ops/const.py:16 msgid "Empty and append SSH KEY" @@ -7562,9 +7562,9 @@ msgstr "映射屬性" #: settings/serializers/auth/cas.py:36 msgid "" "User attribute mapping, where the `key` is the CAS service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" -"使用者屬性對照，其中 `key` 是 CAS 服務使用者屬性名稱，`value` 是 JumpServer " +"使用者屬性對照，其中 `key` 是 CAS 服務使用者屬性名稱，`value` 是本系統使用者" "使用者屬性名稱" #: settings/serializers/auth/dingtalk.py:16 @@ -7573,18 +7573,18 @@ msgstr "啟用釘釘認證" #: settings/serializers/auth/dingtalk.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the DingTalk service user attribute name" msgstr "" -"使用者屬性對照，其中 `key` 是 JumpServer 使用者屬性名稱，`value` 是釘釘服務使" +"使用者屬性對照，其中 `key` 是本系統使用者屬性名稱，`value` 是釘釘服務使" "用者屬性名稱" #: settings/serializers/auth/feishu.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the FeiShu service user attribute name" msgstr "" -"使用者屬性對照，其中 `key` 是 JumpServer 使用者屬性名稱，`value` 是飛書服務使" +"使用者屬性對照，其中 `key` 是本系統使用者屬性名稱，`value` 是飛書服務使" "用者屬性名稱" #: settings/serializers/auth/lark.py:13 users/models/user/_source.py:24 @@ -7593,10 +7593,10 @@ msgstr "Lark" #: settings/serializers/auth/lark.py:19 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Lark service user attribute name" msgstr "" -"使用者屬性對照，其中 `key` 是 JumpServer 使用者屬性名稱，`value` 是 Lark 服務" +"使用者屬性對照，其中 `key` 是本系統使用者屬性名稱，`value` 是 Lark 服務" "使用者屬性名稱" #: settings/serializers/auth/ldap.py:42 settings/serializers/auth/ldap.py:108 @@ -7640,10 +7640,10 @@ msgstr "可能的選項是(cn或uid或sAMAccountName=%(user)s)" #: settings/serializers/auth/ldap.py:69 settings/serializers/auth/ldap_ha.py:51 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the LDAP service user attribute name" msgstr "" -"使用者屬性對照，其中 `key` 是 JumpServer 使用者屬性名稱，`value` 是 LDAP 服務" +"使用者屬性對照，其中 `key` 是本系統使用者屬性名稱，`value` 是 LDAP 服務" "使用者屬性名稱" #: settings/serializers/auth/ldap.py:85 settings/serializers/auth/ldap_ha.py:67 @@ -7745,10 +7745,10 @@ msgstr "當使用者退出時，他們也會從 OAuth2 伺服器退出" #: settings/serializers/auth/oauth2.py:62 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OAuth2 service user attribute name" msgstr "" -"使用者屬性對照，其中 `key` 是 JumpServer 使用者屬性名稱，`value` 是 OAuth2 服" +"使用者屬性對照，其中 `key` 是本系統使用者屬性名稱，`value` 是 OAuth2 服" "務使用者屬性名稱" #: settings/serializers/auth/oauth2.py:67 settings/serializers/auth/oidc.py:117 @@ -7782,10 +7782,10 @@ msgstr "Ignore SSL certificate verification" #: settings/serializers/auth/oidc.py:41 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the OIDC service user attribute name" msgstr "" -"使用者屬性映射，其中 `key` 是 JumpServer 使用者屬性名稱，`value` 是 OIDC 服務" +"使用者屬性映射，其中 `key` 是本系統使用者屬性名稱，`value` 是 OIDC 服務" "使用者屬性名稱" #: settings/serializers/auth/oidc.py:45 @@ -7914,10 +7914,10 @@ msgstr "SP 證書" #: settings/serializers/auth/saml2.py:37 msgid "" "User attribute mapping, where the `key` is the SAML2 service user attribute " -"name and the `value` is the JumpServer user attribute name" +"name and the `value` is this system user attribute name" msgstr "" " 使用者屬性映射，其中 `key` 是 SAML2 服務使用者屬性名稱，`value` 是 " -"JumpServer 使用者屬性名稱" +"本系統使用者屬性名稱" #: settings/serializers/auth/saml2.py:43 msgid "When the user signs out, they also be logged out from the SAML2 server" @@ -7925,10 +7925,10 @@ msgstr "當使用者登出時，他們也會從 SAML2 伺服器登出" #: settings/serializers/auth/slack.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the Slack service user attribute name" msgstr "" -"使用者屬性對照，其中 `key` 是 JumpServer 使用者屬性名稱，`value` 是 Slack 服" +"使用者屬性對照，其中 `key` 是本系統使用者屬性名稱，`value` 是 Slack 服" "務使用者屬性名稱" #: settings/serializers/auth/sms.py:18 @@ -8033,10 +8033,10 @@ msgstr "單位: 秒" #: settings/serializers/auth/wecom.py:20 msgid "" -"User attribute mapping, where the `key` is the JumpServer user attribute " +"User attribute mapping, where the `key` is this system user attribute " "name and the `value` is the WeCom service user attribute name" msgstr "" -"使用者屬性映射，其中 `key` 是 JumpServer 使用者屬性名稱，`value` 是企業微信服" +"使用者屬性映射，其中 `key` 是本系統使用者屬性名稱，`value` 是企業微信服" "務使用者屬性名稱" #: settings/serializers/basic.py:11 diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 5937f3bf2..f506a4335 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -1437,7 +1437,7 @@ "TerminalUpdate": "更新终端", "TerminalUpdateStorage": "更新终端存储", "Terminate": "终断", - "TerminateTaskSendSuccessMsg": "终断任务已下发，请稍后刷新查看", + "TerminateTaskSendSuccessMsg": "中断任务已下发，请稍后刷新查看", "TermsAndConditions": "条款和条件", "Test": "测试", "TestAccountConnective": "测试账号可连接性", diff --git a/apps/ops/const.py b/apps/ops/const.py index e07922f66..1989eb877 100644 --- a/apps/ops/const.py +++ b/apps/ops/const.py @@ -14,7 +14,7 @@ class StrategyChoice(models.TextChoices): class SSHKeyStrategy(models.TextChoices): add = 'add', _('Append SSH KEY') set = 'set', _('Empty and append SSH KEY') - set_jms = 'set_jms', _('Replace (Replace only keys pushed by JumpServer) ') + set_jms = 'set_jms', _('Replace (Replace only keys pushed by system) ') class PasswordStrategy(models.TextChoices): diff --git a/apps/settings/serializers/auth/cas.py b/apps/settings/serializers/auth/cas.py index c5d99f018..0d52906c3 100644 --- a/apps/settings/serializers/auth/cas.py +++ b/apps/settings/serializers/auth/cas.py @@ -34,7 +34,7 @@ class CASSettingSerializer(serializers.Serializer): required=False, label=_('User attribute'), help_text=_( "User attribute mapping, where the `key` is the CAS service user attribute name " - "and the `value` is the JumpServer user attribute name" + "and the `value` is this system user attribute name" ) ) CAS_ORG_IDS = OrgListField() diff --git a/apps/settings/serializers/auth/dingtalk.py b/apps/settings/serializers/auth/dingtalk.py index c5a30572c..2a8206c49 100644 --- a/apps/settings/serializers/auth/dingtalk.py +++ b/apps/settings/serializers/auth/dingtalk.py @@ -17,7 +17,7 @@ class DingTalkSettingSerializer(serializers.Serializer): DINGTALK_RENAME_ATTRIBUTES = serializers.JSONField( required=False, label=_('User attribute'), help_text=_( - 'User attribute mapping, where the `key` is the JumpServer user attribute name and the ' + 'User attribute mapping, where the `key` is this system user attribute name and the ' '`value` is the DingTalk service user attribute name' ) ) diff --git a/apps/settings/serializers/auth/feishu.py b/apps/settings/serializers/auth/feishu.py index 5d06e5b22..45abb2300 100644 --- a/apps/settings/serializers/auth/feishu.py +++ b/apps/settings/serializers/auth/feishu.py @@ -17,7 +17,7 @@ class FeiShuSettingSerializer(serializers.Serializer): FEISHU_RENAME_ATTRIBUTES = serializers.JSONField( required=False, label=_('User attribute'), help_text=_( - 'User attribute mapping, where the `key` is the JumpServer user attribute name and the ' + 'User attribute mapping, where the `key` is this system user attribute name and the ' '`value` is the FeiShu service user attribute name' ) ) diff --git a/apps/settings/serializers/auth/lark.py b/apps/settings/serializers/auth/lark.py index 7d6e58c20..3de2ead27 100644 --- a/apps/settings/serializers/auth/lark.py +++ b/apps/settings/serializers/auth/lark.py @@ -16,7 +16,7 @@ class LarkSettingSerializer(serializers.Serializer): LARK_RENAME_ATTRIBUTES = serializers.JSONField( required=False, label=_('User attribute'), help_text=_( - 'User attribute mapping, where the `key` is the JumpServer user attribute name and the ' + 'User attribute mapping, where the `key` is this system user attribute name and the ' '`value` is the Lark service user attribute name' ) ) diff --git a/apps/settings/serializers/auth/ldap.py b/apps/settings/serializers/auth/ldap.py index 407a18fd1..6d644616e 100644 --- a/apps/settings/serializers/auth/ldap.py +++ b/apps/settings/serializers/auth/ldap.py @@ -66,7 +66,7 @@ class LDAPSettingSerializer(LDAPSerializerMixin, serializers.Serializer): AUTH_LDAP_USER_ATTR_MAP = serializers.JSONField( required=True, label=_('User attribute'), help_text=_( - 'User attribute mapping, where the `key` is the JumpServer user attribute name and the ' + 'User attribute mapping, where the `key` is this system user attribute name and the ' '`value` is the LDAP service user attribute name' ) ) diff --git a/apps/settings/serializers/auth/ldap_ha.py b/apps/settings/serializers/auth/ldap_ha.py index c0efaab56..ab6e94015 100644 --- a/apps/settings/serializers/auth/ldap_ha.py +++ b/apps/settings/serializers/auth/ldap_ha.py @@ -48,7 +48,7 @@ class LDAPHASettingSerializer(LDAPSerializerMixin, serializers.Serializer): AUTH_LDAP_HA_USER_ATTR_MAP = serializers.JSONField( required=True, label=_('User attribute'), help_text=_( - 'User attribute mapping, where the `key` is the JumpServer user attribute name and the ' + 'User attribute mapping, where the `key` is this system user attribute name and the ' '`value` is the LDAP service user attribute name' ) ) diff --git a/apps/settings/serializers/auth/oauth2.py b/apps/settings/serializers/auth/oauth2.py index 6d23e742f..0797e5c8e 100644 --- a/apps/settings/serializers/auth/oauth2.py +++ b/apps/settings/serializers/auth/oauth2.py @@ -59,7 +59,7 @@ class OAuth2SettingSerializer(serializers.Serializer): AUTH_OAUTH2_USER_ATTR_MAP = serializers.JSONField( required=True, label=_('User attribute'), help_text=_( - 'User attribute mapping, where the `key` is the JumpServer user attribute name and the ' + 'User attribute mapping, where the `key` is this system user attribute name and the ' '`value` is the OAuth2 service user attribute name' ) ) diff --git a/apps/settings/serializers/auth/oidc.py b/apps/settings/serializers/auth/oidc.py index 7323ccbd6..80af5f39d 100644 --- a/apps/settings/serializers/auth/oidc.py +++ b/apps/settings/serializers/auth/oidc.py @@ -38,7 +38,7 @@ class CommonSettingSerializer(serializers.Serializer): AUTH_OPENID_USER_ATTR_MAP = serializers.JSONField( required=True, label=_('User attribute'), help_text=_( - "User attribute mapping, where the `key` is the JumpServer user attribute name " + "User attribute mapping, where the `key` is this system user attribute name " "and the `value` is the OIDC service user attribute name" ) ) diff --git a/apps/settings/serializers/auth/saml2.py b/apps/settings/serializers/auth/saml2.py index 46f185916..31862ae95 100644 --- a/apps/settings/serializers/auth/saml2.py +++ b/apps/settings/serializers/auth/saml2.py @@ -35,7 +35,7 @@ class SAML2SettingSerializer(serializers.Serializer): required=False, label=_('User attribute'), help_text=_( "User attribute mapping, where the `key` is the SAML2 service user attribute name " - "and the `value` is the JumpServer user attribute name" + "and the `value` is this system user attribute name" ) ) SAML2_LOGOUT_COMPLETELY = serializers.BooleanField( diff --git a/apps/settings/serializers/auth/slack.py b/apps/settings/serializers/auth/slack.py index f3bf5ad5e..d80b70ebf 100644 --- a/apps/settings/serializers/auth/slack.py +++ b/apps/settings/serializers/auth/slack.py @@ -17,7 +17,7 @@ class SlackSettingSerializer(serializers.Serializer): SLACK_RENAME_ATTRIBUTES = serializers.JSONField( required=False, label=_('User attribute'), help_text=_( - 'User attribute mapping, where the `key` is the JumpServer user attribute name and the ' + 'User attribute mapping, where the `key` is this system user attribute name and the ' '`value` is the Slack service user attribute name' ) ) diff --git a/apps/settings/serializers/auth/sso.py b/apps/settings/serializers/auth/sso.py index fe43357d6..71f71b165 100644 --- a/apps/settings/serializers/auth/sso.py +++ b/apps/settings/serializers/auth/sso.py @@ -14,7 +14,7 @@ class SSOSettingSerializer(serializers.Serializer): AUTH_SSO = serializers.BooleanField( required=False, label=_('Enable SSO auth'), - help_text=_("Other service can using SSO token login to JumpServer without password") + help_text=_("Other service can using SSO token login to system without password") ) AUTH_SSO_AUTHKEY_TTL = serializers.IntegerField( required=False, label=_('SSO auth key TTL'), help_text=_("Unit: second"), diff --git a/apps/settings/serializers/auth/wecom.py b/apps/settings/serializers/auth/wecom.py index b398721f6..dc0a4d08a 100644 --- a/apps/settings/serializers/auth/wecom.py +++ b/apps/settings/serializers/auth/wecom.py @@ -17,7 +17,7 @@ class WeComSettingSerializer(serializers.Serializer): WECOM_RENAME_ATTRIBUTES = serializers.JSONField( required=False, label=_('User attribute'), help_text=_( - 'User attribute mapping, where the `key` is the JumpServer user attribute name and the ' + 'User attribute mapping, where the `key` is this system user attribute name and the ' '`value` is the WeCom service user attribute name' ) ) diff --git a/apps/terminal/utils/components.py b/apps/terminal/utils/components.py index da853f0c1..310991a66 100644 --- a/apps/terminal/utils/components.py +++ b/apps/terminal/utils/components.py @@ -106,7 +106,7 @@ class ComponentsPrometheusMetricsUtil(TypedComponentsStatusMetricsUtil): def get_component_status_metrics(self): prometheus_metrics = list() # 各组件状态个数汇总 - prometheus_metrics.append('# JumpServer 各组件状态个数汇总') + prometheus_metrics.append('# 各组件状态个数汇总') status_metric_text = 'jumpserver_components_status_total{component_type="%s", status="%s"} %s' for metric in self.metrics: tp = metric['type'] @@ -120,7 +120,7 @@ class ComponentsPrometheusMetricsUtil(TypedComponentsStatusMetricsUtil): def get_component_session_metrics(self): prometheus_metrics = list() # 各组件在线会话数汇总 - prometheus_metrics.append('# JumpServer 各组件在线会话数汇总') + prometheus_metrics.append('# 各组件在线会话数汇总') session_active_metric_text = 'jumpserver_components_session_active_total{component_type="%s"} %s' for metric in self.metrics: @@ -133,7 +133,7 @@ class ComponentsPrometheusMetricsUtil(TypedComponentsStatusMetricsUtil): def get_component_stat_metrics(self): prometheus_metrics = list() # 各组件节点指标 - prometheus_metrics.append('# JumpServer 各组件一些指标') + prometheus_metrics.append('# 各组件一些指标') state_metric_text = 'jumpserver_components_%s{component_type="%s", component="%s"} %s' stats_key = [ 'cpu_load', 'memory_used', 'disk_used', 'session_online'