diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index d850a1cc1..2d7a87994 100644 --- a/apps/locale/ja/LC_MESSAGES/django.po +++ b/apps/locale/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-19 13:16+0800\n" +"POT-Creation-Date: 2022-05-31 16:02+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -134,7 +134,7 @@ msgstr "システムユーザー" #: terminal/backends/command/serializers.py:13 terminal/models/session.py:46 #: terminal/notifications.py:90 #: xpack/plugins/change_auth_plan/models/asset.py:199 -#: xpack/plugins/change_auth_plan/serializers/asset.py:180 +#: xpack/plugins/change_auth_plan/serializers/asset.py:181 #: xpack/plugins/cloud/models.py:223 msgid "Asset" msgstr "資産" @@ -320,7 +320,7 @@ msgid "Domain" msgstr "ドメイン" #: applications/models/application.py:228 xpack/plugins/cloud/models.py:33 -#: xpack/plugins/cloud/serializers/account.py:59 +#: xpack/plugins/cloud/serializers/account.py:60 msgid "Attrs" msgstr "ツールバーの" @@ -414,10 +414,10 @@ msgstr "アプリケーションパス" #: applications/serializers/attrs/application_category/remote_app.py:44 #: assets/serializers/system_user.py:168 -#: xpack/plugins/change_auth_plan/serializers/asset.py:66 -#: xpack/plugins/change_auth_plan/serializers/asset.py:69 -#: xpack/plugins/change_auth_plan/serializers/asset.py:72 -#: xpack/plugins/change_auth_plan/serializers/asset.py:103 +#: xpack/plugins/change_auth_plan/serializers/asset.py:67 +#: xpack/plugins/change_auth_plan/serializers/asset.py:70 +#: xpack/plugins/change_auth_plan/serializers/asset.py:73 +#: xpack/plugins/change_auth_plan/serializers/asset.py:104 #: xpack/plugins/cloud/serializers/account_attrs.py:54 msgid "This field is required." msgstr "このフィールドは必須です。" @@ -665,7 +665,7 @@ msgstr "すべて" #: assets/models/backup.py:52 assets/serializers/backup.py:32 #: xpack/plugins/change_auth_plan/models/app.py:41 #: xpack/plugins/change_auth_plan/models/asset.py:62 -#: xpack/plugins/change_auth_plan/serializers/base.py:44 +#: xpack/plugins/change_auth_plan/serializers/base.py:49 msgid "Recipient" msgstr "受信者" @@ -708,7 +708,7 @@ msgstr "アカウントのバックアップスナップショット" #: assets/models/backup.py:116 assets/serializers/backup.py:40 #: xpack/plugins/change_auth_plan/models/base.py:125 -#: xpack/plugins/change_auth_plan/serializers/base.py:73 +#: xpack/plugins/change_auth_plan/serializers/base.py:82 msgid "Trigger mode" msgstr "トリガーモード" @@ -716,7 +716,7 @@ msgstr "トリガーモード" #: terminal/models/sharing.py:94 #: xpack/plugins/change_auth_plan/models/base.py:201 #: xpack/plugins/change_auth_plan/serializers/app.py:66 -#: xpack/plugins/change_auth_plan/serializers/asset.py:179 +#: xpack/plugins/change_auth_plan/serializers/asset.py:180 #: xpack/plugins/cloud/models.py:179 msgid "Reason" msgstr "理由" @@ -726,7 +726,7 @@ msgstr "理由" #: terminal/serializers/session.py:35 #: xpack/plugins/change_auth_plan/models/base.py:202 #: xpack/plugins/change_auth_plan/serializers/app.py:67 -#: xpack/plugins/change_auth_plan/serializers/asset.py:181 +#: xpack/plugins/change_auth_plan/serializers/asset.py:182 msgid "Is success" msgstr "成功は" @@ -735,7 +735,8 @@ msgid "Account backup execution" msgstr "アカウントバックアップの実行" #: assets/models/base.py:30 assets/tasks/const.py:51 audits/const.py:5 -#: common/utils/ip/geoip/utils.py:41 common/utils/ip/utils.py:78 +#: common/utils/ip/geoip/utils.py:31 common/utils/ip/geoip/utils.py:37 +#: common/utils/ip/utils.py:84 msgid "Unknown" msgstr "不明" @@ -745,8 +746,8 @@ msgstr "OK" #: assets/models/base.py:32 audits/models.py:118 #: xpack/plugins/change_auth_plan/serializers/app.py:88 -#: xpack/plugins/change_auth_plan/serializers/asset.py:198 -#: xpack/plugins/cloud/const.py:31 +#: xpack/plugins/change_auth_plan/serializers/asset.py:199 +#: xpack/plugins/cloud/const.py:32 msgid "Failed" msgstr "失敗しました" @@ -769,6 +770,8 @@ msgstr "確認済みの日付" #: xpack/plugins/change_auth_plan/models/base.py:42 #: xpack/plugins/change_auth_plan/models/base.py:121 #: xpack/plugins/change_auth_plan/models/base.py:196 +#: xpack/plugins/change_auth_plan/serializers/base.py:22 +#: xpack/plugins/change_auth_plan/serializers/base.py:77 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Password" msgstr "パスワード" @@ -898,7 +901,7 @@ msgstr "テストゲートウェイ" msgid "Unable to connect to port {port} on {ip}" msgstr "{ip} でポート {port} に接続できません" -#: assets/models/domain.py:133 +#: assets/models/domain.py:133 xpack/plugins/cloud/providers/fc.py:48 msgid "Authentication failed" msgstr "認証に失敗しました" @@ -1115,12 +1118,12 @@ msgstr "アクション" #: assets/serializers/backup.py:31 ops/mixin.py:106 ops/mixin.py:147 #: settings/serializers/auth/ldap.py:65 -#: xpack/plugins/change_auth_plan/serializers/base.py:42 +#: xpack/plugins/change_auth_plan/serializers/base.py:47 msgid "Periodic perform" msgstr "定期的なパフォーマンス" #: assets/serializers/backup.py:33 -#: xpack/plugins/change_auth_plan/serializers/base.py:45 +#: xpack/plugins/change_auth_plan/serializers/base.py:50 msgid "Currently only mail sending is supported" msgstr "現在、メール送信のみがサポートされています" @@ -1414,7 +1417,7 @@ msgstr "ファイル名" #: audits/models.py:43 audits/models.py:117 terminal/models/sharing.py:90 #: tickets/views/approve.py:98 #: xpack/plugins/change_auth_plan/serializers/app.py:87 -#: xpack/plugins/change_auth_plan/serializers/asset.py:197 +#: xpack/plugins/change_auth_plan/serializers/asset.py:198 msgid "Success" msgstr "成功" @@ -2196,7 +2199,7 @@ msgstr "コードエラー" #: authentication/templates/authentication/_msg_reset_password.html:3 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:301 ops/tasks.py:145 ops/tasks.py:148 +#: jumpserver/conf.py:304 ops/tasks.py:145 ops/tasks.py:148 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:23 @@ -2647,15 +2650,14 @@ msgstr "確認コードが正しくありません" msgid "Please wait {} seconds before sending" msgstr "{} 秒待ってから送信してください" -#: common/utils/ip/geoip/utils.py:17 common/utils/ip/geoip/utils.py:30 -#: common/utils/ip/ipip/utils.py:15 -msgid "Invalid ip" -msgstr "無効なIP" - -#: common/utils/ip/geoip/utils.py:28 +#: common/utils/ip/geoip/utils.py:24 msgid "LAN" msgstr "LAN" +#: common/utils/ip/geoip/utils.py:26 common/utils/ip/utils.py:78 +msgid "Invalid ip" +msgstr "無効なIP" + #: common/validators.py:32 msgid "This field must be unique." msgstr "このフィールドは一意である必要があります。" @@ -2668,11 +2670,11 @@ msgstr "特殊文字を含むべきではない" msgid "The mobile phone number format is incorrect" msgstr "携帯電話番号の形式が正しくありません" -#: jumpserver/conf.py:300 +#: jumpserver/conf.py:303 msgid "Create account successfully" msgstr "アカウントを正常に作成" -#: jumpserver/conf.py:302 +#: jumpserver/conf.py:305 msgid "Your account has been created successfully" msgstr "アカウントが正常に作成されました" @@ -3476,7 +3478,7 @@ msgstr "ログインリダイレクトの有効化msg" msgid "Enable CAS Auth" msgstr "CAS 認証の有効化" -#: settings/serializers/auth/cas.py:11 settings/serializers/auth/oidc.py:42 +#: settings/serializers/auth/cas.py:11 settings/serializers/auth/oidc.py:47 msgid "Server url" msgstr "サービス側アドレス" @@ -3541,7 +3543,7 @@ msgstr "ユーザー検索フィルター" msgid "Choice may be (cn|uid|sAMAccountName)=%(user)s)" msgstr "選択は (cnまたはuidまたはsAMAccountName)=%(user)s)" -#: settings/serializers/auth/ldap.py:57 +#: settings/serializers/auth/ldap.py:57 settings/serializers/auth/oidc.py:35 msgid "User attr map" msgstr "ユーザー属性マッピング" @@ -3590,71 +3592,79 @@ msgstr "セッションの共有" msgid "Ignore ssl verification" msgstr "Ssl検証を無視する" -#: settings/serializers/auth/oidc.py:39 +#: settings/serializers/auth/oidc.py:36 +msgid "" +"User attr map present how to map OpenID user attr to jumpserver, username," +"name,email is jumpserver attr" +msgstr "" +"ユーザー属性マッピングは、OpenIDのユーザー属性をjumpserverユーザーにマッピング" +"する方法、username, name,emailはjumpserverのユーザーが必要とする属性です" + +#: settings/serializers/auth/oidc.py:44 msgid "Use Keycloak" msgstr "Keycloakを使用する" -#: settings/serializers/auth/oidc.py:45 +#: settings/serializers/auth/oidc.py:50 msgid "Realm name" msgstr "レルム名" -#: settings/serializers/auth/oidc.py:51 +#: settings/serializers/auth/oidc.py:56 msgid "Enable OPENID Auth" msgstr "OIDC認証の有効化" -#: settings/serializers/auth/oidc.py:53 +#: settings/serializers/auth/oidc.py:58 msgid "Provider endpoint" msgstr "プロバイダーエンドポイント" -#: settings/serializers/auth/oidc.py:56 +#: settings/serializers/auth/oidc.py:61 msgid "Provider auth endpoint" msgstr "認証エンドポイントアドレス" -#: settings/serializers/auth/oidc.py:59 +#: settings/serializers/auth/oidc.py:64 msgid "Provider token endpoint" msgstr "プロバイダートークンエンドポイント" -#: settings/serializers/auth/oidc.py:62 +#: settings/serializers/auth/oidc.py:67 msgid "Provider jwks endpoint" msgstr "プロバイダーjwksエンドポイント" -#: settings/serializers/auth/oidc.py:65 +#: settings/serializers/auth/oidc.py:70 msgid "Provider userinfo endpoint" msgstr "プロバイダーuserinfoエンドポイント" -#: settings/serializers/auth/oidc.py:68 +#: settings/serializers/auth/oidc.py:73 msgid "Provider end session endpoint" msgstr "プロバイダーのセッション終了エンドポイント" -#: settings/serializers/auth/oidc.py:71 +#: settings/serializers/auth/oidc.py:76 msgid "Provider sign alg" msgstr "プロビダーサインalg" -#: settings/serializers/auth/oidc.py:74 +#: settings/serializers/auth/oidc.py:79 msgid "Provider sign key" msgstr "プロバイダ署名キー" -#: settings/serializers/auth/oidc.py:76 +#: settings/serializers/auth/oidc.py:81 msgid "Scopes" msgstr "スコープ" -#: settings/serializers/auth/oidc.py:78 +#: settings/serializers/auth/oidc.py:83 msgid "Id token max age" msgstr "IDトークンの最大年齢" -#: settings/serializers/auth/oidc.py:81 +#: settings/serializers/auth/oidc.py:86 msgid "Id token include claims" msgstr "IDトークンにはクレームが含まれます" -#: settings/serializers/auth/oidc.py:83 +#: settings/serializers/auth/oidc.py:88 msgid "Use state" msgstr "使用状態" -#: settings/serializers/auth/oidc.py:84 +#: settings/serializers/auth/oidc.py:89 msgid "Use nonce" msgstr "Nonceを使用" -#: settings/serializers/auth/oidc.py:86 settings/serializers/auth/saml2.py:33 +#: settings/serializers/auth/oidc.py:91 settings/serializers/auth/saml2.py:33 msgid "Always update user" msgstr "常にユーザーを更新" @@ -5775,7 +5785,7 @@ msgstr "組織ロール" #: users/serializers/user.py:79 #: xpack/plugins/change_auth_plan/models/base.py:35 -#: xpack/plugins/change_auth_plan/serializers/base.py:22 +#: xpack/plugins/change_auth_plan/serializers/base.py:27 msgid "Password strategy" msgstr "パスワード戦略" @@ -6160,7 +6170,7 @@ msgid "Replace (The key generated by JumpServer) " msgstr "置換(JumpServerによって生成された鍵)" #: xpack/plugins/change_auth_plan/models/asset.py:49 -#: xpack/plugins/change_auth_plan/serializers/asset.py:35 +#: xpack/plugins/change_auth_plan/serializers/asset.py:36 msgid "SSH Key strategy" msgstr "SSHキー戦略" @@ -6252,23 +6262,23 @@ msgstr "" "{} -暗号化変更タスクが完了しました: 暗号化パスワードが設定されていません-個人" "情報にアクセスしてください-> ファイル暗号化パスワードを設定してください" -#: xpack/plugins/change_auth_plan/serializers/asset.py:32 +#: xpack/plugins/change_auth_plan/serializers/asset.py:33 msgid "Change Password" msgstr "パスワードの変更" -#: xpack/plugins/change_auth_plan/serializers/asset.py:33 +#: xpack/plugins/change_auth_plan/serializers/asset.py:34 msgid "Change SSH Key" msgstr "SSHキーの変更" -#: xpack/plugins/change_auth_plan/serializers/base.py:43 +#: xpack/plugins/change_auth_plan/serializers/base.py:48 msgid "Run times" msgstr "実行時間" -#: xpack/plugins/change_auth_plan/serializers/base.py:57 +#: xpack/plugins/change_auth_plan/serializers/base.py:62 msgid "* Please enter the correct password length" msgstr "* 正しいパスワードの長さを入力してください" -#: xpack/plugins/change_auth_plan/serializers/base.py:60 +#: xpack/plugins/change_auth_plan/serializers/base.py:65 msgid "* Password length range 6-30 bits" msgstr "* パスワードの長さの範囲6-30ビット" @@ -6356,31 +6366,35 @@ msgstr "OpenStack" msgid "Google Cloud Platform" msgstr "谷歌雲" -#: xpack/plugins/cloud/const.py:26 +#: xpack/plugins/cloud/const.py:23 +msgid "Fusion Compute" +msgstr "" + +#: xpack/plugins/cloud/const.py:27 msgid "Instance name" msgstr "インスタンス名" -#: xpack/plugins/cloud/const.py:27 +#: xpack/plugins/cloud/const.py:28 msgid "Instance name and Partial IP" msgstr "インスタンス名と部分IP" -#: xpack/plugins/cloud/const.py:32 +#: xpack/plugins/cloud/const.py:33 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/const.py:36 +#: xpack/plugins/cloud/const.py:37 msgid "Unsync" msgstr "同期していません" -#: xpack/plugins/cloud/const.py:37 +#: xpack/plugins/cloud/const.py:38 msgid "New Sync" msgstr "新しい同期" -#: xpack/plugins/cloud/const.py:38 +#: xpack/plugins/cloud/const.py:39 msgid "Synced" msgstr "同期済み" -#: xpack/plugins/cloud/const.py:39 +#: xpack/plugins/cloud/const.py:40 msgid "Released" msgstr "リリース済み" @@ -6654,11 +6668,11 @@ msgstr "華南-広州-友好ユーザー環境" msgid "CN East-Suqian" msgstr "華東-宿遷" -#: xpack/plugins/cloud/serializers/account.py:60 +#: xpack/plugins/cloud/serializers/account.py:61 msgid "Validity display" msgstr "有効表示" -#: xpack/plugins/cloud/serializers/account.py:61 +#: xpack/plugins/cloud/serializers/account.py:62 msgid "Provider display" msgstr "プロバイダ表示" @@ -6676,6 +6690,7 @@ msgstr "サブスクリプションID" #: xpack/plugins/cloud/serializers/account_attrs.py:93 #: xpack/plugins/cloud/serializers/account_attrs.py:98 +#: xpack/plugins/cloud/serializers/account_attrs.py:122 msgid "API Endpoint" msgstr "APIエンドポイント" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 2ee578f43..8560a07ac 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-19 13:16+0800\n" +"POT-Creation-Date: 2022-05-31 16:02+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -133,7 +133,7 @@ msgstr "系统用户" #: terminal/backends/command/serializers.py:13 terminal/models/session.py:46 #: terminal/notifications.py:90 #: xpack/plugins/change_auth_plan/models/asset.py:199 -#: xpack/plugins/change_auth_plan/serializers/asset.py:180 +#: xpack/plugins/change_auth_plan/serializers/asset.py:181 #: xpack/plugins/cloud/models.py:223 msgid "Asset" msgstr "资产" @@ -315,7 +315,7 @@ msgid "Domain" msgstr "网域" #: applications/models/application.py:228 xpack/plugins/cloud/models.py:33 -#: xpack/plugins/cloud/serializers/account.py:59 +#: xpack/plugins/cloud/serializers/account.py:60 msgid "Attrs" msgstr "属性" @@ -409,10 +409,10 @@ msgstr "应用路径" #: applications/serializers/attrs/application_category/remote_app.py:44 #: assets/serializers/system_user.py:168 -#: xpack/plugins/change_auth_plan/serializers/asset.py:66 -#: xpack/plugins/change_auth_plan/serializers/asset.py:69 -#: xpack/plugins/change_auth_plan/serializers/asset.py:72 -#: xpack/plugins/change_auth_plan/serializers/asset.py:103 +#: xpack/plugins/change_auth_plan/serializers/asset.py:67 +#: xpack/plugins/change_auth_plan/serializers/asset.py:70 +#: xpack/plugins/change_auth_plan/serializers/asset.py:73 +#: xpack/plugins/change_auth_plan/serializers/asset.py:104 #: xpack/plugins/cloud/serializers/account_attrs.py:54 msgid "This field is required." msgstr "该字段是必填项。" @@ -660,7 +660,7 @@ msgstr "全部" #: assets/models/backup.py:52 assets/serializers/backup.py:32 #: xpack/plugins/change_auth_plan/models/app.py:41 #: xpack/plugins/change_auth_plan/models/asset.py:62 -#: xpack/plugins/change_auth_plan/serializers/base.py:44 +#: xpack/plugins/change_auth_plan/serializers/base.py:49 msgid "Recipient" msgstr "收件人" @@ -703,7 +703,7 @@ msgstr "账号备份快照" #: assets/models/backup.py:116 assets/serializers/backup.py:40 #: xpack/plugins/change_auth_plan/models/base.py:125 -#: xpack/plugins/change_auth_plan/serializers/base.py:73 +#: xpack/plugins/change_auth_plan/serializers/base.py:82 msgid "Trigger mode" msgstr "触发模式" @@ -711,7 +711,7 @@ msgstr "触发模式" #: terminal/models/sharing.py:94 #: xpack/plugins/change_auth_plan/models/base.py:201 #: xpack/plugins/change_auth_plan/serializers/app.py:66 -#: xpack/plugins/change_auth_plan/serializers/asset.py:179 +#: xpack/plugins/change_auth_plan/serializers/asset.py:180 #: xpack/plugins/cloud/models.py:179 msgid "Reason" msgstr "原因" @@ -721,7 +721,7 @@ msgstr "原因" #: terminal/serializers/session.py:35 #: xpack/plugins/change_auth_plan/models/base.py:202 #: xpack/plugins/change_auth_plan/serializers/app.py:67 -#: xpack/plugins/change_auth_plan/serializers/asset.py:181 +#: xpack/plugins/change_auth_plan/serializers/asset.py:182 msgid "Is success" msgstr "是否成功" @@ -730,7 +730,8 @@ msgid "Account backup execution" msgstr "账号备份执行" #: assets/models/base.py:30 assets/tasks/const.py:51 audits/const.py:5 -#: common/utils/ip/geoip/utils.py:41 common/utils/ip/utils.py:78 +#: common/utils/ip/geoip/utils.py:31 common/utils/ip/geoip/utils.py:37 +#: common/utils/ip/utils.py:84 msgid "Unknown" msgstr "未知" @@ -740,8 +741,8 @@ msgstr "成功" #: assets/models/base.py:32 audits/models.py:118 #: xpack/plugins/change_auth_plan/serializers/app.py:88 -#: xpack/plugins/change_auth_plan/serializers/asset.py:198 -#: xpack/plugins/cloud/const.py:31 +#: xpack/plugins/change_auth_plan/serializers/asset.py:199 +#: xpack/plugins/cloud/const.py:32 msgid "Failed" msgstr "失败" @@ -764,6 +765,8 @@ msgstr "校验日期" #: xpack/plugins/change_auth_plan/models/base.py:42 #: xpack/plugins/change_auth_plan/models/base.py:121 #: xpack/plugins/change_auth_plan/models/base.py:196 +#: xpack/plugins/change_auth_plan/serializers/base.py:22 +#: xpack/plugins/change_auth_plan/serializers/base.py:77 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Password" msgstr "密码" @@ -893,7 +896,7 @@ msgstr "测试网关" msgid "Unable to connect to port {port} on {ip}" msgstr "无法连接到 {ip} 上的端口 {port}" -#: assets/models/domain.py:133 +#: assets/models/domain.py:133 xpack/plugins/cloud/providers/fc.py:48 msgid "Authentication failed" msgstr "认证失败" @@ -1107,12 +1110,12 @@ msgstr "动作" #: assets/serializers/backup.py:31 ops/mixin.py:106 ops/mixin.py:147 #: settings/serializers/auth/ldap.py:65 -#: xpack/plugins/change_auth_plan/serializers/base.py:42 +#: xpack/plugins/change_auth_plan/serializers/base.py:47 msgid "Periodic perform" msgstr "定时执行" #: assets/serializers/backup.py:33 -#: xpack/plugins/change_auth_plan/serializers/base.py:45 +#: xpack/plugins/change_auth_plan/serializers/base.py:50 msgid "Currently only mail sending is supported" msgstr "当前只支持邮件发送" @@ -1402,7 +1405,7 @@ msgstr "文件名" #: audits/models.py:43 audits/models.py:117 terminal/models/sharing.py:90 #: tickets/views/approve.py:98 #: xpack/plugins/change_auth_plan/serializers/app.py:87 -#: xpack/plugins/change_auth_plan/serializers/asset.py:197 +#: xpack/plugins/change_auth_plan/serializers/asset.py:198 msgid "Success" msgstr "成功" @@ -2175,7 +2178,7 @@ msgstr "代码错误" #: authentication/templates/authentication/_msg_reset_password.html:3 #: authentication/templates/authentication/_msg_rest_password_success.html:2 #: authentication/templates/authentication/_msg_rest_public_key_success.html:2 -#: jumpserver/conf.py:301 ops/tasks.py:145 ops/tasks.py:148 +#: jumpserver/conf.py:304 ops/tasks.py:145 ops/tasks.py:148 #: perms/templates/perms/_msg_item_permissions_expire.html:3 #: perms/templates/perms/_msg_permed_items_expire.html:3 #: tickets/templates/tickets/approve_check_password.html:23 @@ -2617,15 +2620,14 @@ msgstr "验证码错误" msgid "Please wait {} seconds before sending" msgstr "请在 {} 秒后发送" -#: common/utils/ip/geoip/utils.py:17 common/utils/ip/geoip/utils.py:30 -#: common/utils/ip/ipip/utils.py:15 -msgid "Invalid ip" -msgstr "无效IP" - -#: common/utils/ip/geoip/utils.py:28 +#: common/utils/ip/geoip/utils.py:24 msgid "LAN" msgstr "LAN" +#: common/utils/ip/geoip/utils.py:26 common/utils/ip/utils.py:78 +msgid "Invalid ip" +msgstr "无效IP" + #: common/validators.py:32 msgid "This field must be unique." msgstr "字段必须唯一" @@ -2638,11 +2640,11 @@ msgstr "不能包含特殊字符" msgid "The mobile phone number format is incorrect" msgstr "手机号格式不正确" -#: jumpserver/conf.py:300 +#: jumpserver/conf.py:303 msgid "Create account successfully" msgstr "创建账号成功" -#: jumpserver/conf.py:302 +#: jumpserver/conf.py:305 msgid "Your account has been created successfully" msgstr "你的账号已创建成功" @@ -3437,7 +3439,7 @@ msgstr "启用登录跳转提示" msgid "Enable CAS Auth" msgstr "启用 CAS 认证" -#: settings/serializers/auth/cas.py:11 settings/serializers/auth/oidc.py:42 +#: settings/serializers/auth/cas.py:11 settings/serializers/auth/oidc.py:47 msgid "Server url" msgstr "服务端地址" @@ -3502,7 +3504,7 @@ msgstr "用户过滤器" msgid "Choice may be (cn|uid|sAMAccountName)=%(user)s)" msgstr "可能的选项是(cn或uid或sAMAccountName=%(user)s)" -#: settings/serializers/auth/ldap.py:57 +#: settings/serializers/auth/ldap.py:57 settings/serializers/auth/oidc.py:35 msgid "User attr map" msgstr "用户属性映射" @@ -3551,71 +3553,79 @@ msgstr "共享会话" msgid "Ignore ssl verification" msgstr "忽略 SSL 证书验证" -#: settings/serializers/auth/oidc.py:39 +#: settings/serializers/auth/oidc.py:36 +msgid "" +"User attr map present how to map OpenID user attr to jumpserver, username," +"name,email is jumpserver attr" +msgstr "" +"用户属性映射代表怎样将OpenID中用户属性映射到jumpserver用户上,username, name," +"email 是jumpserver的用户需要属性" + +#: settings/serializers/auth/oidc.py:44 msgid "Use Keycloak" msgstr "使用 Keycloak" -#: settings/serializers/auth/oidc.py:45 +#: settings/serializers/auth/oidc.py:50 msgid "Realm name" msgstr "域" -#: settings/serializers/auth/oidc.py:51 +#: settings/serializers/auth/oidc.py:56 msgid "Enable OPENID Auth" msgstr "启用 OIDC 认证" -#: settings/serializers/auth/oidc.py:53 +#: settings/serializers/auth/oidc.py:58 msgid "Provider endpoint" msgstr "端点地址" -#: settings/serializers/auth/oidc.py:56 +#: settings/serializers/auth/oidc.py:61 msgid "Provider auth endpoint" msgstr "授权端点地址" -#: settings/serializers/auth/oidc.py:59 +#: settings/serializers/auth/oidc.py:64 msgid "Provider token endpoint" msgstr "token 端点地址" -#: settings/serializers/auth/oidc.py:62 +#: settings/serializers/auth/oidc.py:67 msgid "Provider jwks endpoint" msgstr "jwks 端点地址" -#: settings/serializers/auth/oidc.py:65 +#: settings/serializers/auth/oidc.py:70 msgid "Provider userinfo endpoint" msgstr "用户信息端点地址" -#: settings/serializers/auth/oidc.py:68 +#: settings/serializers/auth/oidc.py:73 msgid "Provider end session endpoint" msgstr "注销会话端点地址" -#: settings/serializers/auth/oidc.py:71 +#: settings/serializers/auth/oidc.py:76 msgid "Provider sign alg" msgstr "签名算法" -#: settings/serializers/auth/oidc.py:74 +#: settings/serializers/auth/oidc.py:79 msgid "Provider sign key" msgstr "签名 Key" -#: settings/serializers/auth/oidc.py:76 +#: settings/serializers/auth/oidc.py:81 msgid "Scopes" msgstr "连接范围" -#: settings/serializers/auth/oidc.py:78 +#: settings/serializers/auth/oidc.py:83 msgid "Id token max age" msgstr "令牌有效时间" -#: settings/serializers/auth/oidc.py:81 +#: settings/serializers/auth/oidc.py:86 msgid "Id token include claims" msgstr "声明" -#: settings/serializers/auth/oidc.py:83 +#: settings/serializers/auth/oidc.py:88 msgid "Use state" msgstr "使用状态" -#: settings/serializers/auth/oidc.py:84 +#: settings/serializers/auth/oidc.py:89 msgid "Use nonce" msgstr "临时使用" -#: settings/serializers/auth/oidc.py:86 settings/serializers/auth/saml2.py:33 +#: settings/serializers/auth/oidc.py:91 settings/serializers/auth/saml2.py:33 msgid "Always update user" msgstr "总是更新用户信息" @@ -5697,7 +5707,7 @@ msgstr "组织角色" #: users/serializers/user.py:79 #: xpack/plugins/change_auth_plan/models/base.py:35 -#: xpack/plugins/change_auth_plan/serializers/base.py:22 +#: xpack/plugins/change_auth_plan/serializers/base.py:27 msgid "Password strategy" msgstr "密码策略" @@ -6069,7 +6079,7 @@ msgid "Replace (The key generated by JumpServer) " msgstr "替换 (由 JumpServer 生成的密钥)" #: xpack/plugins/change_auth_plan/models/asset.py:49 -#: xpack/plugins/change_auth_plan/serializers/asset.py:35 +#: xpack/plugins/change_auth_plan/serializers/asset.py:36 msgid "SSH Key strategy" msgstr "SSH 密钥策略" @@ -6161,23 +6171,23 @@ msgstr "" "{} - 改密任务已完成: 未设置加密密码 - 请前往个人信息 -> 文件加密密码中设置加" "密密码" -#: xpack/plugins/change_auth_plan/serializers/asset.py:32 +#: xpack/plugins/change_auth_plan/serializers/asset.py:33 msgid "Change Password" msgstr "更改密码" -#: xpack/plugins/change_auth_plan/serializers/asset.py:33 +#: xpack/plugins/change_auth_plan/serializers/asset.py:34 msgid "Change SSH Key" msgstr "修改 SSH Key" -#: xpack/plugins/change_auth_plan/serializers/base.py:43 +#: xpack/plugins/change_auth_plan/serializers/base.py:48 msgid "Run times" msgstr "执行次数" -#: xpack/plugins/change_auth_plan/serializers/base.py:57 +#: xpack/plugins/change_auth_plan/serializers/base.py:62 msgid "* Please enter the correct password length" msgstr "* 请输入正确的密码长度" -#: xpack/plugins/change_auth_plan/serializers/base.py:60 +#: xpack/plugins/change_auth_plan/serializers/base.py:65 msgid "* Password length range 6-30 bits" msgstr "* 密码长度范围 6-30 位" @@ -6265,31 +6275,35 @@ msgstr "OpenStack" msgid "Google Cloud Platform" msgstr "谷歌云" -#: xpack/plugins/cloud/const.py:26 +#: xpack/plugins/cloud/const.py:23 +msgid "Fusion Compute" +msgstr "" + +#: xpack/plugins/cloud/const.py:27 msgid "Instance name" msgstr "实例名称" -#: xpack/plugins/cloud/const.py:27 +#: xpack/plugins/cloud/const.py:28 msgid "Instance name and Partial IP" msgstr "实例名称和部分IP" -#: xpack/plugins/cloud/const.py:32 +#: xpack/plugins/cloud/const.py:33 msgid "Succeed" msgstr "成功" -#: xpack/plugins/cloud/const.py:36 +#: xpack/plugins/cloud/const.py:37 msgid "Unsync" msgstr "未同步" -#: xpack/plugins/cloud/const.py:37 +#: xpack/plugins/cloud/const.py:38 msgid "New Sync" msgstr "新同步" -#: xpack/plugins/cloud/const.py:38 +#: xpack/plugins/cloud/const.py:39 msgid "Synced" msgstr "已同步" -#: xpack/plugins/cloud/const.py:39 +#: xpack/plugins/cloud/const.py:40 msgid "Released" msgstr "已释放" @@ -6563,11 +6577,11 @@ msgstr "华南-广州-友好用户环境" msgid "CN East-Suqian" msgstr "华东-宿迁" -#: xpack/plugins/cloud/serializers/account.py:60 +#: xpack/plugins/cloud/serializers/account.py:61 msgid "Validity display" msgstr "有效性显示" -#: xpack/plugins/cloud/serializers/account.py:61 +#: xpack/plugins/cloud/serializers/account.py:62 msgid "Provider display" msgstr "服务商显示" @@ -6585,6 +6599,7 @@ msgstr "订阅 ID" #: xpack/plugins/cloud/serializers/account_attrs.py:93 #: xpack/plugins/cloud/serializers/account_attrs.py:98 +#: xpack/plugins/cloud/serializers/account_attrs.py:122 msgid "API Endpoint" msgstr "API 端点"