diff --git a/.github/workflows/jms-build-test.yml b/.github/workflows/jms-build-test.yml index 7b731bc22..4760af7cf 100644 --- a/.github/workflows/jms-build-test.yml +++ b/.github/workflows/jms-build-test.yml @@ -11,8 +11,12 @@ on: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + component: [core] + version: [v4] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry @@ -21,21 +25,10 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build Base Image - uses: docker/build-push-action@v5 - with: - context: . - push: true - file: Dockerfile.base - tags: ghcr.io/jumpserver/core:v4-base - platforms: linux/amd64 - build-args: | - APT_MIRROR=http://deb.debian.org - PIP_MIRROR=https://pypi.org/simple - outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true - cache-from: type=gha - cache-to: type=gha,mode=max + + - name: Prepare Build + run: | + sed -i 's@^FROM registry.fit2cloud.com/jumpserver@FROM ghcr.io/jumpserver@g' Dockerfile-ee - name: Build CE Image uses: docker/build-push-action@v5 @@ -43,34 +36,28 @@ jobs: context: . push: true file: Dockerfile - tags: ghcr.io/jumpserver/core:v4-lite + tags: ghcr.io/jumpserver/${{ matrix.component }}:${{ matrix.version }}-ce platforms: linux/amd64 build-args: | - VERSION=v4 + VERSION=${{ matrix.version }} APT_MIRROR=http://deb.debian.org - BASE_IMAGE=ghcr.io/jumpserver/core + PIP_MIRROR=https://pypi.org/simple outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true cache-from: type=gha cache-to: type=gha,mode=max - - name: Prepare EE Image - run: | - sed -i 's@^FROM registry.fit2cloud.com/jumpserver/xpack@# FROM registry.fit2cloud.com/jumpserver/xpack@' Dockerfile-ee - sed -i 's@^FROM registry.fit2cloud.com/jumpserver@FROM ghcr.io/jumpserver@g' Dockerfile-ee - sed -i 's@^COPY --from=build-xpack@# COPY --from=build-xpack@g' Dockerfile-ee - - name: Build EE Image uses: docker/build-push-action@v5 with: context: . push: false file: Dockerfile-ee - tags: jumpserver/core:v4 + tags: ghcr.io/jumpserver/${{ matrix.component }}:${{ matrix.version }} platforms: linux/amd64 build-args: | - VERSION=v4 + VERSION=${{ matrix.version }} APT_MIRROR=http://deb.debian.org - BASE_IMAGE=ghcr.io/jumpserver/core + PIP_MIRROR=https://pypi.org/simple outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true cache-from: type=gha cache-to: type=gha,mode=max \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index abc740e73..5f94de222 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,4 @@ -ARG VERSION -ARG BASE_IMAGE=jumpserver/core - -FROM python:3.11-slim-bullseye as stage-1 +FROM debian:bullseye-slim as stage-1 ARG TARGETARCH ARG DEPENDENCIES=" \ @@ -9,8 +6,8 @@ ARG DEPENDENCIES=" \ wget" ARG APT_MIRROR=http://mirrors.ustc.edu.cn -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \ + --mount=type=cache,target=/var/lib/apt,sharing=locked,id=core \ set -ex \ && rm -f /etc/apt/apt.conf.d/docker-clean \ && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache \ @@ -48,15 +45,44 @@ RUN echo > /opt/jumpserver/config.yml \ sed -i "s@VERSION = .*@VERSION = '${VERSION}'@g" apps/jumpserver/const.py; \ fi -FROM ${BASE_IMAGE}:${VERSION}-base as stage-2 +FROM python:3.11-slim-bullseye as stage-2 ARG TARGETARCH +ARG BUILD_DEPENDENCIES=" \ + g++ \ + make \ + pkg-config" + +ARG DEPENDENCIES=" \ + default-libmysqlclient-dev \ + freetds-dev \ + gettext \ + libkrb5-dev \ + libldap2-dev \ + libsasl2-dev" + +ARG APT_MIRROR=http://mirrors.ustc.edu.cn +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \ + --mount=type=cache,target=/var/lib/apt,sharing=locked,id=core \ + set -ex \ + && rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache \ + && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \ + && apt-get update \ + && apt-get -y install --no-install-recommends ${BUILD_DEPENDENCIES} \ + && apt-get -y install --no-install-recommends ${DEPENDENCIES} \ + && echo "no" | dpkg-reconfigure dash + WORKDIR /opt/jumpserver -RUN --mount=type=cache,target=/root/.cache,sharing=locked \ - --mount=type=bind,source=poetry.lock,target=/opt/jumpserver/poetry.lock \ - --mount=type=bind,source=pyproject.toml,target=/opt/jumpserver/pyproject.toml \ +ARG PIP_MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple +RUN --mount=type=cache,target=/root/.cache,sharing=locked,id=core \ + --mount=type=bind,source=poetry.lock,target=poetry.lock \ + --mount=type=bind,source=pyproject.toml,target=pyproject.toml \ set -ex \ + && python3 -m venv /opt/py3 \ + && pip install poetry -i ${PIP_MIRROR} \ + && poetry config virtualenvs.create false \ && . /opt/py3/bin/activate \ && poetry install --only main @@ -75,9 +101,7 @@ ENV LANG=en_US.UTF-8 \ ARG DEPENDENCIES=" \ libldap2-dev \ - libpq-dev \ - libx11-dev \ - libxmlsec1-openssl" + libx11-dev" ARG TOOLS=" \ ca-certificates \ @@ -86,8 +110,8 @@ ARG TOOLS=" \ sshpass" ARG APT_MIRROR=http://mirrors.ustc.edu.cn -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \ + --mount=type=cache,target=/var/lib/apt,sharing=locked,id=core \ set -ex \ && rm -f /etc/apt/apt.conf.d/docker-clean \ && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache \ diff --git a/Dockerfile-ee b/Dockerfile-ee index 3e876dd26..d3654df6d 100644 --- a/Dockerfile-ee +++ b/Dockerfile-ee @@ -1,20 +1,35 @@ ARG VERSION -ARG BASE_IMAGE=registry.fit2cloud.com/jumpserver/core FROM registry.fit2cloud.com/jumpserver/xpack:${VERSION} as build-xpack -FROM registry.fit2cloud.com/jumpserver/core:${VERSION}-base as build-core -ARG TARGETARCH +FROM python:3.11-slim-bullseye as build-core +ARG BUILD_DEPENDENCIES=" \ + g++" + +ARG APT_MIRROR=http://mirrors.ustc.edu.cn +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \ + --mount=type=cache,target=/var/lib/apt,sharing=locked,id=core \ + set -ex \ + && rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache \ + && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \ + && apt-get update \ + && apt-get -y install --no-install-recommends ${BUILD_DEPENDENCIES} \ + && echo "no" | dpkg-reconfigure dash WORKDIR /opt/jumpserver -RUN --mount=type=cache,target=/root/.cache,sharing=locked \ +ARG PIP_MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple +RUN --mount=type=cache,target=/root/.cache,sharing=locked,id=core \ --mount=type=bind,source=poetry.lock,target=/opt/jumpserver/poetry.lock \ --mount=type=bind,source=pyproject.toml,target=/opt/jumpserver/pyproject.toml \ set -ex \ + && python3 -m venv /opt/py3 \ + && pip install poetry -i ${PIP_MIRROR} \ + && poetry config virtualenvs.create false \ && . /opt/py3/bin/activate \ && poetry install --only xpack -FROM ${BASE_IMAGE}:${VERSION}-lite +FROM registry.fit2cloud.com/jumpserver/core:${VERSION}-ce ARG TARGETARCH ARG TOOLS=" \ @@ -27,8 +42,8 @@ ARG TOOLS=" \ wget" ARG APT_MIRROR=http://mirrors.ustc.edu.cn -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \ + --mount=type=cache,target=/var/lib/apt,sharing=locked,id=core \ set -ex \ && apt-get update \ && apt-get -y install --no-install-recommends ${TOOLS} diff --git a/Dockerfile.base b/Dockerfile.base deleted file mode 100644 index 003e7c6bc..000000000 --- a/Dockerfile.base +++ /dev/null @@ -1,55 +0,0 @@ -FROM python:3.11-slim-bullseye -ARG TARGETARCH - -ARG BUILD_DEPENDENCIES=" \ - g++ \ - make \ - pkg-config" - -ARG DEPENDENCIES=" \ - freetds-dev \ - gettext \ - libffi-dev \ - libjpeg-dev \ - libkrb5-dev \ - libldap2-dev \ - libpq-dev \ - libsasl2-dev \ - libssl-dev \ - libxml2-dev \ - libxmlsec1-dev \ - libxmlsec1-openssl \ - freerdp2-dev \ - libaio-dev" - -ARG TOOLS=" \ - ca-certificates \ - curl \ - default-libmysqlclient-dev \ - default-mysql-client \ - git \ - git-lfs \ - unzip \ - xz-utils \ - wget" - -ARG APT_MIRROR=http://mirrors.ustc.edu.cn -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ - set -ex \ - && rm -f /etc/apt/apt.conf.d/docker-clean \ - && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache \ - && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \ - && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ - && apt-get update \ - && apt-get -y install --no-install-recommends ${BUILD_DEPENDENCIES} \ - && apt-get -y install --no-install-recommends ${DEPENDENCIES} \ - && apt-get -y install --no-install-recommends ${TOOLS} \ - && echo "no" | dpkg-reconfigure dash - -ARG PIP_MIRROR=https://pypi.org/simple -RUN --mount=type=cache,target=/root/.cache,sharing=locked \ - set -ex \ - && python3 -m venv /opt/py3 \ - && pip install poetry -i ${PIP_MIRROR} \ - && poetry config virtualenvs.create false \ No newline at end of file diff --git a/apps/accounts/serializers/automations/change_secret.py b/apps/accounts/serializers/automations/change_secret.py index e3e9e2ce0..34d4326b8 100644 --- a/apps/accounts/serializers/automations/change_secret.py +++ b/apps/accounts/serializers/automations/change_secret.py @@ -54,10 +54,13 @@ class ChangeSecretAutomationSerializer(AuthValidateMixin, BaseAutomationSerializ 'ssh_key_change_strategy', 'passphrase', 'recipients', 'params' ] extra_kwargs = {**BaseAutomationSerializer.Meta.extra_kwargs, **{ - 'accounts': {'required': True}, + 'accounts': {'required': True, 'help_text': _('Please enter your account username')}, 'recipients': {'label': _('Recipient'), 'help_text': _( "Currently only mail sending is supported" )}, + 'params': {'help_text': _( + "Secret parameter settings, currently only effective for assets of the host type." + )}, }} @property diff --git a/apps/audits/models.py b/apps/audits/models.py index 7195beea3..1b51bf979 100644 --- a/apps/audits/models.py +++ b/apps/audits/models.py @@ -264,7 +264,7 @@ class UserSession(models.Model): user_agent = models.CharField(max_length=254, blank=True, null=True, verbose_name=_("User agent")) type = models.CharField(choices=LoginTypeChoices.choices, max_length=2, verbose_name=_("Login type")) backend = models.CharField(max_length=32, default="", verbose_name=_("Auth backend")) - date_created = models.DateTimeField(null=True, blank=True, verbose_name=_('Date created')) + date_created = models.DateTimeField(null=True, blank=True, verbose_name=_('Login date')) user = models.ForeignKey( 'users.User', verbose_name=_('User'), related_name='sessions', on_delete=models.CASCADE ) diff --git a/apps/i18n/chen/en.json b/apps/i18n/chen/en.json new file mode 100644 index 000000000..cf94e939c --- /dev/null +++ b/apps/i18n/chen/en.json @@ -0,0 +1,77 @@ +{ + "action": { + "refresh": "Refresh", + "new": "New", + "new_query": "New Query", + "view_data": "View Data", + "show_properties": "Show Properties", + "label": { + "name": "Name", + "type": "Type", + "version": "Version", + "user": "User", + "jdbc_url": "JDBC URL", + "driver_class": "Driver Class", + "driver_version": "Driver Version" + } + }, + "title": { + "query": "Query", + "properties": "Properties", + "datasource_properties": "Datasource Properties" + }, + "state": { + "connected": "Connected" + }, + "msg": { + "error": { + "fetch_error": "Error while fetching data", + "connect_error": "Error while connecting", + "change_context_error": "Error while changing context", + "parse_error": "Error while parsing", + "execute_error": "Error while executing", + "already_first_page": "It's already the first page", + "already_last_page": "It's already the last page", + "perms_expired": "Permissions associated with this session expired on %s", + "over_max_idle_time": "Since this sessioon has been idle for more than %d minutes, it has been closed", + "over_max_session_time": "Since this session has been active for more than %d hours, it has been closed", + "command_review_timeout": "Command review request has timed out", + "command_review_reject": "Command review request has been rejected by %s", + "session_closed_by": "This session has been closed by %s.", + "user_cancel_command_review": "The user has cancelled the command review.", + "session_locked": "This session has been paused and cannot continue executing commands", + "no_permission": " You do not have permission to perform this action", + "acl_reject": " Command rejected by ACL" + }, + "success": { + "execute_success": "Executed successfully", + "connect_success": "Connected successfully" + }, + "info": { + "affected_rows": "Affected rows" + }, + "dialog": { + "session_locked": "This session is locked by %s, please wait for the session to be unlocked.", + "session_unlocked": "This session has been unlocked by %s.", + "title": { + "init_datasource": "Initialize Datasource", + "init_datasource_failed": "Initialize Datasource Failed", + "error_message": "Error Message", + "session_finished": "Session Finished", + "command_review": "Command Review" + }, + "message": { + "init_datasource": "Initializing data source, please wait...", + "init_datasource_failed": "Connection failed, please check if the database connection configuration is correct", + "command_review": "The command you entered requires verification before it can be executed. Would you like to initiate a review request?", + "wait_command_review": "The review request has been initiated, please wait for the review results" + } + } + }, + "btn": { + "label": { + "submit": "Submit", + "cancel": "Cancel" + } + } +} \ No newline at end of file diff --git a/apps/i18n/chen/ja.json b/apps/i18n/chen/ja.json new file mode 100644 index 000000000..0f2d0cc07 --- /dev/null +++ b/apps/i18n/chen/ja.json @@ -0,0 +1,77 @@ +{ + "action": { + "refresh": "更新", + "new": "新規", + "new_query": "新規クエリ", + "view_data": "データ表示", + "show_properties": "プロパティ表示", + "label": { + "name": "名前", + "type": "タイプ", + "version": "バージョン", + "user": "ユーザー", + "jdbc_url": "JDBC URL", + "driver_class": "ドライバクラス", + "driver_version": "ドライババージョン" + } + }, + "title": { + "query": "クエリ", + "properties": "プロパティ", + "datasource_properties": "データソースのプロパティ" + }, + "state": { + "connected": "接続済み" + }, + "msg": { + "error": { + "fetch_error": "データ取得エラー", + "connect_error": "接続エラー", + "change_context_error": "コンテキスト変更エラー", + "parse_error": "解析エラー", + "execute_error": "実行エラー", + "already_first_page": "すでに最初のページです", + "already_last_page": "すでに最後のページです", + "perms_expired": "このセッションの権限が%sに失効しました", + "over_max_idle_time": "このセッションは%d分以上アイドル状態が続いたため、閉じられました", + "over_max_session_time": "このセッションは%d时以上継続したため、閉じられました", + "command_review_timeout": "コマンドレビューリクエストがタイムアウトしました", + "command_review_reject": "コマンドレビューリクエストは%sによって拒否されました", + "session_closed_by": "このセッションは%sによって閉じられました。", + "user_cancel_command_review": "ユーザーがコマンドレビューをキャンセルしました。", + "session_locked": "このセッションは一時停止されており、コマンドを続行できません", + "no_permission": " この操作を行う権限がありません", + "acl_reject": " この操作はACLによって拒否されました" + }, + "success": { + "execute_success": "正常に実行されました", + "connect_success": "正常に接続されました" + }, + "info": { + "affected_rows": "影響を受けた行数" + }, + "dialog": { + "session_locked": "このセッションは%sロックされており、コマンドを実行できません", + "session_unlocked": "このセッションは%sロック解除されており、コマンドを実行できます", + "title": { + "init_datasource": "データソースの初期化", + "init_datasource_failed": "データソースの初期化失敗", + "error_message": "エラーメッセージ", + "session_finished": "セッション終了", + "command_review": "コマンドレビュー" + }, + "message": { + "init_datasource": "データソースを初期化しています、お待ちください...", + "init_datasource_failed": "接続に失敗しました、データベース接続設定が正しいことを確認してください", + "command_review": "入力したコマンドは、実行前に検証が必要です。レビューリクエストを開始しますか？", + "wait_command_review": "レビューリクエストが開始されました、レビュー結果をお待ちください" + } + } + }, + "btn": { + "label": { + "submit": "送信", + "cancel": "キャンセル" + } + } +} \ No newline at end of file diff --git a/apps/i18n/chen/zh.json b/apps/i18n/chen/zh.json new file mode 100644 index 000000000..23b341c00 --- /dev/null +++ b/apps/i18n/chen/zh.json @@ -0,0 +1,77 @@ +{ + "action": { + "refresh": "刷新", + "new": "新建", + "new_query": "新建查询", + "view_data": "查看数据", + "show_properties": "属性", + "label": { + "name": "名称", + "type": "类型", + "version": "版本", + "user": "用户", + "jdbc_url": "JDBC 链接", + "driver_class": "驱动类", + "driver_version": "驱动版本" + } + }, + "title": { + "query": "查询", + "properties": "属性", + "datasource_properties": "数据源属性" + }, + "state": { + "connected": "已连接" + }, + "msg": { + "error": { + "fetch_data": "获取数据失败", + "connect_error": "连接失败", + "change_context_error": "切换上下文错误", + "parse_error": "解析错误", + "execute_error": "执行错误", + "already_first_page": "已经是第一页", + "already_last_page": "已经是最后一页", + "user_cancel_command_review": "用户取消命令复核", + "command_review_timeout": "命令复核超时", + "command_review_reject": "命令复核被 %s 拒绝", + "perms_expired": "此会话关联的权限已于 %s 过期", + "over_max_idle_time": "由于此会话空闲时间大于 %d 分钟，已经被关闭", + "over_max_session_time": "由于此会话时间大于 %d 小时，已经被关闭", + "session_closed_by": "当前会话被管理员 %s 关闭", + "session_locked": "当前会话已被锁定，无法继续执行命令", + "no_permission": " 没有执行此操作的权限", + "acl_reject": " 此命令禁止被执行" + }, + "success": { + "execute_success": "执行成功", + "connect_success": "连接成功" + }, + "info": { + "affected_rows": "受影响行数" + }, + "dialog": { + "session_locked": "此会话已被 %s 锁定，无法继续执行命令", + "session_unlocked": "此会话已被 %s 解锁，可以继续执行命令", + "title": { + "init_datasource": "初始化数据源", + "init_datasource_failed": "初始化数据源失败", + "error_message": "错误消息", + "session_finished": "会话已结束", + "command_review": "命令复核" + }, + "message": { + "init_datasource": "正在初始化数据源，请稍候...", + "init_datasource_failed": "连接失败，请检查数据库连接配置是否正确", + "command_review": "您输入的命令需要复核后才可以执行, 是否发起复核请求?", + "wait_command_review": "复核请求已发起, 请等待复核结果" + } + } + }, + "btn": { + "label": { + "submit": "提交", + "cancel": "取消" + } + } +} \ No newline at end of file diff --git a/apps/i18n/chen/zh_hant.json b/apps/i18n/chen/zh_hant.json new file mode 100644 index 000000000..5d23024b0 --- /dev/null +++ b/apps/i18n/chen/zh_hant.json @@ -0,0 +1,77 @@ +{ + "action": { + "refresh": "刷新", + "new": "新建", + "new_query": "新建查詢", + "view_data": "查看數據", + "show_properties": "屬性", + "label": { + "name": "名稱", + "type": "類型", + "version": "版本", + "user": "用戶", + "jdbc_url": "JDBC 連結", + "driver_class": "驅動類", + "driver_version": "驅動版本" + } + }, + "title": { + "query": "查詢", + "properties": "屬性", + "datasource_properties": "數據源屬性" + }, + "state": { + "connected": "已連接" + }, + "msg": { + "error": { + "fetch_data": "獲取數據失敗", + "connect_error": "連接失敗", + "change_context_error": "切換上下文錯誤", + "parse_error": "解析錯誤", + "execute_error": "執行錯誤", + "already_first_page": "已經是第一頁", + "already_last_page": "已經是最後一頁", + "user_cancel_command_review": "用戶取消命令覆核", + "command_review_timeout": "命令覆核超時", + "command_review_reject": "命令覆核被 %s 拒絕", + "perms_expired": "此會話關聯的權限已於 %s 過期", + "over_max_idle_time": "由於此會話空閒時間大於 %d 分鐘，已經被關閉", + "over_max_session_time": "由於此會話時間大於 %d 小時，已經被關閉", + "session_closed_by": "當前會話被管理員 %s 關閉", + "session_locked": "當前會話已被鎖定，無法繼續執行命令", + "no_permission": " 沒有執行此操作的權限", + "acl_reject": " 此命令禁止被執行" + }, + "success": { + "execute_success": "執行成功", + "connect_success": "連接成功" + }, + "info": { + "affected_rows": "受影響行數" + }, + "dialog": { + "session_locked": "此會話已被 %s 鎖定，無法繼續執行命令", + "session_unlocked": "此會話已被 %s 解鎖，可以繼續執行命令", + "title": { + "init_datasource": "初始化數據源", + "init_datasource_failed": "初始化數據源失敗", + "error_message": "錯誤消息", + "session_finished": "會話已結束", + "command_review": "命令覆核" + }, + "message": { + "init_datasource": "正在初始化數據源，請稍候...", + "init_datasource_failed": "連接失敗，請檢查資料庫連接配置是否正確", + "command_review": "您輸入的命令需要覆核後才可以執行, 是否發起覆核請求?", + "wait_command_review": "覆核請求已發起, 請等待覆核結果" + } + } + }, + "btn": { + "label": { + "submit": "提交", + "cancel": "取消" + } + } +} \ No newline at end of file diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index 0f11ab543..a89e1c5f6 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-22 18:28+0800\n" +"POT-Creation-Date: 2024-06-03 10:21+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,7 +45,6 @@ msgstr "" #: users/forms/profile.py:21 users/serializers/user.py:142 #: users/templates/users/_msg_user_created.html:13 #: users/templates/users/user_password_verify.html:18 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:28 #: xpack/plugins/cloud/serializers/account_attrs.py:28 msgid "Password" msgstr "" @@ -103,7 +102,7 @@ msgstr "" msgid "Template" msgstr "" -#: accounts/const/account.py:32 ops/const.py:46 +#: accounts/const/account.py:32 ops/const.py:46 xpack/plugins/cloud/const.py:68 msgid "Skip" msgstr "" @@ -113,10 +112,9 @@ msgid "Update" msgstr "" #: accounts/const/account.py:34 accounts/const/automation.py:109 -#: accounts/serializers/automations/change_secret.py:164 audits/const.py:62 +#: accounts/serializers/automations/change_secret.py:167 audits/const.py:62 #: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19 -#: ops/const.py:76 terminal/const.py:79 xpack.bak/plugins/cloud/const.py:47 -#: xpack/plugins/cloud/const.py:47 +#: ops/const.py:76 terminal/const.py:79 xpack/plugins/cloud/const.py:47 msgid "Failed" msgstr "" @@ -229,7 +227,7 @@ msgid "SFTP" msgstr "" #: accounts/const/automation.py:110 -#: accounts/serializers/automations/change_secret.py:163 audits/const.py:61 +#: accounts/serializers/automations/change_secret.py:166 audits/const.py:61 #: audits/models.py:64 audits/signal_handlers/activity_log.py:33 #: common/const/choices.py:18 ops/const.py:74 ops/serializers/celery.py:48 #: terminal/const.py:78 terminal/models/session/sharing.py:121 @@ -274,8 +272,8 @@ msgstr "" #: accounts/serializers/account/account.py:215 #: accounts/serializers/account/account.py:260 #: accounts/serializers/account/gathered_account.py:10 -#: accounts/serializers/automations/change_secret.py:108 -#: accounts/serializers/automations/change_secret.py:140 +#: accounts/serializers/automations/change_secret.py:111 +#: accounts/serializers/automations/change_secret.py:143 #: accounts/templates/accounts/asset_account_change_info.html:7 #: accounts/templates/accounts/change_secret_failed_info.html:11 #: acls/serializers/base.py:123 assets/models/asset/common.py:95 @@ -286,8 +284,7 @@ msgstr "" #: terminal/serializers/command.py:17 terminal/serializers/session.py:28 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 -#: xpack.bak/plugins/cloud/models.py:252 xpack/plugins/cloud/models.py:252 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:268 msgid "Asset" msgstr "" @@ -315,18 +312,19 @@ msgid "Source ID" msgstr "" #: accounts/models/account.py:61 -#: accounts/serializers/automations/change_secret.py:110 -#: accounts/serializers/automations/change_secret.py:141 +#: accounts/serializers/automations/change_secret.py:113 +#: accounts/serializers/automations/change_secret.py:144 #: accounts/templates/accounts/change_secret_failed_info.html:12 -#: acls/serializers/base.py:124 acls/templates/acls/asset_login_reminder.html:7 +#: acls/serializers/base.py:124 +#: acls/templates/acls/asset_login_reminder.html:10 #: assets/serializers/gateway.py:28 audits/models.py:59 #: authentication/api/connection_token.py:411 ops/models/base.py:18 #: perms/models/asset_permission.py:75 terminal/backends/command/models.py:18 #: terminal/models/session/session.py:34 terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 -#: tickets/models/ticket/command_confirm.py:13 -#: xpack.bak/plugins/cloud/models.py:85 xpack/plugins/cloud/models.py:85 +#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:99 +#: xpack/plugins/cloud/ws.py:38 msgid "Account" msgstr "" @@ -420,14 +418,14 @@ msgid "Trigger mode" msgstr "" #: accounts/models/automations/backup_account.py:134 audits/models.py:203 -#: terminal/models/session/sharing.py:125 xpack.bak/plugins/cloud/models.py:204 -#: xpack/plugins/cloud/manager.py:165 xpack/plugins/cloud/models.py:204 +#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/manager.py:158 +#: xpack/plugins/cloud/models.py:220 msgid "Reason" msgstr "" #: accounts/models/automations/backup_account.py:136 -#: accounts/serializers/automations/change_secret.py:107 -#: accounts/serializers/automations/change_secret.py:142 +#: accounts/serializers/automations/change_secret.py:110 +#: accounts/serializers/automations/change_secret.py:145 #: ops/serializers/job.py:74 terminal/serializers/session.py:52 msgid "Is success" msgstr "Is success" @@ -482,7 +480,7 @@ msgstr "" #: accounts/serializers/automations/change_secret.py:58 #: settings/serializers/auth/ldap.py:100 settings/serializers/msg.py:45 msgid "Recipient" -msgstr "" +msgstr "Recipients" #: accounts/models/automations/change_secret.py:22 msgid "Change secret automation" @@ -516,9 +514,8 @@ msgstr "" #: terminal/serializers/applet.py:18 terminal/serializers/applet_host.py:136 #: terminal/serializers/virtualapp.py:35 tickets/models/ticket/general.py:281 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 -#: xpack.bak/plugins/cloud/models.py:200 xpack.bak/plugins/cloud/models.py:256 -#: xpack/plugins/cloud/models.py:200 xpack/plugins/cloud/models.py:256 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:216 +#: xpack/plugins/cloud/models.py:272 msgid "Status" msgstr "" @@ -555,7 +552,6 @@ msgstr "" #: terminal/serializers/storage.py:136 users/forms/profile.py:31 #: users/forms/profile.py:114 users/models/user.py:898 #: users/templates/users/_msg_user_created.html:12 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:26 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Username" msgstr "" @@ -586,6 +582,7 @@ msgstr "" #: audits/models.py:92 audits/serializers.py:84 #: authentication/serializers/connect_token_secret.py:119 #: authentication/templates/authentication/_access_key_modal.html:34 +#: perms/serializers/permission.py:42 perms/serializers/permission.py:64 #: tickets/serializers/ticket/ticket.py:21 msgid "Action" msgstr "" @@ -651,10 +648,8 @@ msgstr "" #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 #: users/models/preference.py:11 users/models/user.py:899 -#: xpack.bak/plugins/cloud/models.py:32 xpack.bak/plugins/cloud/models.py:272 -#: xpack.bak/plugins/cloud/serializers/task.py:70 -#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:272 -#: xpack/plugins/cloud/serializers/task.py:71 +#: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/serializers/task.py:74 msgid "Name" msgstr "" @@ -682,8 +677,7 @@ msgstr "" msgid "Push params" msgstr "" -#: accounts/models/template.py:26 xpack.bak/plugins/cloud/models.py:329 -#: xpack/plugins/cloud/models.py:329 +#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:369 msgid "Account template" msgstr "" @@ -824,14 +818,14 @@ msgstr "" #: accounts/serializers/account/account.py:273 #: accounts/serializers/automations/base.py:22 acls/models/base.py:97 -#: acls/templates/acls/asset_login_reminder.html:6 +#: acls/templates/acls/asset_login_reminder.html:9 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 #: authentication/api/connection_token.py:410 ops/models/base.py:17 #: ops/models/job.py:152 ops/serializers/job.py:19 #: perms/serializers/permission.py:36 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 -#: xpack/plugins/cloud/manager.py:73 +#: xpack/plugins/cloud/manager.py:83 msgid "Assets" msgstr "" @@ -845,7 +839,6 @@ msgid "Asset does not support this secret type: %s" msgstr "" #: accounts/serializers/account/account.py:410 -#: xpack/plugins/cloud/serializers/account.py:111 msgid "Account has exist" msgstr "" @@ -857,8 +850,8 @@ msgid "ID" msgstr "" #: accounts/serializers/account/account.py:453 acls/serializers/base.py:116 -#: acls/templates/acls/asset_login_reminder.html:5 -#: acls/templates/acls/user_login_reminder.html:7 +#: acls/templates/acls/asset_login_reminder.html:8 +#: acls/templates/acls/user_login_reminder.html:8 #: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:54 #: audits/models.py:90 audits/models.py:172 audits/models.py:269 #: audits/serializers.py:171 authentication/models/connection_token.py:32 @@ -966,8 +959,7 @@ msgstr "" #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:295 users/models/user.py:933 -#: xpack.bak/plugins/cloud/models.py:39 xpack.bak/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:106 +#: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:120 msgid "Comment" msgstr "Description" @@ -1002,15 +994,25 @@ msgstr "" msgid "SSH Key strategy" msgstr "" -#: accounts/serializers/automations/change_secret.py:81 +#: accounts/serializers/automations/change_secret.py:57 +msgid "Please enter your account username" +msgstr "" + +#: accounts/serializers/automations/change_secret.py:62 +msgid "" +"Secret parameter settings, currently only effective for assets of the host " +"type." +msgstr "" + +#: accounts/serializers/automations/change_secret.py:84 msgid "* Please enter the correct password length" msgstr "" -#: accounts/serializers/automations/change_secret.py:85 +#: accounts/serializers/automations/change_secret.py:88 msgid "* Password length range 6-30 bits" msgstr "" -#: accounts/serializers/automations/change_secret.py:114 +#: accounts/serializers/automations/change_secret.py:117 #: assets/models/automations/base.py:127 msgid "Automation task execution" msgstr "" @@ -1094,7 +1096,6 @@ msgid "Task execution id" msgstr "" #: accounts/templates/accounts/change_secret_failed_info.html:5 -#: acls/templates/acls/asset_login_reminder.html:3 msgid "Respectful" msgstr "" @@ -1140,14 +1141,12 @@ msgid "Notify" msgstr "" #: acls/models/base.py:37 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:112 -#: xpack.bak/plugins/cloud/models.py:278 xpack/plugins/cloud/models.py:278 +#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:294 msgid "Priority" msgstr "" #: acls/models/base.py:38 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:113 -#: xpack.bak/plugins/cloud/models.py:279 xpack/plugins/cloud/models.py:279 +#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:295 msgid "1-100, the lower the value will be match first" msgstr "" @@ -1189,14 +1188,13 @@ msgid "Command" msgstr "" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack.bak/plugins/cloud/models.py:295 xpack/plugins/cloud/models.py:295 +#: xpack/plugins/cloud/models.py:335 msgid "Regex" msgstr "" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:184 settings/serializers/feature.py:19 -#: settings/serializers/msg.py:76 xpack.bak/plugins/license/models.py:30 -#: xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:76 xpack/plugins/license/models.py:30 msgid "Content" msgstr "" @@ -1293,8 +1291,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "" #: acls/serializers/rules/rules.py:20 -#: xpack.bak/plugins/cloud/serializers/task.py:145 -#: xpack/plugins/cloud/serializers/task.py:146 +#: xpack/plugins/cloud/serializers/task.py:149 msgid "IP address invalid: `{}`" msgstr "" @@ -1308,6 +1305,7 @@ msgstr "" #: authentication/templates/authentication/_msg_oauth_bind.html:12 #: authentication/templates/authentication/_msg_rest_password_success.html:8 #: authentication/templates/authentication/_msg_rest_public_key_success.html:8 +#: xpack/plugins/cloud/models.py:370 msgid "IP" msgstr "" @@ -1315,54 +1313,58 @@ msgstr "" msgid "Time Period" msgstr "" -#: acls/templates/acls/asset_login_reminder.html:10 -msgid "" -"The user has just logged in to the asset. Please ensure that this is an " -"authorized operation. If you suspect that this is an unauthorized access, " -"please take appropriate measures immediately." -msgstr "" - -#: acls/templates/acls/asset_login_reminder.html:12 -msgid "Thank you" -msgstr "" - +#: acls/templates/acls/asset_login_reminder.html:3 #: acls/templates/acls/user_login_reminder.html:3 +#: authentication/templates/authentication/_msg_rest_password_success.html:2 +#: authentication/templates/authentication/_msg_rest_public_key_success.html:2 +#: perms/templates/perms/_msg_permed_items_expire.html:3 +#: users/templates/users/_msg_reset_mfa.html:4 msgid "Dear" msgstr "" -#: acls/templates/acls/user_login_reminder.html:5 +#: acls/templates/acls/asset_login_reminder.html:5 msgid "" "We would like to inform you that a user has recently logged into the " "following asset:" msgstr "" -#: acls/templates/acls/user_login_reminder.html:6 +#: acls/templates/acls/asset_login_reminder.html:6 msgid "Asset details" msgstr "" -#: acls/templates/acls/user_login_reminder.html:9 audits/models.py:194 -#: audits/models.py:263 -#: authentication/templates/authentication/_msg_different_city.html:11 -#: tickets/models/ticket/login_confirm.py:11 -msgid "Login city" -msgstr "" - -#: acls/templates/acls/user_login_reminder.html:10 audits/models.py:197 -#: audits/models.py:264 audits/serializers.py:68 -msgid "User agent" -msgstr "" - -#: acls/templates/acls/user_login_reminder.html:13 +#: acls/templates/acls/asset_login_reminder.html:14 +#: acls/templates/acls/user_login_reminder.html:15 msgid "" "Please review the login activity to ensure the security and proper usage of " "the asset. If you did not authorize this login or if you notice any " "suspicious activity, please take the necessary actions immediately." msgstr "" -#: acls/templates/acls/user_login_reminder.html:15 +#: acls/templates/acls/asset_login_reminder.html:16 +#: acls/templates/acls/user_login_reminder.html:16 msgid "Thank you for your attention to this matter" msgstr "" +#: acls/templates/acls/user_login_reminder.html:5 +msgid "We would like to inform you that a user has recently logged:" +msgstr "" + +#: acls/templates/acls/user_login_reminder.html:6 +msgid "User details" +msgstr "" + +#: acls/templates/acls/user_login_reminder.html:10 audits/models.py:194 +#: audits/models.py:263 +#: authentication/templates/authentication/_msg_different_city.html:11 +#: tickets/models/ticket/login_confirm.py:11 +msgid "Login city" +msgstr "" + +#: acls/templates/acls/user_login_reminder.html:11 audits/models.py:197 +#: audits/models.py:264 audits/serializers.py:68 +msgid "User agent" +msgstr "" + #: assets/api/asset/asset.py:180 msgid "Cannot create asset directly, you should create a host or other" msgstr "" @@ -1437,7 +1439,6 @@ msgstr "" #: assets/automations/ping_gateway/manager.py:58 #: authentication/backends/oauth2/views.py:60 authentication/middleware.py:93 -#: xpack.bak/plugins/cloud/providers/fc.py:47 #: xpack/plugins/cloud/providers/fc.py:47 msgid "Authentication failed" msgstr "" @@ -1476,7 +1477,6 @@ msgstr "" #: assets/const/base.py:33 settings/serializers/basic.py:8 #: users/serializers/preference/koko.py:19 -#: users/serializers/preference/lina.py:46 #: users/serializers/preference/luna.py:77 msgid "Basic" msgstr "" @@ -1490,8 +1490,7 @@ msgstr "" #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:76 #: settings/serializers/feature.py:49 settings/serializers/msg.py:31 #: terminal/models/component/endpoint.py:13 terminal/serializers/applet.py:17 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:72 -#: xpack/plugins/cloud/manager.py:73 +#: xpack/plugins/cloud/manager.py:83 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" msgstr "" @@ -1547,7 +1546,7 @@ msgstr "" msgid "ChatGPT" msgstr "" -#: assets/const/host.py:12 rbac/tree.py:28 +#: assets/const/host.py:12 rbac/tree.py:28 xpack/plugins/cloud/const.py:69 msgid "Other" msgstr "" @@ -1699,7 +1698,6 @@ msgstr "" #: assets/models/asset/common.py:94 assets/models/platform.py:16 #: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:77 #: settings/serializers/msg.py:32 terminal/serializers/storage.py:133 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:73 #: xpack/plugins/cloud/serializers/account_attrs.py:73 msgid "Port" msgstr "" @@ -1712,8 +1710,7 @@ msgstr "" #: assets/models/asset/common.py:161 assets/models/platform.py:134 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 -#: perms/serializers/user_permission.py:25 -#: xpack.bak/plugins/cloud/models.py:325 xpack/plugins/cloud/models.py:325 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:365 msgid "Platform" msgstr "" @@ -1772,8 +1769,7 @@ msgstr "" #: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 #: assets/models/node.py:553 perms/models/asset_permission.py:72 -#: tickets/models/ticket/apply_asset.py:14 -#: xpack.bak/plugins/cloud/models.py:326 xpack/plugins/cloud/models.py:326 +#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:366 msgid "Node" msgstr "" @@ -1791,8 +1787,8 @@ msgid "Asset automation task" msgstr "" #: assets/models/automations/base.py:114 assets/models/cmd_filter.py:41 -#: audits/models.py:267 common/db/models.py:34 ops/models/base.py:54 -#: ops/models/job.py:240 users/models/user.py:1156 +#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:240 +#: users/models/user.py:1156 msgid "Date created" msgstr "" @@ -1917,7 +1913,6 @@ msgstr "" #: assets/models/platform.py:19 assets/serializers/platform.py:146 #: terminal/models/component/storage.py:28 -#: xpack.bak/plugins/cloud/providers/nutanix.py:30 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "" @@ -2059,10 +2054,8 @@ msgstr "" #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:46 -#: perms/serializers/user_permission.py:74 -#: xpack.bak/plugins/cloud/models.py:328 -#: xpack.bak/plugins/cloud/serializers/task.py:33 -#: xpack/plugins/cloud/models.py:328 xpack/plugins/cloud/serializers/task.py:34 +#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:368 +#: xpack/plugins/cloud/serializers/task.py:34 msgid "Protocols" msgstr "" @@ -2396,7 +2389,7 @@ msgstr "" #: audits/const.py:23 terminal/api/session/session.py:277 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 -#: xpack/plugins/cloud/manager.py:74 +#: xpack/plugins/cloud/manager.py:84 msgid "View" msgstr "" @@ -2455,7 +2448,7 @@ msgstr "" #: audits/const.py:51 terminal/models/applet/host.py:144 #: terminal/models/component/task.py:22 -#: xpack/plugins/cloud/serializers/account.py:55 +#: xpack/plugins/cloud/serializers/account.py:78 msgid "Task" msgstr "" @@ -2494,7 +2487,7 @@ msgstr "" #: audits/models.py:67 terminal/backends/command/models.py:21 #: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20 -#: terminal/models/session/sharing.py:95 +#: terminal/models/session/sharing.py:95 terminal/serializers/command.py:19 #: terminal/templates/terminal/_msg_command_alert.html:10 #: terminal/templates/terminal/_msg_command_warning.html:17 #: tickets/models/ticket/command_confirm.py:15 @@ -2577,6 +2570,10 @@ msgstr "" msgid "Session key" msgstr "" +#: audits/models.py:267 +msgid "Login date" +msgstr "" + #: audits/models.py:298 msgid "User session" msgstr "" @@ -3221,8 +3218,7 @@ msgid "Component" msgstr "" #: authentication/serializers/connect_token_secret.py:136 -#: perms/serializers/user_permission.py:28 -#: xpack.bak/plugins/cloud/models.py:327 xpack/plugins/cloud/models.py:327 +#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:367 msgid "Domain" msgstr "" @@ -3254,8 +3250,7 @@ msgid "Ticket info" msgstr "" #: authentication/serializers/connection_token.py:21 -#: perms/models/asset_permission.py:77 perms/serializers/permission.py:42 -#: perms/serializers/permission.py:64 +#: perms/models/asset_permission.py:77 #: tickets/models/ticket/apply_application.py:28 #: tickets/models/ticket/apply_asset.py:18 msgid "Actions" @@ -3308,8 +3303,9 @@ msgid "Disable" msgstr "" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/const.py:43 users/templates/users/mfa_setting.html:26 -#: users/templates/users/mfa_setting.html:68 +#: users/const.py:43 users/templates/users/mfa_setting.html:120 +#: users/templates/users/mfa_setting.html:158 +#: users/templates/users/mfa_setting.html:177 msgid "Enable" msgstr "" @@ -3344,15 +3340,11 @@ msgstr "" #: authentication/templates/authentication/_msg_oauth_bind.html:3 #: authentication/templates/authentication/_msg_reset_password.html:3 #: authentication/templates/authentication/_msg_reset_password_code.html:9 -#: authentication/templates/authentication/_msg_rest_password_success.html:2 -#: authentication/templates/authentication/_msg_rest_public_key_success.html:2 #: jumpserver/conf.py:465 #: 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:32 #: users/templates/users/_msg_account_expire_reminder.html:4 #: users/templates/users/_msg_password_expire_reminder.html:4 -#: users/templates/users/_msg_reset_mfa.html:4 #: users/templates/users/_msg_reset_ssh_key.html:4 msgid "Hello" msgstr "" @@ -3503,7 +3495,7 @@ msgid "Do you want to retry ?" msgstr "" #: authentication/utils.py:24 common/utils/ip/geoip/utils.py:24 -#: xpack.bak/plugins/cloud/const.py:33 xpack/plugins/cloud/const.py:33 +#: xpack/plugins/cloud/const.py:33 msgid "LAN" msgstr "" @@ -3683,7 +3675,7 @@ msgstr "" msgid "Canceled" msgstr "" -#: common/const/common.py:5 xpack/plugins/cloud/manager.py:380 +#: common/const/common.py:5 xpack/plugins/cloud/manager.py:408 #, python-format msgid "%(name)s was created successfully" msgstr "" @@ -3742,9 +3734,6 @@ msgstr "" #: common/db/fields.py:594 common/db/fields.py:599 #: common/serializers/fields.py:133 tickets/serializers/ticket/common.py:58 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:56 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:79 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:150 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 #: xpack/plugins/cloud/serializers/account_attrs.py:150 @@ -3801,7 +3790,7 @@ msgid "" "information -> file encryption password to set the encryption password" msgstr "" -#: common/exceptions.py:15 +#: common/exceptions.py:15 xpack/plugins/cloud/ws.py:38 #, python-format msgid "%s object does not exist." msgstr "" @@ -3879,8 +3868,7 @@ msgstr "" msgid "Tencent cloud" msgstr "" -#: common/sdk/sms/endpoint.py:18 xpack.bak/plugins/cloud/const.py:13 -#: xpack/plugins/cloud/const.py:13 +#: common/sdk/sms/endpoint.py:18 xpack/plugins/cloud/const.py:13 msgid "Huawei Cloud" msgstr "" @@ -4315,12 +4303,12 @@ msgid "Date last run" msgstr "" #: ops/models/base.py:51 ops/models/job.py:237 -#: xpack.bak/plugins/cloud/models.py:198 xpack/plugins/cloud/models.py:198 +#: xpack/plugins/cloud/models.py:214 msgid "Result" msgstr "" #: ops/models/base.py:52 ops/models/job.py:238 -#: xpack/plugins/cloud/manager.py:77 +#: xpack/plugins/cloud/manager.py:87 msgid "Summary" msgstr "" @@ -4341,7 +4329,7 @@ msgid "Kwargs" msgstr "" #: ops/models/celery.py:84 terminal/models/session/sharing.py:128 -#: tickets/const.py:25 +#: tickets/const.py:25 xpack/plugins/cloud/const.py:67 msgid "Finished" msgstr "" @@ -4559,7 +4547,7 @@ msgstr "" #: orgs/mixins/serializers.py:26 rbac/serializers/rolebinding.py:27 msgid "Org name" -msgstr "" +msgstr "Organization" #: orgs/models.py:14 msgid "GLOBAL" @@ -4894,7 +4882,7 @@ msgstr "" msgid "Session audits" msgstr "Session" -#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:74 +#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:84 msgid "Cloud import" msgstr "" @@ -5302,13 +5290,11 @@ msgid "Service provider" msgstr "" #: settings/serializers/auth/oauth2.py:30 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:35 #: xpack/plugins/cloud/serializers/account_attrs.py:35 msgid "Client ID" msgstr "" #: settings/serializers/auth/oauth2.py:33 settings/serializers/auth/oidc.py:23 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:38 #: xpack/plugins/cloud/serializers/account_attrs.py:38 msgid "Client Secret" msgstr "" @@ -5510,8 +5496,7 @@ msgstr "" msgid "Enable Short Message Service (SMS)" msgstr "" -#: settings/serializers/auth/sms.py:21 xpack.bak/plugins/cloud/models.py:34 -#: xpack/plugins/cloud/models.py:34 +#: settings/serializers/auth/sms.py:21 xpack/plugins/cloud/models.py:35 msgid "Provider" msgstr "" @@ -5601,7 +5586,6 @@ msgid "SSO auth key TTL" msgstr "" #: settings/serializers/auth/sso.py:20 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Unit: second" msgstr "" @@ -5818,6 +5802,10 @@ msgstr "" msgid "Virtual app" msgstr "" +#: settings/serializers/feature.py:148 +msgid "Virtual App" +msgstr "" + #: settings/serializers/feature.py:150 msgid "" "Virtual applications, you can use the Linux operating system as an " @@ -6006,6 +5994,7 @@ msgid "" msgstr "" #: settings/serializers/security.py:116 +#: users/templates/users/mfa_setting.html:160 msgid "Not enabled" msgstr "" @@ -6185,7 +6174,6 @@ msgstr "" #: settings/serializers/terminal.py:34 users/forms/profile.py:172 #: users/models/user.py:931 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:210 #: xpack/plugins/cloud/serializers/account_attrs.py:210 msgid "Public key" msgstr "" @@ -6226,6 +6214,20 @@ msgid "" "Luna page will display the SSH client launch method when connecting to assets" msgstr "" +#: settings/serializers/tool.py:10 +msgid "Tool" +msgstr "" + +#: settings/serializers/tool.py:13 +msgid "Tools in the Workbench" +msgstr "" + +#: settings/serializers/tool.py:15 +msgid "" +"*! If enabled, users with RBAC permissions will be able to utilize all tools " +"in the workbench" +msgstr "" + #: settings/tasks/ldap.py:28 msgid "Periodic import ldap user" msgstr "" @@ -6365,6 +6367,7 @@ msgid "Export" msgstr "" #: templates/_csv_import_export.html:13 templates/_csv_import_modal.html:5 +#: xpack/plugins/cloud/const.py:65 msgid "Import" msgstr "" @@ -6476,15 +6479,16 @@ msgid "" msgstr "" #: templates/_mfa_login_field.html:28 -msgid "Send verification code" +#: users/templates/users/forgot_password.html:101 +msgid "Send" msgstr "" -#: templates/_mfa_login_field.html:107 +#: templates/_mfa_login_field.html:106 #: users/templates/users/forgot_password.html:176 msgid "Wait: " msgstr "" -#: templates/_mfa_login_field.html:117 +#: templates/_mfa_login_field.html:116 #: users/templates/users/forgot_password.html:192 msgid "The verification code has been sent" msgstr "" @@ -6729,8 +6733,7 @@ msgstr "" msgid "Storage is invalid" msgstr "" -#: terminal/models/applet/applet.py:30 xpack.bak/plugins/license/models.py:88 -#: xpack/plugins/license/models.py:88 +#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88 msgid "Community edition" msgstr "" @@ -7064,6 +7067,8 @@ msgid "Command and replay storage" msgstr "Storage" #: terminal/notifications.py:240 terminal/tasks.py:153 +#: xpack/plugins/cloud/serializers/account.py:115 +#: xpack/plugins/cloud/serializers/account.py:117 msgid "Test failure: Account invalid" msgstr "" @@ -7179,10 +7184,6 @@ msgstr "" msgid "Applet ID" msgstr "" -#: terminal/serializers/command.py:19 -msgid "Session ID" -msgstr "" - #: terminal/serializers/command.py:41 msgid "Command Filter ACL" msgstr "" @@ -7288,13 +7289,12 @@ msgid "Access key ID" msgstr "" #: terminal/serializers/storage.py:37 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:20 #: xpack/plugins/cloud/serializers/account_attrs.py:20 msgid "Access key secret" msgstr "" -#: terminal/serializers/storage.py:68 xpack.bak/plugins/cloud/models.py:249 -#: xpack/plugins/cloud/manager.py:90 xpack/plugins/cloud/models.py:249 +#: terminal/serializers/storage.py:68 xpack/plugins/cloud/manager.py:100 +#: xpack/plugins/cloud/models.py:265 msgid "Region" msgstr "" @@ -7315,7 +7315,6 @@ msgid "HOST" msgstr "" #: terminal/serializers/storage.py:146 users/models/user.py:928 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:213 #: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "" @@ -8147,8 +8146,8 @@ msgstr "" #: users/serializers/preference/lina.py:11 msgid "" -"The password for file encryption, used for decryption when the system sends " -"emails containing file attachments.
Such as: account backup files, " +"*! The password for file encryption, used for decryption when the system " +"sends emails containing file attachments.
Such as: account backup files, " "account password change results files" msgstr "" @@ -8156,6 +8155,10 @@ msgstr "" msgid "The newly set password is inconsistent" msgstr "" +#: users/serializers/preference/lina.py:46 +msgid "File Encryption" +msgstr "" + #: users/serializers/preference/luna.py:26 msgid "Async loading of asset tree" msgstr "" @@ -8451,10 +8454,6 @@ msgstr "" msgid "Mobile number" msgstr "" -#: users/templates/users/forgot_password.html:101 -msgid "Send" -msgstr "" - #: users/templates/users/forgot_password.html:105 #: users/templates/users/forgot_password_previewing.html:30 msgid "Submit" @@ -8464,19 +8463,15 @@ msgstr "" msgid "Please enter the username for which you want to retrieve the password" msgstr "" -#: users/templates/users/mfa_setting.html:24 -msgid "Enable MFA" -msgstr "" - -#: users/templates/users/mfa_setting.html:30 +#: users/templates/users/mfa_setting.html:124 msgid "MFA force enable, cannot disable" msgstr "" -#: users/templates/users/mfa_setting.html:48 +#: users/templates/users/mfa_setting.html:143 msgid "MFA setting" msgstr "" -#: users/templates/users/mfa_setting.html:61 +#: users/templates/users/mfa_setting.html:171 msgid "Reset" msgstr "" @@ -8628,915 +8623,730 @@ msgstr "" msgid "Reset password success, return to login page" msgstr "" -#: xpack.bak/apps.py:8 xpack/apps.py:8 +#: xpack/apps.py:8 msgid "XPACK" msgstr "" -#: xpack.bak/exceptions.py:7 -msgid "" -"The current task is not synchronized with unmatched policy assets, skipping" -msgstr "" - -#: xpack.bak/plugins/cloud/api.py:60 xpack/plugins/cloud/api.py:60 -msgid "Test connection successful" -msgstr "" - -#: xpack.bak/plugins/cloud/api.py:62 xpack/plugins/cloud/api.py:62 -msgid "Test connection failed: {}" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:8 xpack/plugins/cloud/const.py:8 -msgid "Alibaba Cloud" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:9 xpack/plugins/cloud/const.py:9 -msgid "AWS (International)" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:10 xpack/plugins/cloud/const.py:10 -msgid "AWS (China)" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:11 xpack/plugins/cloud/const.py:11 -msgid "Azure (China)" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:12 xpack/plugins/cloud/const.py:12 -msgid "Azure (International)" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:14 xpack/plugins/cloud/const.py:14 -msgid "Baidu Cloud" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:15 xpack/plugins/cloud/const.py:15 -msgid "JD Cloud" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:16 xpack/plugins/cloud/const.py:16 -msgid "KingSoft Cloud" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:17 xpack/plugins/cloud/const.py:17 -msgid "Tencent Cloud" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:18 xpack/plugins/cloud/const.py:18 -msgid "Tencent Cloud (Lighthouse)" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:19 xpack/plugins/cloud/const.py:19 -msgid "Google Cloud Platform" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:20 xpack/plugins/cloud/const.py:20 -msgid "UCloud" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:21 xpack/plugins/cloud/const.py:21 -msgid "Volcengine" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:23 xpack/plugins/cloud/const.py:23 -msgid "VMware" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:24 -#: xpack.bak/plugins/cloud/providers/nutanix.py:15 -#: xpack/plugins/cloud/const.py:24 xpack/plugins/cloud/providers/nutanix.py:15 -msgid "Nutanix" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:25 xpack/plugins/cloud/const.py:25 -msgid "Huawei Private Cloud" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:26 xpack/plugins/cloud/const.py:26 -msgid "Qingyun Private Cloud" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:27 xpack/plugins/cloud/const.py:27 -msgid "CTYun Private Cloud" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:28 xpack/plugins/cloud/const.py:28 -msgid "OpenStack" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:29 -#: xpack.bak/plugins/cloud/providers/zstack.py:21 -#: xpack/plugins/cloud/const.py:29 xpack/plugins/cloud/providers/zstack.py:21 -msgid "ZStack" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:30 xpack/plugins/cloud/const.py:30 -msgid "Fusion Compute" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:31 xpack/plugins/cloud/const.py:31 -msgid "SCP" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:32 xpack/plugins/cloud/const.py:32 -msgid "Apsara Stack" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:37 xpack/plugins/cloud/const.py:37 -msgid "Private IP" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:38 xpack/plugins/cloud/const.py:38 -msgid "Public IP" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:42 xpack.bak/plugins/cloud/models.py:299 -#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:299 -msgid "Instance name" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:43 xpack/plugins/cloud/const.py:43 -msgid "Instance name and Partial IP" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:48 xpack/plugins/cloud/const.py:48 -msgid "Succeed" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:52 xpack/plugins/cloud/const.py:52 -#: xpack/plugins/cloud/manager.py:80 -msgid "Unsync" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:53 xpack/plugins/cloud/const.py:53 -#: xpack/plugins/cloud/manager.py:79 -msgid "New Sync" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:54 xpack/plugins/cloud/const.py:54 -#: xpack/plugins/cloud/manager.py:79 -msgid "Synced" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:55 xpack/plugins/cloud/const.py:55 -#: xpack/plugins/cloud/manager.py:80 -msgid "Released" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:59 xpack/plugins/cloud/const.py:59 -msgid "And" -msgstr "" - -#: xpack.bak/plugins/cloud/const.py:60 xpack/plugins/cloud/const.py:60 -msgid "Or" -msgstr "" - -#: xpack.bak/plugins/cloud/manager.py:55 -#: xpack.bak/plugins/cloud/providers/gcp.py:64 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:34 -#: xpack/plugins/cloud/manager.py:45 xpack/plugins/cloud/manager.py:55 -#: xpack/plugins/cloud/manager.py:57 xpack/plugins/cloud/providers/gcp.py:64 -#: xpack/plugins/cloud/providers/huaweicloud.py:34 -msgid "Account unavailable" -msgstr "" - -#: xpack.bak/plugins/cloud/meta.py:9 xpack/plugins/cloud/meta.py:9 -msgid "Cloud center" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:37 -#: xpack.bak/plugins/cloud/serializers/account.py:68 -#: xpack/plugins/cloud/models.py:37 -#: xpack/plugins/cloud/serializers/account.py:69 -msgid "Attrs" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:38 xpack/plugins/cloud/models.py:38 -msgid "Validity" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:43 xpack/plugins/cloud/models.py:43 -msgid "Cloud account" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:45 xpack/plugins/cloud/models.py:45 -msgid "Test cloud account" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:88 -#: xpack.bak/plugins/cloud/serializers/task.py:159 -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:160 -msgid "Regions" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:91 xpack/plugins/cloud/models.py:91 -msgid "Hostname strategy" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:96 -#: xpack.bak/plugins/cloud/serializers/task.py:162 -#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:163 -msgid "IP network segment group" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:99 -#: xpack.bak/plugins/cloud/serializers/task.py:167 -#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:168 -msgid "Sync IP type" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:102 -#: xpack.bak/plugins/cloud/serializers/task.py:185 -#: xpack/plugins/cloud/models.py:102 -#: xpack/plugins/cloud/serializers/task.py:186 -msgid "Always update" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:104 xpack/plugins/cloud/models.py:104 -msgid "Fully synchronous" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:109 xpack/plugins/cloud/models.py:109 -msgid "Date last sync" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:112 xpack.bak/plugins/cloud/models.py:317 -#: xpack.bak/plugins/cloud/models.py:341 xpack/plugins/cloud/models.py:112 -#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/models.py:341 -msgid "Strategy" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:117 xpack.bak/plugins/cloud/models.py:196 -#: xpack/plugins/cloud/models.py:117 xpack/plugins/cloud/models.py:196 -msgid "Sync instance task" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:207 xpack.bak/plugins/cloud/models.py:259 -#: xpack/plugins/cloud/models.py:207 xpack/plugins/cloud/models.py:259 -msgid "Date sync" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:211 -msgid "Sync instance snapshot" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:215 xpack/plugins/cloud/models.py:215 -msgid "Sync instance task execution" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:239 xpack/plugins/cloud/models.py:239 -msgid "Sync task" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:243 xpack/plugins/cloud/models.py:243 -msgid "Sync instance task history" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:246 xpack/plugins/cloud/models.py:246 -msgid "Instance" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:263 xpack/plugins/cloud/models.py:263 -msgid "Sync instance detail" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:275 -#: xpack.bak/plugins/cloud/serializers/task.py:72 -#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/serializers/task.py:73 -msgid "Rule relation" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:284 xpack/plugins/cloud/models.py:284 -msgid "Task strategy" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:288 xpack/plugins/cloud/models.py:288 -msgid "Equal" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:289 xpack/plugins/cloud/models.py:289 -msgid "Not Equal" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:290 xpack/plugins/cloud/models.py:290 -msgid "In" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:291 xpack/plugins/cloud/models.py:291 -msgid "Contains" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:292 xpack/plugins/cloud/models.py:292 -msgid "Exclude" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:293 xpack/plugins/cloud/models.py:293 -msgid "Startswith" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:294 xpack/plugins/cloud/models.py:294 -msgid "Endswith" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:300 xpack/plugins/cloud/models.py:300 -msgid "Instance platform" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:301 xpack/plugins/cloud/models.py:301 -msgid "Instance address" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:308 xpack/plugins/cloud/models.py:308 -msgid "Rule attr" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:312 xpack/plugins/cloud/models.py:312 -msgid "Rule match" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:314 xpack/plugins/cloud/models.py:314 -msgid "Rule value" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:321 -#: xpack.bak/plugins/cloud/serializers/task.py:75 -#: xpack/plugins/cloud/models.py:321 xpack/plugins/cloud/serializers/task.py:76 -msgid "Strategy rule" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:336 xpack/plugins/cloud/models.py:336 -msgid "Action attr" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:338 xpack/plugins/cloud/models.py:338 -msgid "Action value" -msgstr "" - -#: xpack.bak/plugins/cloud/models.py:345 -#: xpack.bak/plugins/cloud/serializers/task.py:78 -#: xpack/plugins/cloud/models.py:345 xpack/plugins/cloud/serializers/task.py:79 -msgid "Strategy action" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:18 -#: xpack/plugins/cloud/providers/aws_international.py:18 -msgid "China (Beijing)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:19 -#: xpack/plugins/cloud/providers/aws_international.py:19 -msgid "China (Ningxia)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:22 -#: xpack/plugins/cloud/providers/aws_international.py:22 -msgid "US East (Ohio)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:23 -#: xpack/plugins/cloud/providers/aws_international.py:23 -msgid "US East (N. Virginia)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:24 -#: xpack/plugins/cloud/providers/aws_international.py:24 -msgid "US West (N. California)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:25 -#: xpack/plugins/cloud/providers/aws_international.py:25 -msgid "US West (Oregon)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:26 -#: xpack/plugins/cloud/providers/aws_international.py:26 -msgid "Africa (Cape Town)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:27 -#: xpack/plugins/cloud/providers/aws_international.py:27 -msgid "Asia Pacific (Hong Kong)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:28 -#: xpack/plugins/cloud/providers/aws_international.py:28 -msgid "Asia Pacific (Mumbai)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:29 -#: xpack/plugins/cloud/providers/aws_international.py:29 -msgid "Asia Pacific (Osaka-Local)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:30 -#: xpack/plugins/cloud/providers/aws_international.py:30 -msgid "Asia Pacific (Seoul)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:31 -#: xpack/plugins/cloud/providers/aws_international.py:31 -msgid "Asia Pacific (Singapore)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:32 -#: xpack/plugins/cloud/providers/aws_international.py:32 -msgid "Asia Pacific (Sydney)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:33 -#: xpack/plugins/cloud/providers/aws_international.py:33 -msgid "Asia Pacific (Tokyo)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:34 -#: xpack/plugins/cloud/providers/aws_international.py:34 -msgid "Canada (Central)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:35 -#: xpack/plugins/cloud/providers/aws_international.py:35 -msgid "Europe (Frankfurt)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:36 -#: xpack/plugins/cloud/providers/aws_international.py:36 -msgid "Europe (Ireland)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:37 -#: xpack/plugins/cloud/providers/aws_international.py:37 -msgid "Europe (London)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:38 -#: xpack/plugins/cloud/providers/aws_international.py:38 -msgid "Europe (Milan)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:39 -#: xpack/plugins/cloud/providers/aws_international.py:39 -msgid "Europe (Paris)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:40 -#: xpack/plugins/cloud/providers/aws_international.py:40 -msgid "Europe (Stockholm)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:41 -#: xpack/plugins/cloud/providers/aws_international.py:41 -msgid "Middle East (Bahrain)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/aws_international.py:42 -#: xpack/plugins/cloud/providers/aws_international.py:42 -msgid "South America (São Paulo)" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/baiducloud.py:56 -#: xpack.bak/plugins/cloud/providers/jdcloud.py:125 -#: xpack/plugins/cloud/providers/baiducloud.py:56 -#: xpack/plugins/cloud/providers/jdcloud.py:125 -msgid "CN North-Beijing" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/baiducloud.py:57 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:47 -#: xpack.bak/plugins/cloud/providers/jdcloud.py:128 -#: xpack/plugins/cloud/providers/baiducloud.py:57 -#: xpack/plugins/cloud/providers/huaweicloud.py:47 -#: xpack/plugins/cloud/providers/jdcloud.py:128 -msgid "CN South-Guangzhou" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/baiducloud.py:58 -#: xpack/plugins/cloud/providers/baiducloud.py:58 -msgid "CN East-Suzhou" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/baiducloud.py:59 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:54 -#: xpack/plugins/cloud/providers/baiducloud.py:59 -#: xpack/plugins/cloud/providers/huaweicloud.py:54 -msgid "CN-Hong Kong" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/baiducloud.py:60 -#: xpack/plugins/cloud/providers/baiducloud.py:60 -msgid "CN Center-Wuhan" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/baiducloud.py:61 -#: xpack/plugins/cloud/providers/baiducloud.py:61 -msgid "CN North-Baoding" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/baiducloud.py:62 -#: xpack.bak/plugins/cloud/providers/jdcloud.py:127 -#: xpack/plugins/cloud/providers/baiducloud.py:62 -#: xpack/plugins/cloud/providers/jdcloud.py:127 -msgid "CN East-Shanghai" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/baiducloud.py:63 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:56 -#: xpack/plugins/cloud/providers/baiducloud.py:63 -#: xpack/plugins/cloud/providers/huaweicloud.py:56 -msgid "AP-Singapore" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:44 -#: xpack/plugins/cloud/providers/huaweicloud.py:44 -msgid "CN North-Beijing1" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:45 -#: xpack/plugins/cloud/providers/huaweicloud.py:45 -msgid "CN North-Beijing4" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:46 -#: xpack/plugins/cloud/providers/huaweicloud.py:46 -msgid "CN North-Ulanqab1" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:48 -#: xpack/plugins/cloud/providers/huaweicloud.py:48 -msgid "CN South-Shenzhen" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:49 -#: xpack/plugins/cloud/providers/huaweicloud.py:49 -msgid "CN South-Guangzhou-InvitationOnly" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:50 -#: xpack/plugins/cloud/providers/huaweicloud.py:50 -msgid "CN East-Shanghai2" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:51 -#: xpack/plugins/cloud/providers/huaweicloud.py:51 -msgid "CN East-Shanghai1" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:53 -#: xpack/plugins/cloud/providers/huaweicloud.py:53 -msgid "CN Southwest-Guiyang1" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:55 -#: xpack/plugins/cloud/providers/huaweicloud.py:55 -msgid "AP-Bangkok" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:58 -#: xpack/plugins/cloud/providers/huaweicloud.py:58 -msgid "AF-Johannesburg" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:59 -#: xpack/plugins/cloud/providers/huaweicloud.py:59 -msgid "LA-Mexico City1" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:60 -#: xpack/plugins/cloud/providers/huaweicloud.py:60 -msgid "LA-Santiago" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:61 -#: xpack/plugins/cloud/providers/huaweicloud.py:61 -msgid "LA-Sao Paulo1" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:63 -#: xpack/plugins/cloud/providers/huaweicloud.py:63 -msgid "TR-Istanbul" -msgstr "" - -#: xpack.bak/plugins/cloud/providers/jdcloud.py:126 -#: xpack/plugins/cloud/providers/jdcloud.py:126 -msgid "CN East-Suqian" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account.py:69 -#: xpack/plugins/cloud/serializers/account.py:70 -msgid "Validity display" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account.py:70 -#: xpack/plugins/cloud/serializers/account.py:71 -msgid "Provider display" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:17 -#: xpack/plugins/cloud/serializers/account_attrs.py:17 -msgid "Access key id" -msgstr "Access key id" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:41 -#: xpack/plugins/cloud/serializers/account_attrs.py:41 -msgid "Tenant ID" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:44 -#: xpack/plugins/cloud/serializers/account_attrs.py:44 -msgid "Subscription ID" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:98 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:102 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:126 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:156 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:206 -#: xpack/plugins/cloud/serializers/account_attrs.py:98 -#: xpack/plugins/cloud/serializers/account_attrs.py:102 -#: xpack/plugins/cloud/serializers/account_attrs.py:126 -#: xpack/plugins/cloud/serializers/account_attrs.py:156 -#: xpack/plugins/cloud/serializers/account_attrs.py:206 -msgid "API Endpoint" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:108 -#: xpack/plugins/cloud/serializers/account_attrs.py:108 -msgid "Auth url" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:109 -#: xpack/plugins/cloud/serializers/account_attrs.py:109 -msgid "eg: http://openstack.example.com:5000/v3" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:112 -#: xpack/plugins/cloud/serializers/account_attrs.py:112 -msgid "User domain" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:127 -#: xpack/plugins/cloud/serializers/account_attrs.py:127 -msgid "Cert File" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:128 -#: xpack/plugins/cloud/serializers/account_attrs.py:128 -msgid "Key File" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:144 -#: xpack/plugins/cloud/serializers/account_attrs.py:144 -msgid "Service account key" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:145 -#: xpack/plugins/cloud/serializers/account_attrs.py:145 -msgid "The file is in JSON format" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:163 -#: xpack/plugins/cloud/serializers/account_attrs.py:163 -msgid "IP address invalid `{}`, {}" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:179 -#: xpack/plugins/cloud/serializers/account_attrs.py:179 -msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:182 -#: xpack/plugins/cloud/serializers/account_attrs.py:182 -msgid "" -"The port is used to detect the validity of the IP address. When the " -"synchronization task is executed, only the valid IP address will be " -"synchronized.
If the port is 0, all IP addresses are valid." -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:190 -#: xpack/plugins/cloud/serializers/account_attrs.py:190 -msgid "Hostname prefix" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:193 -#: xpack/plugins/cloud/serializers/account_attrs.py:193 -msgid "IP segment" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:197 -#: xpack/plugins/cloud/serializers/account_attrs.py:197 -msgid "Test port" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 -#: xpack/plugins/cloud/serializers/account_attrs.py:200 -msgid "Test timeout" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:216 -#: xpack/plugins/cloud/serializers/account_attrs.py:216 -msgid "Project" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/task.py:151 -#: xpack/plugins/cloud/serializers/task.py:152 -msgid "" -"Only instances matching the IP range will be synced.
If the instance " -"contains multiple IP addresses, the first IP address that matches will be " -"used as the IP for the created asset.
The default value of * means sync " -"all instances and randomly match IP addresses.
Such as: 192.168.1.0/24, " -"10.1.1.1-10.1.1.20" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/task.py:157 -#: xpack/plugins/cloud/serializers/task.py:158 -msgid "History count" -msgstr "" - -#: xpack.bak/plugins/cloud/serializers/task.py:158 -#: xpack/plugins/cloud/serializers/task.py:159 -msgid "Instance count" -msgstr "" - -#: xpack.bak/plugins/cloud/tasks.py:27 xpack/plugins/cloud/tasks.py:27 -msgid "Run sync instance task" -msgstr "" - -#: xpack.bak/plugins/cloud/tasks.py:41 xpack/plugins/cloud/tasks.py:41 -msgid "Period clean sync instance task execution" -msgstr "" - -#: xpack.bak/plugins/interface/api.py:52 xpack/plugins/interface/api.py:52 -msgid "Restore default successfully." -msgstr "" - -#: xpack.bak/plugins/interface/meta.py:9 xpack/plugins/interface/meta.py:9 -#: xpack/plugins/interface/models.py:45 xpack/plugins/interface/models.py:86 -msgid "Interface settings" -msgstr "" - -#: xpack.bak/plugins/interface/models.py:23 -msgid "Title of login page" -msgstr "" - -#: xpack.bak/plugins/interface/models.py:27 -msgid "Image of login page" -msgstr "" - -#: xpack.bak/plugins/interface/models.py:31 -#: xpack/plugins/interface/models.py:31 -msgid "Website icon" -msgstr "" - -#: xpack.bak/plugins/interface/models.py:35 -msgid "Logo of management page" -msgstr "" - -#: xpack.bak/plugins/interface/models.py:39 -msgid "Logo of logout page" -msgstr "" - -#: xpack.bak/plugins/interface/models.py:41 -#: xpack/plugins/interface/models.py:41 -#: xpack/plugins/interface/serializers/interface.py:26 -msgid "Theme" -msgstr "" - -#: xpack.bak/plugins/interface/models.py:42 -#: xpack/plugins/interface/models.py:42 -msgid "Footer content" -msgstr "" - -#: xpack.bak/plugins/interface/models.py:45 -#: xpack.bak/plugins/interface/models.py:86 -#, fuzzy -#| msgid "Terminal setting" -msgid "Interface setting" -msgstr "Terminal" - -#: xpack.bak/plugins/license/api.py:52 xpack/plugins/license/api.py:52 -msgid "License import successfully" -msgstr "" - -#: xpack.bak/plugins/license/api.py:53 -msgid "License is invalid" -msgstr "" - -#: xpack.bak/plugins/license/meta.py:10 xpack.bak/plugins/license/models.py:144 -#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:144 -msgid "License" -msgstr "" - -#: xpack.bak/plugins/license/models.py:80 xpack/plugins/license/models.py:80 -msgid "Basic edition" -msgstr "" - -#: xpack.bak/plugins/license/models.py:82 xpack/plugins/license/models.py:82 -msgid "Standard edition" -msgstr "" - -#: xpack.bak/plugins/license/models.py:84 xpack/plugins/license/models.py:84 -msgid "Professional edition" -msgstr "" - -#: xpack.bak/plugins/license/models.py:86 xpack/plugins/license/models.py:86 -msgid "Ultimate edition" -msgstr "" - #: xpack/exceptions.py:8 msgid "" "Based on the current task configuration, assets that do not match the " "strategy will skipped." msgstr "" -#: xpack/plugins/cloud/manager.py:41 +#: xpack/plugins/cloud/api.py:65 +msgid "Test connection successful" +msgstr "" + +#: xpack/plugins/cloud/api.py:67 +msgid "Test connection failed: {}" +msgstr "" + +#: xpack/plugins/cloud/const.py:8 +msgid "Alibaba Cloud" +msgstr "" + +#: xpack/plugins/cloud/const.py:9 +msgid "AWS (International)" +msgstr "" + +#: xpack/plugins/cloud/const.py:10 +msgid "AWS (China)" +msgstr "" + +#: xpack/plugins/cloud/const.py:11 +msgid "Azure (China)" +msgstr "" + +#: xpack/plugins/cloud/const.py:12 +msgid "Azure (International)" +msgstr "" + +#: xpack/plugins/cloud/const.py:14 +msgid "Baidu Cloud" +msgstr "" + +#: xpack/plugins/cloud/const.py:15 +msgid "JD Cloud" +msgstr "" + +#: xpack/plugins/cloud/const.py:16 +msgid "KingSoft Cloud" +msgstr "" + +#: xpack/plugins/cloud/const.py:17 +msgid "Tencent Cloud" +msgstr "" + +#: xpack/plugins/cloud/const.py:18 +msgid "Tencent Cloud (Lighthouse)" +msgstr "" + +#: xpack/plugins/cloud/const.py:19 +msgid "Google Cloud Platform" +msgstr "" + +#: xpack/plugins/cloud/const.py:20 +msgid "UCloud" +msgstr "" + +#: xpack/plugins/cloud/const.py:21 +msgid "Volcengine" +msgstr "" + +#: xpack/plugins/cloud/const.py:23 +msgid "VMware" +msgstr "" + +#: xpack/plugins/cloud/const.py:24 xpack/plugins/cloud/providers/nutanix.py:15 +msgid "Nutanix" +msgstr "" + +#: xpack/plugins/cloud/const.py:25 +msgid "Huawei Private Cloud" +msgstr "" + +#: xpack/plugins/cloud/const.py:26 +msgid "Qingyun Private Cloud" +msgstr "" + +#: xpack/plugins/cloud/const.py:27 +msgid "CTYun Private Cloud" +msgstr "" + +#: xpack/plugins/cloud/const.py:28 +msgid "OpenStack" +msgstr "" + +#: xpack/plugins/cloud/const.py:29 xpack/plugins/cloud/providers/zstack.py:21 +msgid "ZStack" +msgstr "" + +#: xpack/plugins/cloud/const.py:30 +msgid "Fusion Compute" +msgstr "" + +#: xpack/plugins/cloud/const.py:31 +msgid "SCP" +msgstr "" + +#: xpack/plugins/cloud/const.py:32 +msgid "Apsara Stack" +msgstr "" + +#: xpack/plugins/cloud/const.py:37 +msgid "Private IP" +msgstr "" + +#: xpack/plugins/cloud/const.py:38 +msgid "Public IP" +msgstr "" + +#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:339 +msgid "Instance name" +msgstr "" + +#: xpack/plugins/cloud/const.py:43 +msgid "Instance name and Partial IP" +msgstr "" + +#: xpack/plugins/cloud/const.py:48 +msgid "Succeed" +msgstr "" + +#: xpack/plugins/cloud/const.py:52 xpack/plugins/cloud/manager.py:90 +msgid "Unsync" +msgstr "" + +#: xpack/plugins/cloud/const.py:53 xpack/plugins/cloud/manager.py:89 +msgid "New Sync" +msgstr "" + +#: xpack/plugins/cloud/const.py:54 xpack/plugins/cloud/manager.py:89 +msgid "Synced" +msgstr "" + +#: xpack/plugins/cloud/const.py:55 xpack/plugins/cloud/manager.py:90 +msgid "Released" +msgstr "" + +#: xpack/plugins/cloud/const.py:59 +msgid "And" +msgstr "" + +#: xpack/plugins/cloud/const.py:60 +msgid "Or" +msgstr "" + +#: xpack/plugins/cloud/const.py:64 +msgid "Sync region" +msgstr "" + +#: xpack/plugins/cloud/const.py:66 +msgid "Imported" +msgstr "" + +#: xpack/plugins/cloud/manager.py:47 #, python-format msgid "Task \"%s\" starts executing" msgstr "" -#: xpack/plugins/cloud/manager.py:71 +#: xpack/plugins/cloud/manager.py:81 msgid "View the task details path: " msgstr "" -#: xpack/plugins/cloud/manager.py:74 +#: xpack/plugins/cloud/manager.py:84 msgid "Account Details" msgstr "" -#: xpack/plugins/cloud/manager.py:75 +#: xpack/plugins/cloud/manager.py:85 msgid "Synchronization History List" msgstr "" -#: xpack/plugins/cloud/manager.py:75 +#: xpack/plugins/cloud/manager.py:85 msgid "Synchronization Instance List" msgstr "" -#: xpack/plugins/cloud/manager.py:83 +#: xpack/plugins/cloud/manager.py:93 msgid "Task execution completed" msgstr "" -#: xpack/plugins/cloud/manager.py:87 +#: xpack/plugins/cloud/manager.py:97 msgid "Synchronization regions" msgstr "" -#: xpack/plugins/cloud/manager.py:110 +#: xpack/plugins/cloud/manager.py:115 #, python-format msgid "Get instances of region \"%s\" error, error: %s" msgstr "" -#: xpack/plugins/cloud/manager.py:128 -#, python-format -msgid "The instance IP \"%s\" is not in network segment \"%s\"" -msgstr "" - -#: xpack/plugins/cloud/manager.py:164 +#: xpack/plugins/cloud/manager.py:157 #, python-format msgid "Failed to synchronize the instance \"%s\"" msgstr "" -#: xpack/plugins/cloud/manager.py:316 +#: xpack/plugins/cloud/manager.py:333 #, python-format msgid "" "The updated platform of asset \"%s\" is inconsistent with the original " "platform type. Skip platform and protocol updates" msgstr "" -#: xpack/plugins/cloud/manager.py:358 +#: xpack/plugins/cloud/manager.py:389 #, python-format msgid "The asset \"%s\" already exists" msgstr "" -#: xpack/plugins/cloud/manager.py:362 +#: xpack/plugins/cloud/manager.py:391 #, python-format msgid "Update asset \"%s\"" msgstr "" -#: xpack/plugins/cloud/manager.py:365 +#: xpack/plugins/cloud/manager.py:394 #, python-format msgid "Asset \"%s\" has been updated" msgstr "" -#: xpack/plugins/cloud/manager.py:376 +#: xpack/plugins/cloud/manager.py:404 #, python-format msgid "Prepare to create asset \"%s\"" msgstr "" -#: xpack/plugins/cloud/manager.py:388 +#: xpack/plugins/cloud/manager.py:425 #, python-format msgid "Set nodes \"%s\"" msgstr "" -#: xpack/plugins/cloud/manager.py:414 +#: xpack/plugins/cloud/manager.py:451 #, python-format msgid "Set accounts \"%s\"" msgstr "" -#: xpack/plugins/cloud/manager.py:430 +#: xpack/plugins/cloud/manager.py:467 #, python-format msgid "Set protocols \"%s\"" msgstr "" +#: xpack/plugins/cloud/manager.py:481 xpack/plugins/cloud/tasks.py:27 +msgid "Run sync instance task" +msgstr "" + +#: xpack/plugins/cloud/meta.py:9 +msgid "Cloud center" +msgstr "" + +#: xpack/plugins/cloud/models.py:38 +#: xpack/plugins/cloud/serializers/account.py:93 +msgid "Attrs" +msgstr "" + +#: xpack/plugins/cloud/models.py:39 +msgid "Validity" +msgstr "" + +#: xpack/plugins/cloud/models.py:44 +msgid "Cloud account" +msgstr "" + +#: xpack/plugins/cloud/models.py:46 +msgid "Test cloud account" +msgstr "" + +#: xpack/plugins/cloud/models.py:102 +#: xpack/plugins/cloud/serializers/account.py:77 +#: xpack/plugins/cloud/serializers/task.py:156 +msgid "Regions" +msgstr "" + +#: xpack/plugins/cloud/models.py:105 +msgid "Hostname strategy" +msgstr "" + +#: xpack/plugins/cloud/models.py:110 +msgid "IP network segment group" +msgstr "" + +#: xpack/plugins/cloud/models.py:113 +#: xpack/plugins/cloud/serializers/task.py:159 +msgid "Sync IP type" +msgstr "" + +#: xpack/plugins/cloud/models.py:116 +msgid "Always update" +msgstr "" + +#: xpack/plugins/cloud/models.py:118 +msgid "Fully synchronous" +msgstr "" + +#: xpack/plugins/cloud/models.py:123 +msgid "Date last sync" +msgstr "" + +#: xpack/plugins/cloud/models.py:126 xpack/plugins/cloud/models.py:357 +#: xpack/plugins/cloud/models.py:383 +msgid "Strategy" +msgstr "" + +#: xpack/plugins/cloud/models.py:131 xpack/plugins/cloud/models.py:212 +msgid "Sync instance task" +msgstr "" + +#: xpack/plugins/cloud/models.py:223 xpack/plugins/cloud/models.py:275 +msgid "Date sync" +msgstr "" + +#: xpack/plugins/cloud/models.py:227 +msgid "Sync instance snapshot" +msgstr "" + +#: xpack/plugins/cloud/models.py:231 +msgid "Sync instance task execution" +msgstr "" + +#: xpack/plugins/cloud/models.py:255 +msgid "Sync task" +msgstr "" + +#: xpack/plugins/cloud/models.py:259 +msgid "Sync instance task history" +msgstr "" + +#: xpack/plugins/cloud/models.py:262 +msgid "Instance" +msgstr "" + +#: xpack/plugins/cloud/models.py:279 +msgid "Sync instance detail" +msgstr "" + +#: xpack/plugins/cloud/models.py:291 xpack/plugins/cloud/serializers/task.py:76 +msgid "Rule relation" +msgstr "" + +#: xpack/plugins/cloud/models.py:301 +msgid "Task strategy" +msgstr "" + +#: xpack/plugins/cloud/models.py:328 +msgid "Equal" +msgstr "" + +#: xpack/plugins/cloud/models.py:329 +msgid "Not Equal" +msgstr "" + +#: xpack/plugins/cloud/models.py:330 +msgid "In" +msgstr "" + +#: xpack/plugins/cloud/models.py:331 +msgid "Contains" +msgstr "" + +#: xpack/plugins/cloud/models.py:332 +msgid "Exclude" +msgstr "" + +#: xpack/plugins/cloud/models.py:333 +msgid "Startswith" +msgstr "" + +#: xpack/plugins/cloud/models.py:334 +msgid "Endswith" +msgstr "" + +#: xpack/plugins/cloud/models.py:340 +msgid "Instance platform" +msgstr "" + +#: xpack/plugins/cloud/models.py:341 +msgid "Instance address" +msgstr "" + +#: xpack/plugins/cloud/models.py:348 +msgid "Rule attr" +msgstr "" + +#: xpack/plugins/cloud/models.py:352 +msgid "Rule match" +msgstr "" + +#: xpack/plugins/cloud/models.py:354 +msgid "Rule value" +msgstr "" + +#: xpack/plugins/cloud/models.py:361 xpack/plugins/cloud/serializers/task.py:79 +msgid "Strategy rule" +msgstr "" + +#: xpack/plugins/cloud/models.py:371 +msgid "Name strategy" +msgstr "" + +#: xpack/plugins/cloud/models.py:378 +msgid "Action attr" +msgstr "" + +#: xpack/plugins/cloud/models.py:380 +msgid "Action value" +msgstr "" + +#: xpack/plugins/cloud/models.py:387 xpack/plugins/cloud/serializers/task.py:82 +msgid "Strategy action" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:18 +msgid "China (Beijing)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:19 +msgid "China (Ningxia)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:22 +msgid "US East (Ohio)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:23 +msgid "US East (N. Virginia)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:24 +msgid "US West (N. California)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:25 +msgid "US West (Oregon)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:26 +msgid "Africa (Cape Town)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:27 +msgid "Asia Pacific (Hong Kong)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:28 +msgid "Asia Pacific (Mumbai)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:29 +msgid "Asia Pacific (Osaka-Local)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:30 +msgid "Asia Pacific (Seoul)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:31 +msgid "Asia Pacific (Singapore)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:32 +msgid "Asia Pacific (Sydney)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:33 +msgid "Asia Pacific (Tokyo)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:34 +msgid "Canada (Central)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:35 +msgid "Europe (Frankfurt)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:36 +msgid "Europe (Ireland)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:37 +msgid "Europe (London)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:38 +msgid "Europe (Milan)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:39 +msgid "Europe (Paris)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:40 +msgid "Europe (Stockholm)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:41 +msgid "Middle East (Bahrain)" +msgstr "" + +#: xpack/plugins/cloud/providers/aws_international.py:42 +msgid "South America (São Paulo)" +msgstr "" + +#: xpack/plugins/cloud/providers/baiducloud.py:56 +#: xpack/plugins/cloud/providers/jdcloud.py:125 +msgid "CN North-Beijing" +msgstr "" + +#: xpack/plugins/cloud/providers/baiducloud.py:57 +#: xpack/plugins/cloud/providers/huaweicloud.py:47 +#: xpack/plugins/cloud/providers/jdcloud.py:128 +msgid "CN South-Guangzhou" +msgstr "" + +#: xpack/plugins/cloud/providers/baiducloud.py:58 +msgid "CN East-Suzhou" +msgstr "" + +#: xpack/plugins/cloud/providers/baiducloud.py:59 +#: xpack/plugins/cloud/providers/huaweicloud.py:54 +msgid "CN-Hong Kong" +msgstr "" + +#: xpack/plugins/cloud/providers/baiducloud.py:60 +msgid "CN Center-Wuhan" +msgstr "" + +#: xpack/plugins/cloud/providers/baiducloud.py:61 +msgid "CN North-Baoding" +msgstr "" + +#: xpack/plugins/cloud/providers/baiducloud.py:62 +#: xpack/plugins/cloud/providers/jdcloud.py:127 +msgid "CN East-Shanghai" +msgstr "" + +#: xpack/plugins/cloud/providers/baiducloud.py:63 +#: xpack/plugins/cloud/providers/huaweicloud.py:56 +msgid "AP-Singapore" +msgstr "" + +#: xpack/plugins/cloud/providers/gcp.py:64 +#: xpack/plugins/cloud/providers/huaweicloud.py:34 +msgid "Account unavailable" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:44 +msgid "CN North-Beijing1" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:45 +msgid "CN North-Beijing4" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:46 +msgid "CN North-Ulanqab1" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:48 +msgid "CN South-Shenzhen" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:49 +msgid "CN South-Guangzhou-InvitationOnly" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:50 +msgid "CN East-Shanghai2" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:51 +msgid "CN East-Shanghai1" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:53 +msgid "CN Southwest-Guiyang1" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:55 +msgid "AP-Bangkok" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:58 +msgid "AF-Johannesburg" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:59 +msgid "LA-Mexico City1" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:60 +msgid "LA-Santiago" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:61 +msgid "LA-Sao Paulo1" +msgstr "" + +#: xpack/plugins/cloud/providers/huaweicloud.py:63 +msgid "TR-Istanbul" +msgstr "" + +#: xpack/plugins/cloud/providers/jdcloud.py:126 +msgid "CN East-Suqian" +msgstr "" + #: xpack/plugins/cloud/providers/lan.py:79 #, python-format msgid "Port \"%(port)s\" of instance IP \"%(ip)s\" is not reachable" msgstr "" +#: xpack/plugins/cloud/serializers/account.py:94 +msgid "Validity display" +msgstr "" + +#: xpack/plugins/cloud/serializers/account.py:95 +msgid "Provider display" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:17 +msgid "Access key id" +msgstr "Access key id" + +#: xpack/plugins/cloud/serializers/account_attrs.py:41 +msgid "Tenant ID" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:44 +msgid "Subscription ID" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:98 +#: xpack/plugins/cloud/serializers/account_attrs.py:102 +#: xpack/plugins/cloud/serializers/account_attrs.py:126 +#: xpack/plugins/cloud/serializers/account_attrs.py:156 +#: xpack/plugins/cloud/serializers/account_attrs.py:206 +msgid "API Endpoint" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:108 +msgid "Auth url" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:109 +msgid "eg: http://openstack.example.com:5000/v3" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:112 +msgid "User domain" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:127 +msgid "Cert File" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:128 +msgid "Key File" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:144 +msgid "Service account key" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:145 +msgid "The file is in JSON format" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:163 +msgid "IP address invalid `{}`, {}" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:179 +msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:182 +msgid "" +"The port is used to detect the validity of the IP address. When the " +"synchronization task is executed, only the valid IP address will be " +"synchronized.
If the port is 0, all IP addresses are valid." +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:190 +msgid "Hostname prefix" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:193 +msgid "IP segment" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:197 +msgid "Test port" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:200 +msgid "Test timeout" +msgstr "" + +#: xpack/plugins/cloud/serializers/account_attrs.py:216 +msgid "Project" +msgstr "" + +#: xpack/plugins/cloud/serializers/task.py:154 +msgid "History count" +msgstr "" + +#: xpack/plugins/cloud/serializers/task.py:155 +msgid "Instance count" +msgstr "" + +#: xpack/plugins/cloud/tasks.py:41 +msgid "Period clean sync instance task execution" +msgstr "" + +#: xpack/plugins/interface/api.py:52 +msgid "Restore default successfully." +msgstr "" + +#: xpack/plugins/interface/meta.py:9 xpack/plugins/interface/models.py:45 +#: xpack/plugins/interface/models.py:86 +msgid "Interface settings" +msgstr "" + #: xpack/plugins/interface/models.py:23 msgid "Login title" msgstr "" @@ -9545,6 +9355,10 @@ msgstr "" msgid "Login image" msgstr "" +#: xpack/plugins/interface/models.py:31 +msgid "Website icon" +msgstr "" + #: xpack/plugins/interface/models.py:35 msgid "Index logo" msgstr "" @@ -9553,6 +9367,15 @@ msgstr "" msgid "Logout logo" msgstr "" +#: xpack/plugins/interface/models.py:41 +#: xpack/plugins/interface/serializers/interface.py:26 +msgid "Theme" +msgstr "" + +#: xpack/plugins/interface/models.py:42 +msgid "Footer content" +msgstr "" + #: xpack/plugins/interface/serializers/interface.py:37 msgid "Wide logo on top" msgstr "" @@ -9561,10 +9384,39 @@ msgstr "" msgid "Small logo without text" msgstr "" +#: xpack/plugins/license/api.py:52 +msgid "License import successfully" +msgstr "" + #: xpack/plugins/license/api.py:53 msgid "Invalid license" msgstr "" +#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:144 +msgid "License" +msgstr "" + +#: xpack/plugins/license/models.py:80 +msgid "Basic edition" +msgstr "" + +#: xpack/plugins/license/models.py:82 +msgid "Standard edition" +msgstr "" + +#: xpack/plugins/license/models.py:84 +msgid "Professional edition" +msgstr "" + +#: xpack/plugins/license/models.py:86 +msgid "Ultimate edition" +msgstr "" + +#, fuzzy +#~| msgid "Terminal setting" +#~ msgid "Interface setting" +#~ msgstr "Terminal" + #~ msgid "Public key auth" #~ msgstr "Public key auth" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 0a419a657..64bcc3781 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/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: 2024-05-22 18:28+0800\n" +"POT-Creation-Date: 2024-06-03 10:21+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,7 +45,6 @@ msgstr "成功: %s、失敗: %s、合計: %s" #: users/forms/profile.py:21 users/serializers/user.py:142 #: users/templates/users/_msg_user_created.html:13 #: users/templates/users/user_password_verify.html:18 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:28 #: xpack/plugins/cloud/serializers/account_attrs.py:28 msgid "Password" msgstr "パスワード" @@ -103,7 +102,7 @@ msgstr "集めました" msgid "Template" msgstr "テンプレート" -#: accounts/const/account.py:32 ops/const.py:46 +#: accounts/const/account.py:32 ops/const.py:46 xpack/plugins/cloud/const.py:68 msgid "Skip" msgstr "スキップ" @@ -113,10 +112,9 @@ msgid "Update" msgstr "更新" #: accounts/const/account.py:34 accounts/const/automation.py:109 -#: accounts/serializers/automations/change_secret.py:164 audits/const.py:62 +#: accounts/serializers/automations/change_secret.py:167 audits/const.py:62 #: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19 -#: ops/const.py:76 terminal/const.py:79 xpack.bak/plugins/cloud/const.py:47 -#: xpack/plugins/cloud/const.py:47 +#: ops/const.py:76 terminal/const.py:79 xpack/plugins/cloud/const.py:47 msgid "Failed" msgstr "失敗しました" @@ -229,7 +227,7 @@ msgid "SFTP" msgstr "SFTP" #: accounts/const/automation.py:110 -#: accounts/serializers/automations/change_secret.py:163 audits/const.py:61 +#: accounts/serializers/automations/change_secret.py:166 audits/const.py:61 #: audits/models.py:64 audits/signal_handlers/activity_log.py:33 #: common/const/choices.py:18 ops/const.py:74 ops/serializers/celery.py:48 #: terminal/const.py:78 terminal/models/session/sharing.py:121 @@ -274,8 +272,8 @@ msgstr "ユーザー %s がパスワードを閲覧/導き出しました" #: accounts/serializers/account/account.py:215 #: accounts/serializers/account/account.py:260 #: accounts/serializers/account/gathered_account.py:10 -#: accounts/serializers/automations/change_secret.py:108 -#: accounts/serializers/automations/change_secret.py:140 +#: accounts/serializers/automations/change_secret.py:111 +#: accounts/serializers/automations/change_secret.py:143 #: accounts/templates/accounts/asset_account_change_info.html:7 #: accounts/templates/accounts/change_secret_failed_info.html:11 #: acls/serializers/base.py:123 assets/models/asset/common.py:95 @@ -286,8 +284,7 @@ msgstr "ユーザー %s がパスワードを閲覧/導き出しました" #: terminal/serializers/command.py:17 terminal/serializers/session.py:28 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 -#: xpack.bak/plugins/cloud/models.py:252 xpack/plugins/cloud/models.py:252 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:268 msgid "Asset" msgstr "資産" @@ -315,18 +312,19 @@ msgid "Source ID" msgstr "ソース ID" #: accounts/models/account.py:61 -#: accounts/serializers/automations/change_secret.py:110 -#: accounts/serializers/automations/change_secret.py:141 +#: accounts/serializers/automations/change_secret.py:113 +#: accounts/serializers/automations/change_secret.py:144 #: accounts/templates/accounts/change_secret_failed_info.html:12 -#: acls/serializers/base.py:124 acls/templates/acls/asset_login_reminder.html:9 +#: acls/serializers/base.py:124 +#: acls/templates/acls/asset_login_reminder.html:10 #: assets/serializers/gateway.py:28 audits/models.py:59 #: authentication/api/connection_token.py:411 ops/models/base.py:18 #: perms/models/asset_permission.py:75 terminal/backends/command/models.py:18 #: terminal/models/session/session.py:34 terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 -#: tickets/models/ticket/command_confirm.py:13 -#: xpack.bak/plugins/cloud/models.py:85 xpack/plugins/cloud/models.py:85 +#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:99 +#: xpack/plugins/cloud/ws.py:38 msgid "Account" msgstr "アカウント" @@ -428,14 +426,14 @@ msgid "Trigger mode" msgstr "トリガーモード" #: accounts/models/automations/backup_account.py:134 audits/models.py:203 -#: terminal/models/session/sharing.py:125 xpack.bak/plugins/cloud/models.py:204 -#: xpack/plugins/cloud/manager.py:165 xpack/plugins/cloud/models.py:204 +#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/manager.py:158 +#: xpack/plugins/cloud/models.py:220 msgid "Reason" msgstr "理由" #: accounts/models/automations/backup_account.py:136 -#: accounts/serializers/automations/change_secret.py:107 -#: accounts/serializers/automations/change_secret.py:142 +#: accounts/serializers/automations/change_secret.py:110 +#: accounts/serializers/automations/change_secret.py:145 #: ops/serializers/job.py:74 terminal/serializers/session.py:52 msgid "Is success" msgstr "成功は" @@ -524,9 +522,8 @@ msgstr "終了日" #: terminal/serializers/applet.py:18 terminal/serializers/applet_host.py:136 #: terminal/serializers/virtualapp.py:35 tickets/models/ticket/general.py:281 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 -#: xpack.bak/plugins/cloud/models.py:200 xpack.bak/plugins/cloud/models.py:256 -#: xpack/plugins/cloud/models.py:200 xpack/plugins/cloud/models.py:256 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:216 +#: xpack/plugins/cloud/models.py:272 msgid "Status" msgstr "ステータス" @@ -565,7 +562,6 @@ msgstr "最終ログイン日" #: terminal/serializers/storage.py:136 users/forms/profile.py:31 #: users/forms/profile.py:114 users/models/user.py:898 #: users/templates/users/_msg_user_created.html:12 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:26 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Username" msgstr "ユーザー名" @@ -598,6 +594,7 @@ msgstr "トリガー方式" #: audits/models.py:92 audits/serializers.py:84 #: authentication/serializers/connect_token_secret.py:119 #: authentication/templates/authentication/_access_key_modal.html:34 +#: perms/serializers/permission.py:42 perms/serializers/permission.py:64 #: tickets/serializers/ticket/ticket.py:21 msgid "Action" msgstr "アクション" @@ -663,10 +660,8 @@ msgstr "パスワードルール" #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 #: users/models/preference.py:11 users/models/user.py:899 -#: xpack.bak/plugins/cloud/models.py:32 xpack.bak/plugins/cloud/models.py:272 -#: xpack.bak/plugins/cloud/serializers/task.py:70 -#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:272 -#: xpack/plugins/cloud/serializers/task.py:71 +#: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/serializers/task.py:74 msgid "Name" msgstr "名前" @@ -694,8 +689,7 @@ msgstr "プラットフォーム" msgid "Push params" msgstr "パラメータをプッシュする" -#: accounts/models/template.py:26 xpack.bak/plugins/cloud/models.py:329 -#: xpack/plugins/cloud/models.py:329 +#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:369 msgid "Account template" msgstr "アカウント テンプレート" @@ -848,14 +842,14 @@ msgstr "編集済み" #: accounts/serializers/account/account.py:273 #: accounts/serializers/automations/base.py:22 acls/models/base.py:97 -#: acls/templates/acls/asset_login_reminder.html:8 +#: acls/templates/acls/asset_login_reminder.html:9 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 #: authentication/api/connection_token.py:410 ops/models/base.py:17 #: ops/models/job.py:152 ops/serializers/job.py:19 #: perms/serializers/permission.py:36 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 -#: xpack/plugins/cloud/manager.py:73 +#: xpack/plugins/cloud/manager.py:83 msgid "Assets" msgstr "資産" @@ -869,7 +863,6 @@ msgid "Asset does not support this secret type: %s" msgstr "アセットはアカウント タイプをサポートしていません: %s" #: accounts/serializers/account/account.py:410 -#: xpack/plugins/cloud/serializers/account.py:111 msgid "Account has exist" msgstr "アカウントはすでに存在しています" @@ -881,7 +874,7 @@ msgid "ID" msgstr "ID" #: accounts/serializers/account/account.py:453 acls/serializers/base.py:116 -#: acls/templates/acls/asset_login_reminder.html:7 +#: acls/templates/acls/asset_login_reminder.html:8 #: acls/templates/acls/user_login_reminder.html:8 #: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:54 #: audits/models.py:90 audits/models.py:172 audits/models.py:269 @@ -996,8 +989,7 @@ msgstr "关联平台，可以配置推送参数，如果不关联，则使用默 #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:295 users/models/user.py:933 -#: xpack.bak/plugins/cloud/models.py:39 xpack.bak/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:106 +#: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:120 msgid "Comment" msgstr "コメント" @@ -1036,15 +1028,27 @@ msgstr "自動スナップショット" msgid "SSH Key strategy" msgstr "SSHキー戦略" -#: accounts/serializers/automations/change_secret.py:81 +#: accounts/serializers/automations/change_secret.py:57 +#, fuzzy +#| msgid "Please enter MFA code" +msgid "Please enter your account username" +msgstr "MFAコードを入力してください" + +#: accounts/serializers/automations/change_secret.py:62 +msgid "" +"Secret parameter settings, currently only effective for assets of the host " +"type." +msgstr "" + +#: accounts/serializers/automations/change_secret.py:84 msgid "* Please enter the correct password length" msgstr "* 正しいパスワードの長さを入力してください" -#: accounts/serializers/automations/change_secret.py:85 +#: accounts/serializers/automations/change_secret.py:88 msgid "* Password length range 6-30 bits" msgstr "* パスワードの長さの範囲6-30ビット" -#: accounts/serializers/automations/change_secret.py:114 +#: accounts/serializers/automations/change_secret.py:117 #: assets/models/automations/base.py:127 msgid "Automation task execution" msgstr "自動タスク実行履歴" @@ -1178,14 +1182,12 @@ msgid "Notify" msgstr "" #: acls/models/base.py:37 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:112 -#: xpack.bak/plugins/cloud/models.py:278 xpack/plugins/cloud/models.py:278 +#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:294 msgid "Priority" msgstr "優先順位" #: acls/models/base.py:38 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:113 -#: xpack.bak/plugins/cloud/models.py:279 xpack/plugins/cloud/models.py:279 +#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:295 msgid "1-100, the lower the value will be match first" msgstr "1-100、低い値は最初に一致します" @@ -1227,14 +1229,13 @@ msgid "Command" msgstr "コマンド" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack.bak/plugins/cloud/models.py:295 xpack/plugins/cloud/models.py:295 +#: xpack/plugins/cloud/models.py:335 msgid "Regex" msgstr "正規情報" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:184 settings/serializers/feature.py:19 -#: settings/serializers/msg.py:76 xpack.bak/plugins/license/models.py:30 -#: xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:76 xpack/plugins/license/models.py:30 msgid "Content" msgstr "コンテンツ" @@ -1334,8 +1335,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "いずれのレビューアも組織 '{}' に属していません" #: acls/serializers/rules/rules.py:20 -#: xpack.bak/plugins/cloud/serializers/task.py:145 -#: xpack/plugins/cloud/serializers/task.py:146 +#: xpack/plugins/cloud/serializers/task.py:149 msgid "IP address invalid: `{}`" msgstr "IPアドレスが無効: '{}'" @@ -1351,6 +1351,7 @@ msgstr "" #: authentication/templates/authentication/_msg_oauth_bind.html:12 #: authentication/templates/authentication/_msg_rest_password_success.html:8 #: authentication/templates/authentication/_msg_rest_public_key_success.html:8 +#: xpack/plugins/cloud/models.py:370 msgid "IP" msgstr "IP" @@ -1360,6 +1361,10 @@ msgstr "期間" #: acls/templates/acls/asset_login_reminder.html:3 #: acls/templates/acls/user_login_reminder.html:3 +#: authentication/templates/authentication/_msg_rest_password_success.html:2 +#: authentication/templates/authentication/_msg_rest_public_key_success.html:2 +#: perms/templates/perms/_msg_permed_items_expire.html:3 +#: users/templates/users/_msg_reset_mfa.html:4 msgid "Dear" msgstr "尊敬する" @@ -1373,7 +1378,7 @@ msgstr "以下の資産にユーザーが最近ログインしたことをお知 msgid "Asset details" msgstr "資産詳細" -#: acls/templates/acls/asset_login_reminder.html:12 +#: acls/templates/acls/asset_login_reminder.html:14 #: acls/templates/acls/user_login_reminder.html:15 msgid "" "Please review the login activity to ensure the security and proper usage of " @@ -1384,7 +1389,7 @@ msgstr "" "い。このログインを承認していない場合や、不審な活動に気付いた場合は、直ちに必" "要な措置を講じてください。" -#: acls/templates/acls/asset_login_reminder.html:14 +#: acls/templates/acls/asset_login_reminder.html:16 #: acls/templates/acls/user_login_reminder.html:16 msgid "Thank you for your attention to this matter" msgstr "この件についてのご注意をお願いいたします。" @@ -1487,7 +1492,6 @@ msgstr "{port} のポート {address} に接続できません" #: assets/automations/ping_gateway/manager.py:58 #: authentication/backends/oauth2/views.py:60 authentication/middleware.py:93 -#: xpack.bak/plugins/cloud/providers/fc.py:47 #: xpack/plugins/cloud/providers/fc.py:47 msgid "Authentication failed" msgstr "認証に失敗しました" @@ -1526,7 +1530,6 @@ msgstr "無効" #: assets/const/base.py:33 settings/serializers/basic.py:8 #: users/serializers/preference/koko.py:19 -#: users/serializers/preference/lina.py:46 #: users/serializers/preference/luna.py:77 msgid "Basic" msgstr "基本" @@ -1540,8 +1543,7 @@ msgstr "脚本" #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:76 #: settings/serializers/feature.py:49 settings/serializers/msg.py:31 #: terminal/models/component/endpoint.py:13 terminal/serializers/applet.py:17 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:72 -#: xpack/plugins/cloud/manager.py:73 +#: xpack/plugins/cloud/manager.py:83 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" msgstr "ホスト" @@ -1597,7 +1599,7 @@ msgstr "ファイアウォール" msgid "ChatGPT" msgstr "ChatGPT" -#: assets/const/host.py:12 rbac/tree.py:28 +#: assets/const/host.py:12 rbac/tree.py:28 xpack/plugins/cloud/const.py:69 msgid "Other" msgstr "その他" @@ -1754,7 +1756,6 @@ msgstr "クラウド サービス" #: assets/models/asset/common.py:94 assets/models/platform.py:16 #: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:77 #: settings/serializers/msg.py:32 terminal/serializers/storage.py:133 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:73 #: xpack/plugins/cloud/serializers/account_attrs.py:73 msgid "Port" msgstr "ポート" @@ -1767,8 +1768,7 @@ msgstr "アドレス" #: assets/models/asset/common.py:161 assets/models/platform.py:134 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 -#: perms/serializers/user_permission.py:25 -#: xpack.bak/plugins/cloud/models.py:325 xpack/plugins/cloud/models.py:325 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:365 msgid "Platform" msgstr "プラットフォーム" @@ -1827,8 +1827,7 @@ msgstr "プロキシー" #: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 #: assets/models/node.py:553 perms/models/asset_permission.py:72 -#: tickets/models/ticket/apply_asset.py:14 -#: xpack.bak/plugins/cloud/models.py:326 xpack/plugins/cloud/models.py:326 +#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:366 msgid "Node" msgstr "ノード" @@ -1846,8 +1845,8 @@ msgid "Asset automation task" msgstr "アセットの自動化タスク" #: assets/models/automations/base.py:114 assets/models/cmd_filter.py:41 -#: audits/models.py:267 common/db/models.py:34 ops/models/base.py:54 -#: ops/models/job.py:240 users/models/user.py:1156 +#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:240 +#: users/models/user.py:1156 msgid "Date created" msgstr "作成された日付" @@ -1972,7 +1971,6 @@ msgstr "必要" #: assets/models/platform.py:19 assets/serializers/platform.py:146 #: terminal/models/component/storage.py:28 -#: xpack.bak/plugins/cloud/providers/nutanix.py:30 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "デフォルト" @@ -2116,10 +2114,8 @@ msgstr "" #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:46 -#: perms/serializers/user_permission.py:74 -#: xpack.bak/plugins/cloud/models.py:328 -#: xpack.bak/plugins/cloud/serializers/task.py:33 -#: xpack/plugins/cloud/models.py:328 xpack/plugins/cloud/serializers/task.py:34 +#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:368 +#: xpack/plugins/cloud/serializers/task.py:34 msgid "Protocols" msgstr "プロトコル" @@ -2472,7 +2468,7 @@ msgstr "マップディレクトリ" #: audits/const.py:23 terminal/api/session/session.py:277 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 -#: xpack/plugins/cloud/manager.py:74 +#: xpack/plugins/cloud/manager.py:84 msgid "View" msgstr "表示" @@ -2531,7 +2527,7 @@ msgstr "ログインログ" #: audits/const.py:51 terminal/models/applet/host.py:144 #: terminal/models/component/task.py:22 -#: xpack/plugins/cloud/serializers/account.py:55 +#: xpack/plugins/cloud/serializers/account.py:78 msgid "Task" msgstr "タスク" @@ -2570,7 +2566,7 @@ msgstr "書類" #: audits/models.py:67 terminal/backends/command/models.py:21 #: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20 -#: terminal/models/session/sharing.py:95 +#: terminal/models/session/sharing.py:95 terminal/serializers/command.py:19 #: terminal/templates/terminal/_msg_command_alert.html:10 #: terminal/templates/terminal/_msg_command_warning.html:17 #: tickets/models/ticket/command_confirm.py:15 @@ -2653,6 +2649,12 @@ msgstr "ユーザーログインログ" msgid "Session key" msgstr "セッションID" +#: audits/models.py:267 +#, fuzzy +#| msgid "Login Date" +msgid "Login date" +msgstr "日付ログイン" + #: audits/models.py:298 msgid "User session" msgstr "ユーザーセッション" @@ -3320,8 +3322,7 @@ msgid "Component" msgstr "コンポーネント" #: authentication/serializers/connect_token_secret.py:136 -#: perms/serializers/user_permission.py:28 -#: xpack.bak/plugins/cloud/models.py:327 xpack/plugins/cloud/models.py:327 +#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:367 msgid "Domain" msgstr "ドメイン" @@ -3353,8 +3354,7 @@ msgid "Ticket info" msgstr "作業指示情報" #: authentication/serializers/connection_token.py:21 -#: perms/models/asset_permission.py:77 perms/serializers/permission.py:42 -#: perms/serializers/permission.py:64 +#: perms/models/asset_permission.py:77 #: tickets/models/ticket/apply_application.py:28 #: tickets/models/ticket/apply_asset.py:18 msgid "Actions" @@ -3407,8 +3407,9 @@ msgid "Disable" msgstr "無効化" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/const.py:43 users/templates/users/mfa_setting.html:26 -#: users/templates/users/mfa_setting.html:68 +#: users/const.py:43 users/templates/users/mfa_setting.html:120 +#: users/templates/users/mfa_setting.html:158 +#: users/templates/users/mfa_setting.html:177 msgid "Enable" msgstr "有効化" @@ -3443,15 +3444,11 @@ msgstr "コードエラー" #: authentication/templates/authentication/_msg_oauth_bind.html:3 #: authentication/templates/authentication/_msg_reset_password.html:3 #: authentication/templates/authentication/_msg_reset_password_code.html:9 -#: authentication/templates/authentication/_msg_rest_password_success.html:2 -#: authentication/templates/authentication/_msg_rest_public_key_success.html:2 #: jumpserver/conf.py:465 #: 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:32 #: users/templates/users/_msg_account_expire_reminder.html:4 #: users/templates/users/_msg_password_expire_reminder.html:4 -#: users/templates/users/_msg_reset_mfa.html:4 #: users/templates/users/_msg_reset_ssh_key.html:4 msgid "Hello" msgstr "こんにちは" @@ -3614,7 +3611,7 @@ msgid "Do you want to retry ?" msgstr "再試行しますか？" #: authentication/utils.py:24 common/utils/ip/geoip/utils.py:24 -#: xpack.bak/plugins/cloud/const.py:33 xpack/plugins/cloud/const.py:33 +#: xpack/plugins/cloud/const.py:33 msgid "LAN" msgstr "ローカルエリアネットワーク" @@ -3796,7 +3793,7 @@ msgstr "ランニング" msgid "Canceled" msgstr "キャンセル" -#: common/const/common.py:5 xpack/plugins/cloud/manager.py:380 +#: common/const/common.py:5 xpack/plugins/cloud/manager.py:408 #, python-format msgid "%(name)s was created successfully" msgstr "%(name)s が正常に作成されました" @@ -3858,9 +3855,6 @@ msgstr "無効なID、リストでなければなりません" #: common/db/fields.py:594 common/db/fields.py:599 #: common/serializers/fields.py:133 tickets/serializers/ticket/common.py:58 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:56 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:79 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:150 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 #: xpack/plugins/cloud/serializers/account_attrs.py:150 @@ -3919,7 +3913,7 @@ msgstr "" "{} - 暗号化パスワードが設定されていません-個人情報->ファイル暗号化パスワード" "に暗号化パスワードを設定してください" -#: common/exceptions.py:15 +#: common/exceptions.py:15 xpack/plugins/cloud/ws.py:38 #, python-format msgid "%s object does not exist." msgstr "%s オブジェクトは存在しません。" @@ -3997,8 +3991,7 @@ msgstr "アリ雲" msgid "Tencent cloud" msgstr "テンセント雲" -#: common/sdk/sms/endpoint.py:18 xpack.bak/plugins/cloud/const.py:13 -#: xpack/plugins/cloud/const.py:13 +#: common/sdk/sms/endpoint.py:18 xpack/plugins/cloud/const.py:13 msgid "Huawei Cloud" msgstr "華為雲" @@ -4468,12 +4461,12 @@ msgid "Date last run" msgstr "最終実行日" #: ops/models/base.py:51 ops/models/job.py:237 -#: xpack.bak/plugins/cloud/models.py:198 xpack/plugins/cloud/models.py:198 +#: xpack/plugins/cloud/models.py:214 msgid "Result" msgstr "結果" #: ops/models/base.py:52 ops/models/job.py:238 -#: xpack/plugins/cloud/manager.py:77 +#: xpack/plugins/cloud/manager.py:87 msgid "Summary" msgstr "概要" @@ -4494,7 +4487,7 @@ msgid "Kwargs" msgstr "クワーグ" #: ops/models/celery.py:84 terminal/models/session/sharing.py:128 -#: tickets/const.py:25 +#: tickets/const.py:25 xpack/plugins/cloud/const.py:67 msgid "Finished" msgstr "終了" @@ -5074,7 +5067,7 @@ msgstr "システム設定" msgid "Session audits" msgstr "セッション監査" -#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:74 +#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:84 msgid "Cloud import" msgstr "クラウドインポート" @@ -5504,13 +5497,11 @@ msgid "Service provider" msgstr "サービスプロバイダー" #: settings/serializers/auth/oauth2.py:30 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:35 #: xpack/plugins/cloud/serializers/account_attrs.py:35 msgid "Client ID" msgstr "クライアントID" #: settings/serializers/auth/oauth2.py:33 settings/serializers/auth/oidc.py:23 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:38 #: xpack/plugins/cloud/serializers/account_attrs.py:38 msgid "Client Secret" msgstr "クライアント秘密" @@ -5717,8 +5708,7 @@ msgstr "" msgid "Enable Short Message Service (SMS)" msgstr "" -#: settings/serializers/auth/sms.py:21 xpack.bak/plugins/cloud/models.py:34 -#: xpack/plugins/cloud/models.py:34 +#: settings/serializers/auth/sms.py:21 xpack/plugins/cloud/models.py:35 msgid "Provider" msgstr "プロバイダー" @@ -5812,7 +5802,6 @@ msgid "SSO auth key TTL" msgstr "Token有効期間" #: settings/serializers/auth/sso.py:20 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Unit: second" msgstr "単位: 秒" @@ -6042,6 +6031,12 @@ msgstr "コマンドフィルタリング" msgid "Virtual app" msgstr "仮想アプリケーション" +#: settings/serializers/feature.py:148 +#, fuzzy +#| msgid "Virtual App" +msgid "Virtual App" +msgstr "仮想アプリケーション" + #: settings/serializers/feature.py:150 msgid "" "Virtual applications, you can use the Linux operating system as an " @@ -6256,6 +6251,7 @@ msgstr "" "ての認証方法を特定の順序で認証します。 、直接ログインできます" #: settings/serializers/security.py:116 +#: users/templates/users/mfa_setting.html:160 msgid "Not enabled" msgstr "有効化されていません" @@ -6454,7 +6450,6 @@ msgstr "" #: settings/serializers/terminal.py:34 users/forms/profile.py:172 #: users/models/user.py:931 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:210 #: xpack/plugins/cloud/serializers/account_attrs.py:210 msgid "Public key" msgstr "公開キー" @@ -6499,6 +6494,20 @@ msgid "" "Luna page will display the SSH client launch method when connecting to assets" msgstr "" +#: settings/serializers/tool.py:10 +msgid "Tool" +msgstr "" + +#: settings/serializers/tool.py:13 +msgid "Tools in the Workbench" +msgstr "" + +#: settings/serializers/tool.py:15 +msgid "" +"*! If enabled, users with RBAC permissions will be able to utilize all tools " +"in the workbench" +msgstr "" + #: settings/tasks/ldap.py:28 msgid "Periodic import ldap user" msgstr "LDAP ユーザーを定期的にインポートする" @@ -6638,6 +6647,7 @@ msgid "Export" msgstr "エクスポート" #: templates/_csv_import_export.html:13 templates/_csv_import_modal.html:5 +#: xpack/plugins/cloud/const.py:65 msgid "Import" msgstr "インポート" @@ -6772,15 +6782,16 @@ msgstr "" " " #: templates/_mfa_login_field.html:28 -msgid "Send verification code" -msgstr "確認コードを送信" +#: users/templates/users/forgot_password.html:101 +msgid "Send" +msgstr "送信" -#: templates/_mfa_login_field.html:107 +#: templates/_mfa_login_field.html:106 #: users/templates/users/forgot_password.html:176 msgid "Wait: " msgstr "待つ:" -#: templates/_mfa_login_field.html:117 +#: templates/_mfa_login_field.html:116 #: users/templates/users/forgot_password.html:192 msgid "The verification code has been sent" msgstr "確認コードが送信されました" @@ -7034,8 +7045,7 @@ msgstr "一括作成非サポート" msgid "Storage is invalid" msgstr "ストレージが無効です" -#: terminal/models/applet/applet.py:30 xpack.bak/plugins/license/models.py:88 -#: xpack/plugins/license/models.py:88 +#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88 msgid "Community edition" msgstr "コミュニティ版" @@ -7371,6 +7381,8 @@ msgid "Command and replay storage" msgstr "コマンド及び録画記憶" #: terminal/notifications.py:240 terminal/tasks.py:153 +#: xpack/plugins/cloud/serializers/account.py:115 +#: xpack/plugins/cloud/serializers/account.py:117 msgid "Test failure: Account invalid" msgstr "テスト失敗: アカウントが無効" @@ -7503,10 +7515,6 @@ msgstr "ホスト ID" msgid "Applet ID" msgstr "リモートアプリケーション ID" -#: terminal/serializers/command.py:19 -msgid "Session ID" -msgstr "セッションID" - #: terminal/serializers/command.py:41 msgid "Command Filter ACL" msgstr "コマンドフィルター" @@ -7619,13 +7627,12 @@ msgid "Access key ID" msgstr "アクセスキー" #: terminal/serializers/storage.py:37 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:20 #: xpack/plugins/cloud/serializers/account_attrs.py:20 msgid "Access key secret" msgstr "アクセスキーシークレット" -#: terminal/serializers/storage.py:68 xpack.bak/plugins/cloud/models.py:249 -#: xpack/plugins/cloud/manager.py:90 xpack/plugins/cloud/models.py:249 +#: terminal/serializers/storage.py:68 xpack/plugins/cloud/manager.py:100 +#: xpack/plugins/cloud/models.py:265 msgid "Region" msgstr "リージョン" @@ -7646,7 +7653,6 @@ msgid "HOST" msgstr "ホスト" #: terminal/serializers/storage.py:146 users/models/user.py:928 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:213 #: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "ssh秘密鍵" @@ -8432,7 +8438,7 @@ msgstr "更新パスワードが必要" #: users/models/user.py:979 msgid "Date api key used" -msgstr "Api key 最後に使用した日付" +msgstr "API key 最後に使用した日付" #: users/models/user.py:1104 msgid "Can not delete admin user" @@ -8503,8 +8509,8 @@ msgstr "ターミナルテーマ名" #: users/serializers/preference/lina.py:11 msgid "" -"The password for file encryption, used for decryption when the system sends " -"emails containing file attachments.
Such as: account backup files, " +"*! The password for file encryption, used for decryption when the system " +"sends emails containing file attachments.
Such as: account backup files, " "account password change results files" msgstr "" @@ -8512,6 +8518,12 @@ msgstr "" msgid "The newly set password is inconsistent" msgstr "新しく設定されたパスワードが一致しない" +#: users/serializers/preference/lina.py:46 +#, fuzzy +#| msgid "New file encryption password" +msgid "File Encryption" +msgstr "新しいファイルの暗号化パスワード" + #: users/serializers/preference/luna.py:26 msgid "Async loading of asset tree" msgstr "非同期ロード資産ツリー" @@ -8842,10 +8854,6 @@ msgstr "メールアドレス" msgid "Mobile number" msgstr "携帯番号" -#: users/templates/users/forgot_password.html:101 -msgid "Send" -msgstr "送信" - #: users/templates/users/forgot_password.html:105 #: users/templates/users/forgot_password_previewing.html:30 msgid "Submit" @@ -8855,19 +8863,15 @@ msgstr "送信" msgid "Please enter the username for which you want to retrieve the password" msgstr "パスワードを取り戻す必要があるユーザー名を入力してください" -#: users/templates/users/mfa_setting.html:24 -msgid "Enable MFA" -msgstr "MFAの有効化" - -#: users/templates/users/mfa_setting.html:30 +#: users/templates/users/mfa_setting.html:124 msgid "MFA force enable, cannot disable" msgstr "MFA強制有効化、無効化できません" -#: users/templates/users/mfa_setting.html:48 +#: users/templates/users/mfa_setting.html:143 msgid "MFA setting" msgstr "MFAの設定" -#: users/templates/users/mfa_setting.html:61 +#: users/templates/users/mfa_setting.html:171 msgid "Reset" msgstr "リセット" @@ -9029,629 +9033,648 @@ msgstr "* 新しいパスワードを最後の {} パスワードにすること msgid "Reset password success, return to login page" msgstr "パスワードの成功をリセットし、ログインページに戻る" -#: xpack.bak/apps.py:8 xpack/apps.py:8 +#: xpack/apps.py:8 msgid "XPACK" msgstr "XPack" -#: xpack.bak/exceptions.py:7 +#: xpack/exceptions.py:8 msgid "" -"The current task is not synchronized with unmatched policy assets, skipping" -msgstr "" +"Based on the current task configuration, assets that do not match the " +"strategy will skipped." +msgstr "現在のタスク構成に基づいて、未一致ポリシーの資産はスキップされます" -#: xpack.bak/plugins/cloud/api.py:60 xpack/plugins/cloud/api.py:60 +#: xpack/plugins/cloud/api.py:65 msgid "Test connection successful" msgstr "テスト接続成功" -#: xpack.bak/plugins/cloud/api.py:62 xpack/plugins/cloud/api.py:62 +#: xpack/plugins/cloud/api.py:67 msgid "Test connection failed: {}" msgstr "テスト接続に失敗しました: {}" -#: xpack.bak/plugins/cloud/const.py:8 xpack/plugins/cloud/const.py:8 +#: xpack/plugins/cloud/const.py:8 msgid "Alibaba Cloud" msgstr "アリ雲" -#: xpack.bak/plugins/cloud/const.py:9 xpack/plugins/cloud/const.py:9 +#: xpack/plugins/cloud/const.py:9 msgid "AWS (International)" msgstr "AWS (国際)" -#: xpack.bak/plugins/cloud/const.py:10 xpack/plugins/cloud/const.py:10 +#: xpack/plugins/cloud/const.py:10 msgid "AWS (China)" msgstr "AWS (中国)" -#: xpack.bak/plugins/cloud/const.py:11 xpack/plugins/cloud/const.py:11 +#: xpack/plugins/cloud/const.py:11 msgid "Azure (China)" msgstr "Azure (中国)" -#: xpack.bak/plugins/cloud/const.py:12 xpack/plugins/cloud/const.py:12 +#: xpack/plugins/cloud/const.py:12 msgid "Azure (International)" msgstr "Azure (国際)" -#: xpack.bak/plugins/cloud/const.py:14 xpack/plugins/cloud/const.py:14 +#: xpack/plugins/cloud/const.py:14 msgid "Baidu Cloud" msgstr "百度雲" -#: xpack.bak/plugins/cloud/const.py:15 xpack/plugins/cloud/const.py:15 +#: xpack/plugins/cloud/const.py:15 msgid "JD Cloud" msgstr "京東雲" -#: xpack.bak/plugins/cloud/const.py:16 xpack/plugins/cloud/const.py:16 +#: xpack/plugins/cloud/const.py:16 msgid "KingSoft Cloud" msgstr "金山雲" -#: xpack.bak/plugins/cloud/const.py:17 xpack/plugins/cloud/const.py:17 +#: xpack/plugins/cloud/const.py:17 msgid "Tencent Cloud" msgstr "テンセント雲" -#: xpack.bak/plugins/cloud/const.py:18 xpack/plugins/cloud/const.py:18 +#: xpack/plugins/cloud/const.py:18 msgid "Tencent Cloud (Lighthouse)" msgstr "テンセント雲(軽量アプリケーション)" -#: xpack.bak/plugins/cloud/const.py:19 xpack/plugins/cloud/const.py:19 +#: xpack/plugins/cloud/const.py:19 msgid "Google Cloud Platform" msgstr "谷歌雲" -#: xpack.bak/plugins/cloud/const.py:20 xpack/plugins/cloud/const.py:20 +#: xpack/plugins/cloud/const.py:20 msgid "UCloud" msgstr "ucloud" -#: xpack.bak/plugins/cloud/const.py:21 xpack/plugins/cloud/const.py:21 +#: xpack/plugins/cloud/const.py:21 msgid "Volcengine" msgstr "Volcengine" -#: xpack.bak/plugins/cloud/const.py:23 xpack/plugins/cloud/const.py:23 +#: xpack/plugins/cloud/const.py:23 msgid "VMware" msgstr "VMware" -#: xpack.bak/plugins/cloud/const.py:24 -#: xpack.bak/plugins/cloud/providers/nutanix.py:15 #: xpack/plugins/cloud/const.py:24 xpack/plugins/cloud/providers/nutanix.py:15 msgid "Nutanix" msgstr "Nutanix" -#: xpack.bak/plugins/cloud/const.py:25 xpack/plugins/cloud/const.py:25 +#: xpack/plugins/cloud/const.py:25 msgid "Huawei Private Cloud" msgstr "華為私有雲" -#: xpack.bak/plugins/cloud/const.py:26 xpack/plugins/cloud/const.py:26 +#: xpack/plugins/cloud/const.py:26 msgid "Qingyun Private Cloud" msgstr "青雲私有雲" -#: xpack.bak/plugins/cloud/const.py:27 xpack/plugins/cloud/const.py:27 +#: xpack/plugins/cloud/const.py:27 msgid "CTYun Private Cloud" msgstr "スカイウィング私有雲" -#: xpack.bak/plugins/cloud/const.py:28 xpack/plugins/cloud/const.py:28 +#: xpack/plugins/cloud/const.py:28 msgid "OpenStack" msgstr "OpenStack" -#: xpack.bak/plugins/cloud/const.py:29 -#: xpack.bak/plugins/cloud/providers/zstack.py:21 #: xpack/plugins/cloud/const.py:29 xpack/plugins/cloud/providers/zstack.py:21 msgid "ZStack" msgstr "ZStack" -#: xpack.bak/plugins/cloud/const.py:30 xpack/plugins/cloud/const.py:30 +#: xpack/plugins/cloud/const.py:30 msgid "Fusion Compute" msgstr "融合計算" -#: xpack.bak/plugins/cloud/const.py:31 xpack/plugins/cloud/const.py:31 +#: xpack/plugins/cloud/const.py:31 msgid "SCP" msgstr "SCP" -#: xpack.bak/plugins/cloud/const.py:32 xpack/plugins/cloud/const.py:32 +#: xpack/plugins/cloud/const.py:32 msgid "Apsara Stack" msgstr "Apsara Stack" -#: xpack.bak/plugins/cloud/const.py:37 xpack/plugins/cloud/const.py:37 +#: xpack/plugins/cloud/const.py:37 msgid "Private IP" msgstr "プライベートIP" -#: xpack.bak/plugins/cloud/const.py:38 xpack/plugins/cloud/const.py:38 +#: xpack/plugins/cloud/const.py:38 msgid "Public IP" msgstr "パブリックIP" -#: xpack.bak/plugins/cloud/const.py:42 xpack.bak/plugins/cloud/models.py:299 -#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:299 +#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:339 msgid "Instance name" msgstr "インスタンス名" -#: xpack.bak/plugins/cloud/const.py:43 xpack/plugins/cloud/const.py:43 +#: xpack/plugins/cloud/const.py:43 msgid "Instance name and Partial IP" msgstr "インスタンス名と部分IP" -#: xpack.bak/plugins/cloud/const.py:48 xpack/plugins/cloud/const.py:48 +#: xpack/plugins/cloud/const.py:48 msgid "Succeed" msgstr "成功" -#: xpack.bak/plugins/cloud/const.py:52 xpack/plugins/cloud/const.py:52 -#: xpack/plugins/cloud/manager.py:80 +#: xpack/plugins/cloud/const.py:52 xpack/plugins/cloud/manager.py:90 msgid "Unsync" msgstr "同期していません" -#: xpack.bak/plugins/cloud/const.py:53 xpack/plugins/cloud/const.py:53 -#: xpack/plugins/cloud/manager.py:79 +#: xpack/plugins/cloud/const.py:53 xpack/plugins/cloud/manager.py:89 msgid "New Sync" msgstr "新しい同期" -#: xpack.bak/plugins/cloud/const.py:54 xpack/plugins/cloud/const.py:54 -#: xpack/plugins/cloud/manager.py:79 +#: xpack/plugins/cloud/const.py:54 xpack/plugins/cloud/manager.py:89 msgid "Synced" msgstr "同期済み" -#: xpack.bak/plugins/cloud/const.py:55 xpack/plugins/cloud/const.py:55 -#: xpack/plugins/cloud/manager.py:80 +#: xpack/plugins/cloud/const.py:55 xpack/plugins/cloud/manager.py:90 msgid "Released" msgstr "リリース済み" -#: xpack.bak/plugins/cloud/const.py:59 xpack/plugins/cloud/const.py:59 +#: xpack/plugins/cloud/const.py:59 msgid "And" msgstr "そして" -#: xpack.bak/plugins/cloud/const.py:60 xpack/plugins/cloud/const.py:60 +#: xpack/plugins/cloud/const.py:60 msgid "Or" msgstr "または" -#: xpack.bak/plugins/cloud/manager.py:55 -#: xpack.bak/plugins/cloud/providers/gcp.py:64 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:34 -#: xpack/plugins/cloud/manager.py:45 xpack/plugins/cloud/manager.py:55 -#: xpack/plugins/cloud/manager.py:57 xpack/plugins/cloud/providers/gcp.py:64 -#: xpack/plugins/cloud/providers/huaweicloud.py:34 -msgid "Account unavailable" -msgstr "利用できないアカウント" +#: xpack/plugins/cloud/const.py:64 +#, fuzzy +#| msgid "Synced Organization" +msgid "Sync region" +msgstr "組織が同期されました" -#: xpack.bak/plugins/cloud/meta.py:9 xpack/plugins/cloud/meta.py:9 +#: xpack/plugins/cloud/const.py:66 +#, fuzzy +#| msgid "Import" +msgid "Imported" +msgstr "インポート" + +#: xpack/plugins/cloud/manager.py:47 +#, python-format +msgid "Task \"%s\" starts executing" +msgstr "タスク \"%s\" の実行開始" + +#: xpack/plugins/cloud/manager.py:81 +msgid "View the task details path: " +msgstr "タスク詳細パスの表示: " + +#: xpack/plugins/cloud/manager.py:84 +msgid "Account Details" +msgstr "アカウントの詳細" + +#: xpack/plugins/cloud/manager.py:85 +msgid "Synchronization History List" +msgstr "履歴リストの同期" + +#: xpack/plugins/cloud/manager.py:85 +msgid "Synchronization Instance List" +msgstr "インスタンスリストの同期" + +#: xpack/plugins/cloud/manager.py:93 +msgid "Task execution completed" +msgstr "タスク実行完了" + +#: xpack/plugins/cloud/manager.py:97 +msgid "Synchronization regions" +msgstr "同期地域" + +#: xpack/plugins/cloud/manager.py:115 +#, python-format +msgid "Get instances of region \"%s\" error, error: %s" +msgstr "地域 \"%s\" のインスタンスを取得できませんでした、エラー：%s" + +#: xpack/plugins/cloud/manager.py:157 +#, python-format +msgid "Failed to synchronize the instance \"%s\"" +msgstr "インスタンス \"%s\" の同期に失敗しました" + +#: xpack/plugins/cloud/manager.py:333 +#, python-format +msgid "" +"The updated platform of asset \"%s\" is inconsistent with the original " +"platform type. Skip platform and protocol updates" +msgstr "" +"更新された資産 \"%s\" のプラットフォームタイプと元のタイプは一致しません。プ" +"ラットフォームとプロトコルの更新をスキップ" + +#: xpack/plugins/cloud/manager.py:389 +#, python-format +msgid "The asset \"%s\" already exists" +msgstr "資産 \"%s\" はすでに存在します" + +#: xpack/plugins/cloud/manager.py:391 +#, python-format +msgid "Update asset \"%s\"" +msgstr "資産の更新 \"%s\"" + +#: xpack/plugins/cloud/manager.py:394 +#, python-format +msgid "Asset \"%s\" has been updated" +msgstr "資産 \"%s\" が更新されました" + +#: xpack/plugins/cloud/manager.py:404 +#, python-format +msgid "Prepare to create asset \"%s\"" +msgstr "資産 \"%s\" の作成準備" + +#: xpack/plugins/cloud/manager.py:425 +#, python-format +msgid "Set nodes \"%s\"" +msgstr "ノード \"%s\" の設定" + +#: xpack/plugins/cloud/manager.py:451 +#, python-format +msgid "Set accounts \"%s\"" +msgstr "アカウント \"%s\" の設定" + +#: xpack/plugins/cloud/manager.py:467 +#, python-format +msgid "Set protocols \"%s\"" +msgstr "プロトコル \"%s\" の設定" + +#: xpack/plugins/cloud/manager.py:481 xpack/plugins/cloud/tasks.py:27 +msgid "Run sync instance task" +msgstr "同期インスタンス タスクを実行する" + +#: xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "クラウドセンター" -#: xpack.bak/plugins/cloud/models.py:37 -#: xpack.bak/plugins/cloud/serializers/account.py:68 -#: xpack/plugins/cloud/models.py:37 -#: xpack/plugins/cloud/serializers/account.py:69 +#: xpack/plugins/cloud/models.py:38 +#: xpack/plugins/cloud/serializers/account.py:93 msgid "Attrs" msgstr "ツールバーの" -#: xpack.bak/plugins/cloud/models.py:38 xpack/plugins/cloud/models.py:38 +#: xpack/plugins/cloud/models.py:39 msgid "Validity" msgstr "有効性" -#: xpack.bak/plugins/cloud/models.py:43 xpack/plugins/cloud/models.py:43 +#: xpack/plugins/cloud/models.py:44 msgid "Cloud account" msgstr "クラウドアカウント" -#: xpack.bak/plugins/cloud/models.py:45 xpack/plugins/cloud/models.py:45 +#: xpack/plugins/cloud/models.py:46 msgid "Test cloud account" msgstr "クラウドアカウントのテスト" -#: xpack.bak/plugins/cloud/models.py:88 -#: xpack.bak/plugins/cloud/serializers/task.py:159 -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:160 +#: xpack/plugins/cloud/models.py:102 +#: xpack/plugins/cloud/serializers/account.py:77 +#: xpack/plugins/cloud/serializers/task.py:156 msgid "Regions" msgstr "リージョン" -#: xpack.bak/plugins/cloud/models.py:91 xpack/plugins/cloud/models.py:91 +#: xpack/plugins/cloud/models.py:105 msgid "Hostname strategy" msgstr "ホスト名戦略" -#: xpack.bak/plugins/cloud/models.py:96 -#: xpack.bak/plugins/cloud/serializers/task.py:162 -#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:163 +#: xpack/plugins/cloud/models.py:110 msgid "IP network segment group" msgstr "IPネットワークセグメントグループ" -#: xpack.bak/plugins/cloud/models.py:99 -#: xpack.bak/plugins/cloud/serializers/task.py:167 -#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:168 +#: xpack/plugins/cloud/models.py:113 +#: xpack/plugins/cloud/serializers/task.py:159 msgid "Sync IP type" msgstr "同期IPタイプ" -#: xpack.bak/plugins/cloud/models.py:102 -#: xpack.bak/plugins/cloud/serializers/task.py:185 -#: xpack/plugins/cloud/models.py:102 -#: xpack/plugins/cloud/serializers/task.py:186 +#: xpack/plugins/cloud/models.py:116 msgid "Always update" msgstr "常に更新" -#: xpack.bak/plugins/cloud/models.py:104 xpack/plugins/cloud/models.py:104 +#: xpack/plugins/cloud/models.py:118 msgid "Fully synchronous" msgstr "完全同期" -#: xpack.bak/plugins/cloud/models.py:109 xpack/plugins/cloud/models.py:109 +#: xpack/plugins/cloud/models.py:123 msgid "Date last sync" msgstr "最終同期日" -#: xpack.bak/plugins/cloud/models.py:112 xpack.bak/plugins/cloud/models.py:317 -#: xpack.bak/plugins/cloud/models.py:341 xpack/plugins/cloud/models.py:112 -#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/models.py:341 +#: xpack/plugins/cloud/models.py:126 xpack/plugins/cloud/models.py:357 +#: xpack/plugins/cloud/models.py:383 msgid "Strategy" msgstr "戦略" -#: xpack.bak/plugins/cloud/models.py:117 xpack.bak/plugins/cloud/models.py:196 -#: xpack/plugins/cloud/models.py:117 xpack/plugins/cloud/models.py:196 +#: xpack/plugins/cloud/models.py:131 xpack/plugins/cloud/models.py:212 msgid "Sync instance task" msgstr "インスタンスの同期タスク" -#: xpack.bak/plugins/cloud/models.py:207 xpack.bak/plugins/cloud/models.py:259 -#: xpack/plugins/cloud/models.py:207 xpack/plugins/cloud/models.py:259 +#: xpack/plugins/cloud/models.py:223 xpack/plugins/cloud/models.py:275 msgid "Date sync" msgstr "日付の同期" -#: xpack.bak/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:211 +#: xpack/plugins/cloud/models.py:227 msgid "Sync instance snapshot" msgstr "インスタンススナップショットの同期" -#: xpack.bak/plugins/cloud/models.py:215 xpack/plugins/cloud/models.py:215 +#: xpack/plugins/cloud/models.py:231 msgid "Sync instance task execution" msgstr "インスタンスタスクの同期実行" -#: xpack.bak/plugins/cloud/models.py:239 xpack/plugins/cloud/models.py:239 +#: xpack/plugins/cloud/models.py:255 msgid "Sync task" msgstr "同期タスク" -#: xpack.bak/plugins/cloud/models.py:243 xpack/plugins/cloud/models.py:243 +#: xpack/plugins/cloud/models.py:259 msgid "Sync instance task history" msgstr "インスタンスタスク履歴の同期" -#: xpack.bak/plugins/cloud/models.py:246 xpack/plugins/cloud/models.py:246 +#: xpack/plugins/cloud/models.py:262 msgid "Instance" msgstr "インスタンス" -#: xpack.bak/plugins/cloud/models.py:263 xpack/plugins/cloud/models.py:263 +#: xpack/plugins/cloud/models.py:279 msgid "Sync instance detail" msgstr "同期インスタンスの詳細" -#: xpack.bak/plugins/cloud/models.py:275 -#: xpack.bak/plugins/cloud/serializers/task.py:72 -#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/serializers/task.py:73 +#: xpack/plugins/cloud/models.py:291 xpack/plugins/cloud/serializers/task.py:76 msgid "Rule relation" msgstr "条件関係" -#: xpack.bak/plugins/cloud/models.py:284 xpack/plugins/cloud/models.py:284 +#: xpack/plugins/cloud/models.py:301 msgid "Task strategy" msgstr "ミッション戦略です" -#: xpack.bak/plugins/cloud/models.py:288 xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/models.py:328 msgid "Equal" msgstr "等しい" -#: xpack.bak/plugins/cloud/models.py:289 xpack/plugins/cloud/models.py:289 +#: xpack/plugins/cloud/models.py:329 msgid "Not Equal" msgstr "不等于" -#: xpack.bak/plugins/cloud/models.py:290 xpack/plugins/cloud/models.py:290 +#: xpack/plugins/cloud/models.py:330 msgid "In" msgstr "で..." -#: xpack.bak/plugins/cloud/models.py:291 xpack/plugins/cloud/models.py:291 +#: xpack/plugins/cloud/models.py:331 msgid "Contains" msgstr "含む" -#: xpack.bak/plugins/cloud/models.py:292 xpack/plugins/cloud/models.py:292 +#: xpack/plugins/cloud/models.py:332 msgid "Exclude" msgstr "除外" -#: xpack.bak/plugins/cloud/models.py:293 xpack/plugins/cloud/models.py:293 +#: xpack/plugins/cloud/models.py:333 msgid "Startswith" msgstr "始まる..." -#: xpack.bak/plugins/cloud/models.py:294 xpack/plugins/cloud/models.py:294 +#: xpack/plugins/cloud/models.py:334 msgid "Endswith" msgstr "終わる..." -#: xpack.bak/plugins/cloud/models.py:300 xpack/plugins/cloud/models.py:300 +#: xpack/plugins/cloud/models.py:340 msgid "Instance platform" msgstr "インスタンス名" -#: xpack.bak/plugins/cloud/models.py:301 xpack/plugins/cloud/models.py:301 +#: xpack/plugins/cloud/models.py:341 msgid "Instance address" msgstr "インスタンスアドレス" -#: xpack.bak/plugins/cloud/models.py:308 xpack/plugins/cloud/models.py:308 +#: xpack/plugins/cloud/models.py:348 msgid "Rule attr" msgstr "ルール属性" -#: xpack.bak/plugins/cloud/models.py:312 xpack/plugins/cloud/models.py:312 +#: xpack/plugins/cloud/models.py:352 msgid "Rule match" msgstr "ルール一致" -#: xpack.bak/plugins/cloud/models.py:314 xpack/plugins/cloud/models.py:314 +#: xpack/plugins/cloud/models.py:354 msgid "Rule value" msgstr "ルール値" -#: xpack.bak/plugins/cloud/models.py:321 -#: xpack.bak/plugins/cloud/serializers/task.py:75 -#: xpack/plugins/cloud/models.py:321 xpack/plugins/cloud/serializers/task.py:76 +#: xpack/plugins/cloud/models.py:361 xpack/plugins/cloud/serializers/task.py:79 msgid "Strategy rule" msgstr "戦略ルール" -#: xpack.bak/plugins/cloud/models.py:336 xpack/plugins/cloud/models.py:336 +#: xpack/plugins/cloud/models.py:371 +#, fuzzy +#| msgid "Hostname strategy" +msgid "Name strategy" +msgstr "ホスト名戦略" + +#: xpack/plugins/cloud/models.py:378 msgid "Action attr" msgstr "アクション属性" -#: xpack.bak/plugins/cloud/models.py:338 xpack/plugins/cloud/models.py:338 +#: xpack/plugins/cloud/models.py:380 msgid "Action value" msgstr "アクション値" -#: xpack.bak/plugins/cloud/models.py:345 -#: xpack.bak/plugins/cloud/serializers/task.py:78 -#: xpack/plugins/cloud/models.py:345 xpack/plugins/cloud/serializers/task.py:79 +#: xpack/plugins/cloud/models.py:387 xpack/plugins/cloud/serializers/task.py:82 msgid "Strategy action" msgstr "戦略アクション" -#: xpack.bak/plugins/cloud/providers/aws_international.py:18 #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" msgstr "中国 (北京)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:19 #: xpack/plugins/cloud/providers/aws_international.py:19 msgid "China (Ningxia)" msgstr "中国 (寧夏)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:22 #: xpack/plugins/cloud/providers/aws_international.py:22 msgid "US East (Ohio)" msgstr "米国東部 (オハイオ州)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:23 #: xpack/plugins/cloud/providers/aws_international.py:23 msgid "US East (N. Virginia)" msgstr "米国東部 (N. バージニア州)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:24 #: xpack/plugins/cloud/providers/aws_international.py:24 msgid "US West (N. California)" msgstr "米国西部 (N. カリフォルニア州)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:25 #: xpack/plugins/cloud/providers/aws_international.py:25 msgid "US West (Oregon)" msgstr "米国西部 (オレゴン州)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:26 #: xpack/plugins/cloud/providers/aws_international.py:26 msgid "Africa (Cape Town)" msgstr "アフリカ (ケープタウン)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:27 #: xpack/plugins/cloud/providers/aws_international.py:27 msgid "Asia Pacific (Hong Kong)" msgstr "アジアパシフィック (香港)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:28 #: xpack/plugins/cloud/providers/aws_international.py:28 msgid "Asia Pacific (Mumbai)" msgstr "アジア太平洋 (ムンバイ)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:29 #: xpack/plugins/cloud/providers/aws_international.py:29 msgid "Asia Pacific (Osaka-Local)" msgstr "アジアパシフィック (大阪-ローカル)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:30 #: xpack/plugins/cloud/providers/aws_international.py:30 msgid "Asia Pacific (Seoul)" msgstr "アジア太平洋地域 (ソウル)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:31 #: xpack/plugins/cloud/providers/aws_international.py:31 msgid "Asia Pacific (Singapore)" msgstr "アジア太平洋 (シンガポール)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:32 #: xpack/plugins/cloud/providers/aws_international.py:32 msgid "Asia Pacific (Sydney)" msgstr "アジア太平洋 (シドニー)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:33 #: xpack/plugins/cloud/providers/aws_international.py:33 msgid "Asia Pacific (Tokyo)" msgstr "アジアパシフィック (東京)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:34 #: xpack/plugins/cloud/providers/aws_international.py:34 msgid "Canada (Central)" msgstr "カナダ (中央)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:35 #: xpack/plugins/cloud/providers/aws_international.py:35 msgid "Europe (Frankfurt)" msgstr "ヨーロッパ (フランクフルト)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:36 #: xpack/plugins/cloud/providers/aws_international.py:36 msgid "Europe (Ireland)" msgstr "ヨーロッパ (アイルランド)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:37 #: xpack/plugins/cloud/providers/aws_international.py:37 msgid "Europe (London)" msgstr "ヨーロッパ (ロンドン)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:38 #: xpack/plugins/cloud/providers/aws_international.py:38 msgid "Europe (Milan)" msgstr "ヨーロッパ (ミラノ)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:39 #: xpack/plugins/cloud/providers/aws_international.py:39 msgid "Europe (Paris)" msgstr "ヨーロッパ (パリ)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:40 #: xpack/plugins/cloud/providers/aws_international.py:40 msgid "Europe (Stockholm)" msgstr "ヨーロッパ (ストックホルム)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:41 #: xpack/plugins/cloud/providers/aws_international.py:41 msgid "Middle East (Bahrain)" msgstr "中东 (バーレーン)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:42 #: xpack/plugins/cloud/providers/aws_international.py:42 msgid "South America (São Paulo)" msgstr "南米 (サンパウロ)" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:56 -#: xpack.bak/plugins/cloud/providers/jdcloud.py:125 #: xpack/plugins/cloud/providers/baiducloud.py:56 #: xpack/plugins/cloud/providers/jdcloud.py:125 msgid "CN North-Beijing" msgstr "華北-北京" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:57 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:47 -#: xpack.bak/plugins/cloud/providers/jdcloud.py:128 #: xpack/plugins/cloud/providers/baiducloud.py:57 #: xpack/plugins/cloud/providers/huaweicloud.py:47 #: xpack/plugins/cloud/providers/jdcloud.py:128 msgid "CN South-Guangzhou" msgstr "華南-広州" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:58 #: xpack/plugins/cloud/providers/baiducloud.py:58 msgid "CN East-Suzhou" msgstr "華東-蘇州" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:59 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:54 #: xpack/plugins/cloud/providers/baiducloud.py:59 #: xpack/plugins/cloud/providers/huaweicloud.py:54 msgid "CN-Hong Kong" msgstr "中国-香港" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:60 #: xpack/plugins/cloud/providers/baiducloud.py:60 msgid "CN Center-Wuhan" msgstr "華中-武漢" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:61 #: xpack/plugins/cloud/providers/baiducloud.py:61 msgid "CN North-Baoding" msgstr "華北-保定" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:62 -#: xpack.bak/plugins/cloud/providers/jdcloud.py:127 #: xpack/plugins/cloud/providers/baiducloud.py:62 #: xpack/plugins/cloud/providers/jdcloud.py:127 msgid "CN East-Shanghai" msgstr "華東-上海" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:63 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:56 #: xpack/plugins/cloud/providers/baiducloud.py:63 #: xpack/plugins/cloud/providers/huaweicloud.py:56 msgid "AP-Singapore" msgstr "アジア太平洋-シンガポール" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:44 +#: xpack/plugins/cloud/providers/gcp.py:64 +#: xpack/plugins/cloud/providers/huaweicloud.py:34 +msgid "Account unavailable" +msgstr "利用できないアカウント" + #: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "CN North-Beijing1" msgstr "華北-北京1" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:45 #: xpack/plugins/cloud/providers/huaweicloud.py:45 msgid "CN North-Beijing4" msgstr "華北-北京4" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:46 #: xpack/plugins/cloud/providers/huaweicloud.py:46 msgid "CN North-Ulanqab1" msgstr "華北-ウランチャブ一" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:48 #: xpack/plugins/cloud/providers/huaweicloud.py:48 msgid "CN South-Shenzhen" msgstr "華南-広州" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:49 #: xpack/plugins/cloud/providers/huaweicloud.py:49 msgid "CN South-Guangzhou-InvitationOnly" msgstr "華南-広州-友好ユーザー環境" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:50 #: xpack/plugins/cloud/providers/huaweicloud.py:50 msgid "CN East-Shanghai2" msgstr "華東-上海2" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:51 #: xpack/plugins/cloud/providers/huaweicloud.py:51 msgid "CN East-Shanghai1" msgstr "華東-上海1" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:53 #: xpack/plugins/cloud/providers/huaweicloud.py:53 msgid "CN Southwest-Guiyang1" msgstr "南西-貴陽1" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:55 #: xpack/plugins/cloud/providers/huaweicloud.py:55 msgid "AP-Bangkok" msgstr "アジア太平洋-バンコク" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:58 #: xpack/plugins/cloud/providers/huaweicloud.py:58 msgid "AF-Johannesburg" msgstr "アフリカ-ヨハネスブルク" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:59 #: xpack/plugins/cloud/providers/huaweicloud.py:59 msgid "LA-Mexico City1" msgstr "LA-メキシコCity1" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:60 #: xpack/plugins/cloud/providers/huaweicloud.py:60 msgid "LA-Santiago" msgstr "ラテンアメリカ-サンディエゴ" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:61 #: xpack/plugins/cloud/providers/huaweicloud.py:61 msgid "LA-Sao Paulo1" msgstr "ラミー・サンパウロ1" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:63 #: xpack/plugins/cloud/providers/huaweicloud.py:63 msgid "TR-Istanbul" msgstr "TR-Istanbul" -#: xpack.bak/plugins/cloud/providers/jdcloud.py:126 #: xpack/plugins/cloud/providers/jdcloud.py:126 msgid "CN East-Suqian" msgstr "華東-宿遷" -#: xpack.bak/plugins/cloud/serializers/account.py:69 -#: xpack/plugins/cloud/serializers/account.py:70 +#: xpack/plugins/cloud/providers/lan.py:79 +#, python-format +msgid "Port \"%(port)s\" of instance IP \"%(ip)s\" is not reachable" +msgstr "インスタンスIP \"%(ip)s\" のポート \"%(port)s\" は接続できません" + +#: xpack/plugins/cloud/serializers/account.py:94 msgid "Validity display" msgstr "有効表示" -#: xpack.bak/plugins/cloud/serializers/account.py:70 -#: xpack/plugins/cloud/serializers/account.py:71 +#: xpack/plugins/cloud/serializers/account.py:95 msgid "Provider display" msgstr "プロバイダ表示" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:17 #: xpack/plugins/cloud/serializers/account_attrs.py:17 #, fuzzy #| msgid "Access key" msgid "Access key id" msgstr "アクセスキー" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:41 #: xpack/plugins/cloud/serializers/account_attrs.py:41 msgid "Tenant ID" msgstr "テナントID" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:44 #: xpack/plugins/cloud/serializers/account_attrs.py:44 msgid "Subscription ID" msgstr "サブスクリプションID" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:98 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:102 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:126 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:156 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:206 #: xpack/plugins/cloud/serializers/account_attrs.py:98 #: xpack/plugins/cloud/serializers/account_attrs.py:102 #: xpack/plugins/cloud/serializers/account_attrs.py:126 @@ -9660,52 +9683,42 @@ msgstr "サブスクリプションID" msgid "API Endpoint" msgstr "APIエンドポイント" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:108 #: xpack/plugins/cloud/serializers/account_attrs.py:108 msgid "Auth url" msgstr "認証アドレス" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:109 #: xpack/plugins/cloud/serializers/account_attrs.py:109 msgid "eg: http://openstack.example.com:5000/v3" msgstr "例えば: http://openstack.example.com:5000/v3" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:112 #: xpack/plugins/cloud/serializers/account_attrs.py:112 msgid "User domain" msgstr "ユーザードメイン" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:127 #: xpack/plugins/cloud/serializers/account_attrs.py:127 msgid "Cert File" msgstr "証明書ファイル" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:128 #: xpack/plugins/cloud/serializers/account_attrs.py:128 msgid "Key File" msgstr "キーファイル" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:144 #: xpack/plugins/cloud/serializers/account_attrs.py:144 msgid "Service account key" msgstr "サービスアカウントキー" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:145 #: xpack/plugins/cloud/serializers/account_attrs.py:145 msgid "The file is in JSON format" msgstr "ファイルはJSON形式です。" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:163 #: xpack/plugins/cloud/serializers/account_attrs.py:163 msgid "IP address invalid `{}`, {}" msgstr "IPアドレスが無効: '{}', {}" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:179 #: xpack/plugins/cloud/serializers/account_attrs.py:179 msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" msgstr "例：192.168.1.0/24、10.0.0.0.0-10.0.0.255" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:182 #: xpack/plugins/cloud/serializers/account_attrs.py:182 msgid "" "The port is used to detect the validity of the IP address. When the " @@ -9716,246 +9729,47 @@ msgstr "" "実行されると、有効な IP アドレスのみが同期されます。
ポートが0の場合、す" "べてのIPアドレスが有効です。" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:190 #: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Hostname prefix" msgstr "ホスト名プレフィックス" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:193 #: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "IP segment" msgstr "IP セグメント" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:197 #: xpack/plugins/cloud/serializers/account_attrs.py:197 msgid "Test port" msgstr "テストポート" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Test timeout" msgstr "テストタイムアウト" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:216 #: xpack/plugins/cloud/serializers/account_attrs.py:216 msgid "Project" msgstr "project" -#: xpack.bak/plugins/cloud/serializers/task.py:151 -#: xpack/plugins/cloud/serializers/task.py:152 -msgid "" -"Only instances matching the IP range will be synced.
If the instance " -"contains multiple IP addresses, the first IP address that matches will be " -"used as the IP for the created asset.
The default value of * means sync " -"all instances and randomly match IP addresses.
Such as: 192.168.1.0/24, " -"10.1.1.1-10.1.1.20" -msgstr "" -"IP範囲に一致するインスタンスのみが同期されます。
インスタンスに複数のIPア" -"ドレスが含まれている場合、一致する最初のIPアドレスが作成されたアセットのIPと" -"して使用されます。
デフォルト値の*は、すべてのインスタンスを同期し、IPア" -"ドレスをランダムに一致させることを意味します。
例: " -"192.168.1.0/24,10.1.1.1-10.1.1.20。" - -#: xpack.bak/plugins/cloud/serializers/task.py:157 -#: xpack/plugins/cloud/serializers/task.py:158 +#: xpack/plugins/cloud/serializers/task.py:154 msgid "History count" msgstr "実行回数" -#: xpack.bak/plugins/cloud/serializers/task.py:158 -#: xpack/plugins/cloud/serializers/task.py:159 +#: xpack/plugins/cloud/serializers/task.py:155 msgid "Instance count" msgstr "インスタンス数" -#: xpack.bak/plugins/cloud/tasks.py:27 xpack/plugins/cloud/tasks.py:27 -msgid "Run sync instance task" -msgstr "同期インスタンス タスクを実行する" - -#: xpack.bak/plugins/cloud/tasks.py:41 xpack/plugins/cloud/tasks.py:41 +#: xpack/plugins/cloud/tasks.py:41 msgid "Period clean sync instance task execution" msgstr "同期インスタンス タスクの実行記録を定期的にクリアする" -#: xpack.bak/plugins/interface/api.py:52 xpack/plugins/interface/api.py:52 +#: xpack/plugins/interface/api.py:52 msgid "Restore default successfully." msgstr "デフォルトの復元に成功しました。" -#: xpack.bak/plugins/interface/meta.py:9 xpack/plugins/interface/meta.py:9 -#: xpack/plugins/interface/models.py:45 xpack/plugins/interface/models.py:86 +#: xpack/plugins/interface/meta.py:9 xpack/plugins/interface/models.py:45 +#: xpack/plugins/interface/models.py:86 msgid "Interface settings" msgstr "インターフェイスの設定" -#: xpack.bak/plugins/interface/models.py:23 -#, fuzzy -#| msgid "MFA in login page" -msgid "Title of login page" -msgstr "ログインページのMFA" - -#: xpack.bak/plugins/interface/models.py:27 -#, fuzzy -#| msgid "MFA in login page" -msgid "Image of login page" -msgstr "ログインページのMFA" - -#: xpack.bak/plugins/interface/models.py:31 -#: xpack/plugins/interface/models.py:31 -msgid "Website icon" -msgstr "ウェブサイトのアイコン" - -#: xpack.bak/plugins/interface/models.py:35 -#, fuzzy -#| msgid "Logout" -msgid "Logo of management page" -msgstr "ログアウト" - -#: xpack.bak/plugins/interface/models.py:39 -#, fuzzy -#| msgid "Logout" -msgid "Logo of logout page" -msgstr "ログアウト" - -#: xpack.bak/plugins/interface/models.py:41 -#: xpack/plugins/interface/models.py:41 -#: xpack/plugins/interface/serializers/interface.py:26 -msgid "Theme" -msgstr "テーマ" - -#: xpack.bak/plugins/interface/models.py:42 -#: xpack/plugins/interface/models.py:42 -msgid "Footer content" -msgstr "フッターの内容" - -#: xpack.bak/plugins/interface/models.py:45 -#: xpack.bak/plugins/interface/models.py:86 -msgid "Interface setting" -msgstr "インターフェイスの設定" - -#: xpack.bak/plugins/license/api.py:52 xpack/plugins/license/api.py:52 -msgid "License import successfully" -msgstr "ライセンスのインポートに成功" - -#: xpack.bak/plugins/license/api.py:53 -msgid "License is invalid" -msgstr "ライセンスが無効です" - -#: xpack.bak/plugins/license/meta.py:10 xpack.bak/plugins/license/models.py:144 -#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:144 -msgid "License" -msgstr "ライセンス" - -#: xpack.bak/plugins/license/models.py:80 xpack/plugins/license/models.py:80 -msgid "Basic edition" -msgstr "エンタープライズ基本版" - -#: xpack.bak/plugins/license/models.py:82 xpack/plugins/license/models.py:82 -msgid "Standard edition" -msgstr "エンタープライズ標準版" - -#: xpack.bak/plugins/license/models.py:84 xpack/plugins/license/models.py:84 -msgid "Professional edition" -msgstr "エンタープライズプロフェッショナル版" - -#: xpack.bak/plugins/license/models.py:86 xpack/plugins/license/models.py:86 -msgid "Ultimate edition" -msgstr "エンタープライズ・フラッグシップ・エディション" - -#: xpack/exceptions.py:8 -msgid "" -"Based on the current task configuration, assets that do not match the " -"strategy will skipped." -msgstr "現在のタスク構成に基づいて、未一致ポリシーの資産はスキップされます" - -#: xpack/plugins/cloud/manager.py:41 -#, python-format -msgid "Task \"%s\" starts executing" -msgstr "タスク \"%s\" の実行開始" - -#: xpack/plugins/cloud/manager.py:71 -msgid "View the task details path: " -msgstr "タスク詳細パスの表示: " - -#: xpack/plugins/cloud/manager.py:74 -msgid "Account Details" -msgstr "アカウントの詳細" - -#: xpack/plugins/cloud/manager.py:75 -msgid "Synchronization History List" -msgstr "履歴リストの同期" - -#: xpack/plugins/cloud/manager.py:75 -msgid "Synchronization Instance List" -msgstr "インスタンスリストの同期" - -#: xpack/plugins/cloud/manager.py:83 -msgid "Task execution completed" -msgstr "タスク実行完了" - -#: xpack/plugins/cloud/manager.py:87 -msgid "Synchronization regions" -msgstr "同期地域" - -#: xpack/plugins/cloud/manager.py:110 -#, python-format -msgid "Get instances of region \"%s\" error, error: %s" -msgstr "地域 \"%s\" のインスタンスを取得できませんでした、エラー：%s" - -#: xpack/plugins/cloud/manager.py:128 -#, python-format -msgid "The instance IP \"%s\" is not in network segment \"%s\"" -msgstr "インスタンスのIP \"%s\" はネットワークセグメント \"%s\" にありません" - -#: xpack/plugins/cloud/manager.py:164 -#, python-format -msgid "Failed to synchronize the instance \"%s\"" -msgstr "インスタンス \"%s\" の同期に失敗しました" - -#: xpack/plugins/cloud/manager.py:316 -#, python-format -msgid "" -"The updated platform of asset \"%s\" is inconsistent with the original " -"platform type. Skip platform and protocol updates" -msgstr "" -"更新された資産 \"%s\" のプラットフォームタイプと元のタイプは一致しません。プ" -"ラットフォームとプロトコルの更新をスキップ" - -#: xpack/plugins/cloud/manager.py:358 -#, python-format -msgid "The asset \"%s\" already exists" -msgstr "資産 \"%s\" はすでに存在します" - -#: xpack/plugins/cloud/manager.py:362 -#, python-format -msgid "Update asset \"%s\"" -msgstr "資産の更新 \"%s\"" - -#: xpack/plugins/cloud/manager.py:365 -#, python-format -msgid "Asset \"%s\" has been updated" -msgstr "資産 \"%s\" が更新されました" - -#: xpack/plugins/cloud/manager.py:376 -#, python-format -msgid "Prepare to create asset \"%s\"" -msgstr "資産 \"%s\" の作成準備" - -#: xpack/plugins/cloud/manager.py:388 -#, python-format -msgid "Set nodes \"%s\"" -msgstr "ノード \"%s\" の設定" - -#: xpack/plugins/cloud/manager.py:414 -#, python-format -msgid "Set accounts \"%s\"" -msgstr "アカウント \"%s\" の設定" - -#: xpack/plugins/cloud/manager.py:430 -#, python-format -msgid "Set protocols \"%s\"" -msgstr "プロトコル \"%s\" の設定" - -#: xpack/plugins/cloud/providers/lan.py:79 -#, python-format -msgid "Port \"%(port)s\" of instance IP \"%(ip)s\" is not reachable" -msgstr "インスタンスIP \"%(ip)s\" のポート \"%(port)s\" は接続できません" - #: xpack/plugins/interface/models.py:23 msgid "Login title" msgstr "ログインページのタイトル" @@ -9964,6 +9778,10 @@ msgstr "ログインページのタイトル" msgid "Login image" msgstr "ログインページのイメージ" +#: xpack/plugins/interface/models.py:31 +msgid "Website icon" +msgstr "ウェブサイトのアイコン" + #: xpack/plugins/interface/models.py:35 msgid "Index logo" msgstr "管理ページのロゴ" @@ -9974,6 +9792,15 @@ msgstr "管理ページのロゴ" msgid "Logout logo" msgstr "ログアウト" +#: xpack/plugins/interface/models.py:41 +#: xpack/plugins/interface/serializers/interface.py:26 +msgid "Theme" +msgstr "テーマ" + +#: xpack/plugins/interface/models.py:42 +msgid "Footer content" +msgstr "フッターの内容" + #: xpack/plugins/interface/serializers/interface.py:37 msgid "Wide logo on top" msgstr "" @@ -9982,10 +9809,87 @@ msgstr "" msgid "Small logo without text" msgstr "" +#: xpack/plugins/license/api.py:52 +msgid "License import successfully" +msgstr "ライセンスのインポートに成功" + #: xpack/plugins/license/api.py:53 msgid "Invalid license" msgstr "無効なライセンス" +#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:144 +msgid "License" +msgstr "ライセンス" + +#: xpack/plugins/license/models.py:80 +msgid "Basic edition" +msgstr "エンタープライズ基本版" + +#: xpack/plugins/license/models.py:82 +msgid "Standard edition" +msgstr "エンタープライズ標準版" + +#: xpack/plugins/license/models.py:84 +msgid "Professional edition" +msgstr "エンタープライズプロフェッショナル版" + +#: xpack/plugins/license/models.py:86 +msgid "Ultimate edition" +msgstr "エンタープライズ・フラッグシップ・エディション" + +#~ msgid "Send verification code" +#~ msgstr "確認コードを送信" + +#~ msgid "Session ID" +#~ msgstr "セッションID" + +#~ msgid "Enable MFA" +#~ msgstr "MFAの有効化" + +#~ msgid "" +#~ "Only instances matching the IP range will be synced.
If the instance " +#~ "contains multiple IP addresses, the first IP address that matches will be " +#~ "used as the IP for the created asset.
The default value of * means " +#~ "sync all instances and randomly match IP addresses.
Such as: " +#~ "192.168.1.0/24, 10.1.1.1-10.1.1.20" +#~ msgstr "" +#~ "IP範囲に一致するインスタンスのみが同期されます。
インスタンスに複数のIP" +#~ "アドレスが含まれている場合、一致する最初のIPアドレスが作成されたアセットの" +#~ "IPとして使用されます。
デフォルト値の*は、すべてのインスタンスを同期" +#~ "し、IPアドレスをランダムに一致させることを意味します。
例: " +#~ "192.168.1.0/24,10.1.1.1-10.1.1.20。" + +#, fuzzy +#~| msgid "MFA in login page" +#~ msgid "Title of login page" +#~ msgstr "ログインページのMFA" + +#, fuzzy +#~| msgid "MFA in login page" +#~ msgid "Image of login page" +#~ msgstr "ログインページのMFA" + +#, fuzzy +#~| msgid "Logout" +#~ msgid "Logo of management page" +#~ msgstr "ログアウト" + +#, fuzzy +#~| msgid "Logout" +#~ msgid "Logo of logout page" +#~ msgstr "ログアウト" + +#~ msgid "Interface setting" +#~ msgstr "インターフェイスの設定" + +#~ msgid "License is invalid" +#~ msgstr "ライセンスが無効です" + +#, python-format +#~ msgid "The instance IP \"%s\" is not in network segment \"%s\"" +#~ msgstr "" +#~ "インスタンスのIP \"%s\" はネットワークセグメント \"%s\" にありません" + #~ msgid "Labels" #~ msgstr "ラベル" @@ -10228,9 +10132,6 @@ msgstr "無効なライセンス" #~ msgid "Connectivity alarm" #~ msgstr "接続性アラーム" -#~ msgid "New file encryption password" -#~ msgstr "新しいファイルの暗号化パスワード" - #~ msgid "Confirm file encryption password" #~ msgstr "ファイルの暗号化パスワードを確認する" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 2b48a021b..1753a1bfe 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/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: 2024-05-22 18:27+0800\n" +"POT-Creation-Date: 2024-06-03 10:21+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -44,7 +44,6 @@ msgstr "成功: %s, 失败: %s, 总数: %s" #: users/forms/profile.py:21 users/serializers/user.py:142 #: users/templates/users/_msg_user_created.html:13 #: users/templates/users/user_password_verify.html:18 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:28 #: xpack/plugins/cloud/serializers/account_attrs.py:28 msgid "Password" msgstr "密码" @@ -102,7 +101,7 @@ msgstr "收集" msgid "Template" msgstr "模板" -#: accounts/const/account.py:32 ops/const.py:46 +#: accounts/const/account.py:32 ops/const.py:46 xpack/plugins/cloud/const.py:68 msgid "Skip" msgstr "跳过" @@ -112,10 +111,9 @@ msgid "Update" msgstr "更新" #: accounts/const/account.py:34 accounts/const/automation.py:109 -#: accounts/serializers/automations/change_secret.py:164 audits/const.py:62 +#: accounts/serializers/automations/change_secret.py:167 audits/const.py:62 #: audits/signal_handlers/activity_log.py:33 common/const/choices.py:19 -#: ops/const.py:76 terminal/const.py:79 xpack.bak/plugins/cloud/const.py:47 -#: xpack/plugins/cloud/const.py:47 +#: ops/const.py:76 terminal/const.py:79 xpack/plugins/cloud/const.py:47 msgid "Failed" msgstr "失败" @@ -228,7 +226,7 @@ msgid "SFTP" msgstr "SFTP" #: accounts/const/automation.py:110 -#: accounts/serializers/automations/change_secret.py:163 audits/const.py:61 +#: accounts/serializers/automations/change_secret.py:166 audits/const.py:61 #: audits/models.py:64 audits/signal_handlers/activity_log.py:33 #: common/const/choices.py:18 ops/const.py:74 ops/serializers/celery.py:48 #: terminal/const.py:78 terminal/models/session/sharing.py:121 @@ -273,8 +271,8 @@ msgstr "用户 %s 查看/导出 了密码" #: accounts/serializers/account/account.py:215 #: accounts/serializers/account/account.py:260 #: accounts/serializers/account/gathered_account.py:10 -#: accounts/serializers/automations/change_secret.py:108 -#: accounts/serializers/automations/change_secret.py:140 +#: accounts/serializers/automations/change_secret.py:111 +#: accounts/serializers/automations/change_secret.py:143 #: accounts/templates/accounts/asset_account_change_info.html:7 #: accounts/templates/accounts/change_secret_failed_info.html:11 #: acls/serializers/base.py:123 assets/models/asset/common.py:95 @@ -285,8 +283,7 @@ msgstr "用户 %s 查看/导出 了密码" #: terminal/serializers/command.py:17 terminal/serializers/session.py:28 #: terminal/templates/terminal/_msg_command_warning.html:4 #: terminal/templates/terminal/_msg_session_sharing.html:4 -#: tickets/models/ticket/apply_asset.py:16 -#: xpack.bak/plugins/cloud/models.py:252 xpack/plugins/cloud/models.py:252 +#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:268 msgid "Asset" msgstr "资产" @@ -314,18 +311,19 @@ msgid "Source ID" msgstr "来源 ID" #: accounts/models/account.py:61 -#: accounts/serializers/automations/change_secret.py:110 -#: accounts/serializers/automations/change_secret.py:141 +#: accounts/serializers/automations/change_secret.py:113 +#: accounts/serializers/automations/change_secret.py:144 #: accounts/templates/accounts/change_secret_failed_info.html:12 -#: acls/serializers/base.py:124 acls/templates/acls/asset_login_reminder.html:9 +#: acls/serializers/base.py:124 +#: acls/templates/acls/asset_login_reminder.html:10 #: assets/serializers/gateway.py:28 audits/models.py:59 #: authentication/api/connection_token.py:411 ops/models/base.py:18 #: perms/models/asset_permission.py:75 terminal/backends/command/models.py:18 #: terminal/models/session/session.py:34 terminal/serializers/command.py:72 #: terminal/templates/terminal/_msg_command_warning.html:8 #: terminal/templates/terminal/_msg_session_sharing.html:8 -#: tickets/models/ticket/command_confirm.py:13 -#: xpack.bak/plugins/cloud/models.py:85 xpack/plugins/cloud/models.py:85 +#: tickets/models/ticket/command_confirm.py:13 xpack/plugins/cloud/models.py:99 +#: xpack/plugins/cloud/ws.py:38 msgid "Account" msgstr "账号" @@ -427,14 +425,14 @@ msgid "Trigger mode" msgstr "触发模式" #: accounts/models/automations/backup_account.py:134 audits/models.py:203 -#: terminal/models/session/sharing.py:125 xpack.bak/plugins/cloud/models.py:204 -#: xpack/plugins/cloud/manager.py:165 xpack/plugins/cloud/models.py:204 +#: terminal/models/session/sharing.py:125 xpack/plugins/cloud/manager.py:158 +#: xpack/plugins/cloud/models.py:220 msgid "Reason" msgstr "原因" #: accounts/models/automations/backup_account.py:136 -#: accounts/serializers/automations/change_secret.py:107 -#: accounts/serializers/automations/change_secret.py:142 +#: accounts/serializers/automations/change_secret.py:110 +#: accounts/serializers/automations/change_secret.py:145 #: ops/serializers/job.py:74 terminal/serializers/session.py:52 msgid "Is success" msgstr "是否成功" @@ -523,9 +521,8 @@ msgstr "结束日期" #: terminal/serializers/applet.py:18 terminal/serializers/applet_host.py:136 #: terminal/serializers/virtualapp.py:35 tickets/models/ticket/general.py:281 #: tickets/serializers/super_ticket.py:13 -#: tickets/serializers/ticket/ticket.py:20 -#: xpack.bak/plugins/cloud/models.py:200 xpack.bak/plugins/cloud/models.py:256 -#: xpack/plugins/cloud/models.py:200 xpack/plugins/cloud/models.py:256 +#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:216 +#: xpack/plugins/cloud/models.py:272 msgid "Status" msgstr "状态" @@ -564,7 +561,6 @@ msgstr "最后登录日期" #: terminal/serializers/storage.py:136 users/forms/profile.py:31 #: users/forms/profile.py:114 users/models/user.py:898 #: users/templates/users/_msg_user_created.html:12 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:26 #: xpack/plugins/cloud/serializers/account_attrs.py:26 msgid "Username" msgstr "用户名" @@ -597,6 +593,7 @@ msgstr "触发方式" #: audits/models.py:92 audits/serializers.py:84 #: authentication/serializers/connect_token_secret.py:119 #: authentication/templates/authentication/_access_key_modal.html:34 +#: perms/serializers/permission.py:42 perms/serializers/permission.py:64 #: tickets/serializers/ticket/ticket.py:21 msgid "Action" msgstr "动作" @@ -662,10 +659,8 @@ msgstr "密码规则" #: terminal/models/virtualapp/virtualapp.py:19 tickets/api/ticket.py:87 #: users/forms/profile.py:32 users/models/group.py:13 #: users/models/preference.py:11 users/models/user.py:899 -#: xpack.bak/plugins/cloud/models.py:32 xpack.bak/plugins/cloud/models.py:272 -#: xpack.bak/plugins/cloud/serializers/task.py:70 -#: xpack/plugins/cloud/models.py:32 xpack/plugins/cloud/models.py:272 -#: xpack/plugins/cloud/serializers/task.py:71 +#: xpack/plugins/cloud/models.py:33 xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/serializers/task.py:74 msgid "Name" msgstr "名称" @@ -693,8 +688,7 @@ msgstr "平台" msgid "Push params" msgstr "账号推送参数" -#: accounts/models/template.py:26 xpack.bak/plugins/cloud/models.py:329 -#: xpack/plugins/cloud/models.py:329 +#: accounts/models/template.py:26 xpack/plugins/cloud/models.py:369 msgid "Account template" msgstr "账号模板" @@ -844,14 +838,14 @@ msgstr "已修改" #: accounts/serializers/account/account.py:273 #: accounts/serializers/automations/base.py:22 acls/models/base.py:97 -#: acls/templates/acls/asset_login_reminder.html:8 +#: acls/templates/acls/asset_login_reminder.html:9 #: assets/models/automations/base.py:19 #: assets/serializers/automations/base.py:20 #: authentication/api/connection_token.py:410 ops/models/base.py:17 #: ops/models/job.py:152 ops/serializers/job.py:19 #: perms/serializers/permission.py:36 #: terminal/templates/terminal/_msg_command_execute_alert.html:16 -#: xpack/plugins/cloud/manager.py:73 +#: xpack/plugins/cloud/manager.py:83 msgid "Assets" msgstr "资产" @@ -865,7 +859,6 @@ msgid "Asset does not support this secret type: %s" msgstr "资产不支持账号类型: %s" #: accounts/serializers/account/account.py:410 -#: xpack/plugins/cloud/serializers/account.py:111 msgid "Account has exist" msgstr "账号已存在" @@ -877,7 +870,7 @@ msgid "ID" msgstr "ID" #: accounts/serializers/account/account.py:453 acls/serializers/base.py:116 -#: acls/templates/acls/asset_login_reminder.html:7 +#: acls/templates/acls/asset_login_reminder.html:8 #: acls/templates/acls/user_login_reminder.html:8 #: assets/models/cmd_filter.py:24 assets/models/label.py:16 audits/models.py:54 #: audits/models.py:90 audits/models.py:172 audits/models.py:269 @@ -988,8 +981,7 @@ msgstr "关联平台，可配置推送参数，如果不关联，将使用默认 #: terminal/models/session/session.py:47 #: terminal/models/virtualapp/virtualapp.py:28 tickets/models/comment.py:32 #: tickets/models/ticket/general.py:295 users/models/user.py:933 -#: xpack.bak/plugins/cloud/models.py:39 xpack.bak/plugins/cloud/models.py:106 -#: xpack/plugins/cloud/models.py:39 xpack/plugins/cloud/models.py:106 +#: xpack/plugins/cloud/models.py:40 xpack/plugins/cloud/models.py:120 msgid "Comment" msgstr "备注" @@ -1027,15 +1019,27 @@ msgstr "自动化快照" msgid "SSH Key strategy" msgstr "SSH 密钥更改方式" -#: accounts/serializers/automations/change_secret.py:81 +#: accounts/serializers/automations/change_secret.py:57 +#, fuzzy +#| msgid "Please enter MFA code" +msgid "Please enter your account username" +msgstr "请输入 MFA 验证码" + +#: accounts/serializers/automations/change_secret.py:62 +msgid "" +"Secret parameter settings, currently only effective for assets of the host " +"type." +msgstr "" + +#: accounts/serializers/automations/change_secret.py:84 msgid "* Please enter the correct password length" msgstr "* 请输入正确的密码长度" -#: accounts/serializers/automations/change_secret.py:85 +#: accounts/serializers/automations/change_secret.py:88 msgid "* Password length range 6-30 bits" msgstr "* 密码长度范围 6-30 位" -#: accounts/serializers/automations/change_secret.py:114 +#: accounts/serializers/automations/change_secret.py:117 #: assets/models/automations/base.py:127 msgid "Automation task execution" msgstr "自动化任务执行历史" @@ -1164,14 +1168,12 @@ msgid "Notify" msgstr "" #: acls/models/base.py:37 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:112 -#: xpack.bak/plugins/cloud/models.py:278 xpack/plugins/cloud/models.py:278 +#: terminal/models/component/endpoint.py:112 xpack/plugins/cloud/models.py:294 msgid "Priority" msgstr "优先级" #: acls/models/base.py:38 assets/models/cmd_filter.py:76 -#: terminal/models/component/endpoint.py:113 -#: xpack.bak/plugins/cloud/models.py:279 xpack/plugins/cloud/models.py:279 +#: terminal/models/component/endpoint.py:113 xpack/plugins/cloud/models.py:295 msgid "1-100, the lower the value will be match first" msgstr "优先级可选范围为 1-100 (数值越小越优先)" @@ -1213,14 +1215,13 @@ msgid "Command" msgstr "命令" #: acls/models/command_acl.py:17 assets/models/cmd_filter.py:59 -#: xpack.bak/plugins/cloud/models.py:295 xpack/plugins/cloud/models.py:295 +#: xpack/plugins/cloud/models.py:335 msgid "Regex" msgstr "正则表达式" #: acls/models/command_acl.py:26 assets/models/cmd_filter.py:79 #: settings/models.py:184 settings/serializers/feature.py:19 -#: settings/serializers/msg.py:76 xpack.bak/plugins/license/models.py:30 -#: xpack/plugins/license/models.py:30 +#: settings/serializers/msg.py:76 xpack/plugins/license/models.py:30 msgid "Content" msgstr "内容" @@ -1319,8 +1320,7 @@ msgid "None of the reviewers belong to Organization `{}`" msgstr "所有复核人都不属于组织 `{}`" #: acls/serializers/rules/rules.py:20 -#: xpack.bak/plugins/cloud/serializers/task.py:145 -#: xpack/plugins/cloud/serializers/task.py:146 +#: xpack/plugins/cloud/serializers/task.py:149 msgid "IP address invalid: `{}`" msgstr "IP 地址无效: `{}`" @@ -1336,6 +1336,7 @@ msgstr "" #: authentication/templates/authentication/_msg_oauth_bind.html:12 #: authentication/templates/authentication/_msg_rest_password_success.html:8 #: authentication/templates/authentication/_msg_rest_public_key_success.html:8 +#: xpack/plugins/cloud/models.py:370 msgid "IP" msgstr "IP" @@ -1345,6 +1346,10 @@ msgstr "时段" #: acls/templates/acls/asset_login_reminder.html:3 #: acls/templates/acls/user_login_reminder.html:3 +#: authentication/templates/authentication/_msg_rest_password_success.html:2 +#: authentication/templates/authentication/_msg_rest_public_key_success.html:2 +#: perms/templates/perms/_msg_permed_items_expire.html:3 +#: users/templates/users/_msg_reset_mfa.html:4 msgid "Dear" msgstr "尊敬的" @@ -1358,7 +1363,7 @@ msgstr "我们想通知您，以下资产最近有用户登录：" msgid "Asset details" msgstr "资产详情" -#: acls/templates/acls/asset_login_reminder.html:12 +#: acls/templates/acls/asset_login_reminder.html:14 #: acls/templates/acls/user_login_reminder.html:15 msgid "" "Please review the login activity to ensure the security and proper usage of " @@ -1368,7 +1373,7 @@ msgstr "" "请您审核此登录活动，以确保资产的安全和正确使用。如果您未授权此次登录或发现任" "何可疑活动，请立即采取必要的措施。" -#: acls/templates/acls/asset_login_reminder.html:14 +#: acls/templates/acls/asset_login_reminder.html:16 #: acls/templates/acls/user_login_reminder.html:16 msgid "Thank you for your attention to this matter" msgstr "感谢您对此事的关注。" @@ -1467,7 +1472,6 @@ msgstr "无法连接到 {port} 上的端口 {address}" #: assets/automations/ping_gateway/manager.py:58 #: authentication/backends/oauth2/views.py:60 authentication/middleware.py:93 -#: xpack.bak/plugins/cloud/providers/fc.py:47 #: xpack/plugins/cloud/providers/fc.py:47 msgid "Authentication failed" msgstr "认证失败" @@ -1506,7 +1510,6 @@ msgstr "禁用" #: assets/const/base.py:33 settings/serializers/basic.py:8 #: users/serializers/preference/koko.py:19 -#: users/serializers/preference/lina.py:46 #: users/serializers/preference/luna.py:77 msgid "Basic" msgstr "基本" @@ -1520,8 +1523,7 @@ msgstr "脚本" #: settings/serializers/auth/radius.py:16 settings/serializers/auth/sms.py:76 #: settings/serializers/feature.py:49 settings/serializers/msg.py:31 #: terminal/models/component/endpoint.py:13 terminal/serializers/applet.py:17 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:72 -#: xpack/plugins/cloud/manager.py:73 +#: xpack/plugins/cloud/manager.py:83 #: xpack/plugins/cloud/serializers/account_attrs.py:72 msgid "Host" msgstr "主机" @@ -1577,7 +1579,7 @@ msgstr "防火墙" msgid "ChatGPT" msgstr "ChatGPT" -#: assets/const/host.py:12 rbac/tree.py:28 +#: assets/const/host.py:12 rbac/tree.py:28 xpack/plugins/cloud/const.py:69 msgid "Other" msgstr "其它" @@ -1732,7 +1734,6 @@ msgstr "云服务" #: assets/models/asset/common.py:94 assets/models/platform.py:16 #: settings/serializers/auth/radius.py:17 settings/serializers/auth/sms.py:77 #: settings/serializers/msg.py:32 terminal/serializers/storage.py:133 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:73 #: xpack/plugins/cloud/serializers/account_attrs.py:73 msgid "Port" msgstr "端口" @@ -1745,8 +1746,7 @@ msgstr "地址" #: assets/models/asset/common.py:161 assets/models/platform.py:134 #: authentication/backends/passkey/models.py:12 #: authentication/serializers/connect_token_secret.py:118 -#: perms/serializers/user_permission.py:25 -#: xpack.bak/plugins/cloud/models.py:325 xpack/plugins/cloud/models.py:325 +#: perms/serializers/user_permission.py:25 xpack/plugins/cloud/models.py:365 msgid "Platform" msgstr "平台" @@ -1805,8 +1805,7 @@ msgstr "代理" #: assets/models/automations/base.py:18 assets/models/cmd_filter.py:32 #: assets/models/node.py:553 perms/models/asset_permission.py:72 -#: tickets/models/ticket/apply_asset.py:14 -#: xpack.bak/plugins/cloud/models.py:326 xpack/plugins/cloud/models.py:326 +#: tickets/models/ticket/apply_asset.py:14 xpack/plugins/cloud/models.py:366 msgid "Node" msgstr "节点" @@ -1826,8 +1825,8 @@ msgstr "资产自动化任务" # msgid "Comment" # msgstr "备注" #: assets/models/automations/base.py:114 assets/models/cmd_filter.py:41 -#: audits/models.py:267 common/db/models.py:34 ops/models/base.py:54 -#: ops/models/job.py:240 users/models/user.py:1156 +#: common/db/models.py:34 ops/models/base.py:54 ops/models/job.py:240 +#: users/models/user.py:1156 msgid "Date created" msgstr "创建日期" @@ -1952,7 +1951,6 @@ msgstr "必须的" #: assets/models/platform.py:19 assets/serializers/platform.py:146 #: terminal/models/component/storage.py:28 -#: xpack.bak/plugins/cloud/providers/nutanix.py:30 #: xpack/plugins/cloud/providers/nutanix.py:30 msgid "Default" msgstr "默认" @@ -2096,10 +2094,8 @@ msgstr "资产中批量更新平台，不符合平台类型跳过的资产" #: authentication/serializers/connect_token_secret.py:30 #: authentication/serializers/connect_token_secret.py:75 #: perms/models/asset_permission.py:76 perms/serializers/permission.py:46 -#: perms/serializers/user_permission.py:74 -#: xpack.bak/plugins/cloud/models.py:328 -#: xpack.bak/plugins/cloud/serializers/task.py:33 -#: xpack/plugins/cloud/models.py:328 xpack/plugins/cloud/serializers/task.py:34 +#: perms/serializers/user_permission.py:74 xpack/plugins/cloud/models.py:368 +#: xpack/plugins/cloud/serializers/task.py:34 msgid "Protocols" msgstr "协议组" @@ -2443,7 +2439,7 @@ msgstr "映射目录" #: audits/const.py:23 terminal/api/session/session.py:277 #: terminal/templates/terminal/_msg_command_warning.html:18 #: terminal/templates/terminal/_msg_session_sharing.html:10 -#: xpack/plugins/cloud/manager.py:74 +#: xpack/plugins/cloud/manager.py:84 msgid "View" msgstr "查看" @@ -2502,7 +2498,7 @@ msgstr "登录日志" #: audits/const.py:51 terminal/models/applet/host.py:144 #: terminal/models/component/task.py:22 -#: xpack/plugins/cloud/serializers/account.py:55 +#: xpack/plugins/cloud/serializers/account.py:78 msgid "Task" msgstr "任务" @@ -2541,7 +2537,7 @@ msgstr "文件" #: audits/models.py:67 terminal/backends/command/models.py:21 #: terminal/models/session/replay.py:9 terminal/models/session/sharing.py:20 -#: terminal/models/session/sharing.py:95 +#: terminal/models/session/sharing.py:95 terminal/serializers/command.py:19 #: terminal/templates/terminal/_msg_command_alert.html:10 #: terminal/templates/terminal/_msg_command_warning.html:17 #: tickets/models/ticket/command_confirm.py:15 @@ -2624,6 +2620,12 @@ msgstr "用户登录日志" msgid "Session key" msgstr "会话标识" +#: audits/models.py:267 +#, fuzzy +#| msgid "Login Date" +msgid "Login date" +msgstr "登录日期" + #: audits/models.py:298 msgid "User session" msgstr "用户会话" @@ -3271,8 +3273,7 @@ msgid "Component" msgstr "组件" #: authentication/serializers/connect_token_secret.py:136 -#: perms/serializers/user_permission.py:28 -#: xpack.bak/plugins/cloud/models.py:327 xpack/plugins/cloud/models.py:327 +#: perms/serializers/user_permission.py:28 xpack/plugins/cloud/models.py:367 msgid "Domain" msgstr "网域" @@ -3304,8 +3305,7 @@ msgid "Ticket info" msgstr "工单信息" #: authentication/serializers/connection_token.py:21 -#: perms/models/asset_permission.py:77 perms/serializers/permission.py:42 -#: perms/serializers/permission.py:64 +#: perms/models/asset_permission.py:77 #: tickets/models/ticket/apply_application.py:28 #: tickets/models/ticket/apply_asset.py:18 msgid "Actions" @@ -3358,8 +3358,9 @@ msgid "Disable" msgstr "禁用" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/const.py:43 users/templates/users/mfa_setting.html:26 -#: users/templates/users/mfa_setting.html:68 +#: users/const.py:43 users/templates/users/mfa_setting.html:120 +#: users/templates/users/mfa_setting.html:158 +#: users/templates/users/mfa_setting.html:177 msgid "Enable" msgstr "启用" @@ -3394,15 +3395,11 @@ msgstr "代码错误" #: authentication/templates/authentication/_msg_oauth_bind.html:3 #: authentication/templates/authentication/_msg_reset_password.html:3 #: authentication/templates/authentication/_msg_reset_password_code.html:9 -#: authentication/templates/authentication/_msg_rest_password_success.html:2 -#: authentication/templates/authentication/_msg_rest_public_key_success.html:2 #: jumpserver/conf.py:465 #: 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:32 #: users/templates/users/_msg_account_expire_reminder.html:4 #: users/templates/users/_msg_password_expire_reminder.html:4 -#: users/templates/users/_msg_reset_mfa.html:4 #: users/templates/users/_msg_reset_ssh_key.html:4 msgid "Hello" msgstr "你好" @@ -3553,7 +3550,7 @@ msgid "Do you want to retry ?" msgstr "是否重试 ？" #: authentication/utils.py:24 common/utils/ip/geoip/utils.py:24 -#: xpack.bak/plugins/cloud/const.py:33 xpack/plugins/cloud/const.py:33 +#: xpack/plugins/cloud/const.py:33 msgid "LAN" msgstr "局域网" @@ -3737,7 +3734,7 @@ msgstr "运行中" msgid "Canceled" msgstr "取消" -#: common/const/common.py:5 xpack/plugins/cloud/manager.py:380 +#: common/const/common.py:5 xpack/plugins/cloud/manager.py:408 #, python-format msgid "%(name)s was created successfully" msgstr "%(name)s 创建成功" @@ -3799,9 +3796,6 @@ msgstr "无效的ID，应为列表" #: common/db/fields.py:594 common/db/fields.py:599 #: common/serializers/fields.py:133 tickets/serializers/ticket/common.py:58 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:56 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:79 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:150 #: xpack/plugins/cloud/serializers/account_attrs.py:56 #: xpack/plugins/cloud/serializers/account_attrs.py:79 #: xpack/plugins/cloud/serializers/account_attrs.py:150 @@ -3858,7 +3852,7 @@ msgid "" "information -> file encryption password to set the encryption password" msgstr "{} - 未设置加密密码 - 请前往个人信息 -> 文件加密密码中设置加密密码" -#: common/exceptions.py:15 +#: common/exceptions.py:15 xpack/plugins/cloud/ws.py:38 #, python-format msgid "%s object does not exist." msgstr "%s对象不存在" @@ -3936,8 +3930,7 @@ msgstr "阿里云" msgid "Tencent cloud" msgstr "腾讯云" -#: common/sdk/sms/endpoint.py:18 xpack.bak/plugins/cloud/const.py:13 -#: xpack/plugins/cloud/const.py:13 +#: common/sdk/sms/endpoint.py:18 xpack/plugins/cloud/const.py:13 msgid "Huawei Cloud" msgstr "华为云" @@ -4383,12 +4376,12 @@ msgid "Date last run" msgstr "最后运行日期" #: ops/models/base.py:51 ops/models/job.py:237 -#: xpack.bak/plugins/cloud/models.py:198 xpack/plugins/cloud/models.py:198 +#: xpack/plugins/cloud/models.py:214 msgid "Result" msgstr "结果" #: ops/models/base.py:52 ops/models/job.py:238 -#: xpack/plugins/cloud/manager.py:77 +#: xpack/plugins/cloud/manager.py:87 msgid "Summary" msgstr "汇总" @@ -4409,7 +4402,7 @@ msgid "Kwargs" msgstr "其它参数" #: ops/models/celery.py:84 terminal/models/session/sharing.py:128 -#: tickets/const.py:25 +#: tickets/const.py:25 xpack/plugins/cloud/const.py:67 msgid "Finished" msgstr "结束" @@ -4967,7 +4960,7 @@ msgstr "系统设置" msgid "Session audits" msgstr "会话审计" -#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:74 +#: rbac/tree.py:49 xpack/plugins/cloud/manager.py:84 msgid "Cloud import" msgstr "云同步" @@ -5379,13 +5372,11 @@ msgid "Service provider" msgstr "服务提供商" #: settings/serializers/auth/oauth2.py:30 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:35 #: xpack/plugins/cloud/serializers/account_attrs.py:35 msgid "Client ID" msgstr "客户端 ID" #: settings/serializers/auth/oauth2.py:33 settings/serializers/auth/oidc.py:23 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:38 #: xpack/plugins/cloud/serializers/account_attrs.py:38 msgid "Client Secret" msgstr "客户端密钥" @@ -5591,8 +5582,7 @@ msgstr "" msgid "Enable Short Message Service (SMS)" msgstr "" -#: settings/serializers/auth/sms.py:21 xpack.bak/plugins/cloud/models.py:34 -#: xpack/plugins/cloud/models.py:34 +#: settings/serializers/auth/sms.py:21 xpack/plugins/cloud/models.py:35 msgid "Provider" msgstr "云服务商" @@ -5684,7 +5674,6 @@ msgid "SSO auth key TTL" msgstr "令牌有效期" #: settings/serializers/auth/sso.py:20 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Unit: second" msgstr "单位: 秒" @@ -5908,6 +5897,12 @@ msgstr "作业中心命令黑名单" msgid "Virtual app" msgstr "虚拟应用" +#: settings/serializers/feature.py:148 +#, fuzzy +#| msgid "Virtual App" +msgid "Virtual App" +msgstr "虚拟应用" + #: settings/serializers/feature.py:150 msgid "" "Virtual applications, you can use the Linux operating system as an " @@ -6105,6 +6100,7 @@ msgstr "" "序对所有已开启的认证方式进行顺序认证，只要有一个认证成功就可以直接登录" #: settings/serializers/security.py:116 +#: users/templates/users/mfa_setting.html:160 msgid "Not enabled" msgstr "未启用" @@ -6294,7 +6290,6 @@ msgstr "" #: settings/serializers/terminal.py:34 users/forms/profile.py:172 #: users/models/user.py:931 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:210 #: xpack/plugins/cloud/serializers/account_attrs.py:210 msgid "Public key" msgstr "SSH公钥" @@ -6339,6 +6334,20 @@ msgid "" "Luna page will display the SSH client launch method when connecting to assets" msgstr "" +#: settings/serializers/tool.py:10 +msgid "Tool" +msgstr "" + +#: settings/serializers/tool.py:13 +msgid "Tools in the Workbench" +msgstr "" + +#: settings/serializers/tool.py:15 +msgid "" +"*! If enabled, users with RBAC permissions will be able to utilize all tools " +"in the workbench" +msgstr "" + #: settings/tasks/ldap.py:28 msgid "Periodic import ldap user" msgstr "周期导入 LDAP 用户" @@ -6478,6 +6487,7 @@ msgid "Export" msgstr "导出" #: templates/_csv_import_export.html:13 templates/_csv_import_modal.html:5 +#: xpack/plugins/cloud/const.py:65 msgid "Import" msgstr "导入" @@ -6607,15 +6617,16 @@ msgstr "" " " #: templates/_mfa_login_field.html:28 -msgid "Send verification code" -msgstr "发送验证码" +#: users/templates/users/forgot_password.html:101 +msgid "Send" +msgstr "发送" -#: templates/_mfa_login_field.html:107 +#: templates/_mfa_login_field.html:106 #: users/templates/users/forgot_password.html:176 msgid "Wait: " msgstr "等待：" -#: templates/_mfa_login_field.html:117 +#: templates/_mfa_login_field.html:116 #: users/templates/users/forgot_password.html:192 msgid "The verification code has been sent" msgstr "验证码已发送" @@ -6862,8 +6873,7 @@ msgstr "不支持批量创建" msgid "Storage is invalid" msgstr "存储无效" -#: terminal/models/applet/applet.py:30 xpack.bak/plugins/license/models.py:88 -#: xpack/plugins/license/models.py:88 +#: terminal/models/applet/applet.py:30 xpack/plugins/license/models.py:88 msgid "Community edition" msgstr "社区版" @@ -7201,6 +7211,8 @@ msgid "Command and replay storage" msgstr "命令及录像存储" #: terminal/notifications.py:240 terminal/tasks.py:153 +#: xpack/plugins/cloud/serializers/account.py:115 +#: xpack/plugins/cloud/serializers/account.py:117 msgid "Test failure: Account invalid" msgstr "测试失败: 账号无效" @@ -7329,10 +7341,6 @@ msgstr "主机 ID" msgid "Applet ID" msgstr "远程应用 ID" -#: terminal/serializers/command.py:19 -msgid "Session ID" -msgstr "会话ID" - #: terminal/serializers/command.py:41 msgid "Command Filter ACL" msgstr "命令过滤器" @@ -7442,13 +7450,12 @@ msgid "Access key ID" msgstr "Access key ID(AK)" #: terminal/serializers/storage.py:37 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:20 #: xpack/plugins/cloud/serializers/account_attrs.py:20 msgid "Access key secret" msgstr "Access key secret(SK)" -#: terminal/serializers/storage.py:68 xpack.bak/plugins/cloud/models.py:249 -#: xpack/plugins/cloud/manager.py:90 xpack/plugins/cloud/models.py:249 +#: terminal/serializers/storage.py:68 xpack/plugins/cloud/manager.py:100 +#: xpack/plugins/cloud/models.py:265 msgid "Region" msgstr "地域" @@ -7469,7 +7476,6 @@ msgid "HOST" msgstr "主机" #: terminal/serializers/storage.py:146 users/models/user.py:928 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:213 #: xpack/plugins/cloud/serializers/account_attrs.py:213 msgid "Private key" msgstr "ssh私钥" @@ -8239,7 +8245,7 @@ msgstr "需要更新密码" #: users/models/user.py:979 msgid "Date api key used" -msgstr "Api key 最后使用日期" +msgstr "API key 最后使用日期" #: users/models/user.py:1104 msgid "Can not delete admin user" @@ -8309,9 +8315,14 @@ msgid "Terminal theme name" msgstr "终端主题名称" #: users/serializers/preference/lina.py:11 +#, fuzzy +#| msgid "" +#| "The password for file encryption, used for decryption when the system " +#| "sends emails containing file attachments.
Such as: account backup " +#| "files, account password change results files" msgid "" -"The password for file encryption, used for decryption when the system sends " -"emails containing file attachments.
Such as: account backup files, " +"*! The password for file encryption, used for decryption when the system " +"sends emails containing file attachments.
Such as: account backup files, " "account password change results files" msgstr "" "文件加密密码，当系统发送的邮件中包含文件附件时，使用此密码进行解密。
如：" @@ -8321,6 +8332,12 @@ msgstr "" msgid "The newly set password is inconsistent" msgstr "两次密码不一致" +#: users/serializers/preference/lina.py:46 +#, fuzzy +#| msgid "New file encryption password" +msgid "File Encryption" +msgstr "文件加密密码" + #: users/serializers/preference/luna.py:26 msgid "Async loading of asset tree" msgstr "异步加载资产树" @@ -8639,10 +8656,6 @@ msgstr "邮箱账号" msgid "Mobile number" msgstr "手机号码" -#: users/templates/users/forgot_password.html:101 -msgid "Send" -msgstr "发送" - #: users/templates/users/forgot_password.html:105 #: users/templates/users/forgot_password_previewing.html:30 msgid "Submit" @@ -8652,19 +8665,15 @@ msgstr "提交" msgid "Please enter the username for which you want to retrieve the password" msgstr "请输入您需要找回密码的用户名" -#: users/templates/users/mfa_setting.html:24 -msgid "Enable MFA" -msgstr "启用 MFA 多因子认证" - -#: users/templates/users/mfa_setting.html:30 +#: users/templates/users/mfa_setting.html:124 msgid "MFA force enable, cannot disable" msgstr "MFA 已强制启用，无法禁用" -#: users/templates/users/mfa_setting.html:48 +#: users/templates/users/mfa_setting.html:143 msgid "MFA setting" msgstr "设置 MFA 多因子认证" -#: users/templates/users/mfa_setting.html:61 +#: users/templates/users/mfa_setting.html:171 msgid "Reset" msgstr "重置" @@ -8816,627 +8825,658 @@ msgstr "* 新密码不能是最近 {} 次的密码" msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面" -#: xpack.bak/apps.py:8 xpack/apps.py:8 +#: xpack/apps.py:8 msgid "XPACK" msgstr "XPack" -#: xpack.bak/exceptions.py:7 +#: xpack/exceptions.py:8 msgid "" -"The current task is not synchronized with unmatched policy assets, skipping" +"Based on the current task configuration, assets that do not match the " +"strategy will skipped." msgstr "" -#: xpack.bak/plugins/cloud/api.py:60 xpack/plugins/cloud/api.py:60 +#: xpack/plugins/cloud/api.py:65 msgid "Test connection successful" msgstr "测试成功" -#: xpack.bak/plugins/cloud/api.py:62 xpack/plugins/cloud/api.py:62 +#: xpack/plugins/cloud/api.py:67 msgid "Test connection failed: {}" msgstr "测试连接失败：{}" -#: xpack.bak/plugins/cloud/const.py:8 xpack/plugins/cloud/const.py:8 +#: xpack/plugins/cloud/const.py:8 msgid "Alibaba Cloud" msgstr "阿里云" -#: xpack.bak/plugins/cloud/const.py:9 xpack/plugins/cloud/const.py:9 +#: xpack/plugins/cloud/const.py:9 msgid "AWS (International)" msgstr "AWS (国际)" -#: xpack.bak/plugins/cloud/const.py:10 xpack/plugins/cloud/const.py:10 +#: xpack/plugins/cloud/const.py:10 msgid "AWS (China)" msgstr "AWS (中国)" -#: xpack.bak/plugins/cloud/const.py:11 xpack/plugins/cloud/const.py:11 +#: xpack/plugins/cloud/const.py:11 msgid "Azure (China)" msgstr "Azure (中国)" -#: xpack.bak/plugins/cloud/const.py:12 xpack/plugins/cloud/const.py:12 +#: xpack/plugins/cloud/const.py:12 msgid "Azure (International)" msgstr "Azure (国际)" -#: xpack.bak/plugins/cloud/const.py:14 xpack/plugins/cloud/const.py:14 +#: xpack/plugins/cloud/const.py:14 msgid "Baidu Cloud" msgstr "百度云" -#: xpack.bak/plugins/cloud/const.py:15 xpack/plugins/cloud/const.py:15 +#: xpack/plugins/cloud/const.py:15 msgid "JD Cloud" msgstr "京东云" -#: xpack.bak/plugins/cloud/const.py:16 xpack/plugins/cloud/const.py:16 +#: xpack/plugins/cloud/const.py:16 msgid "KingSoft Cloud" msgstr "金山云" -#: xpack.bak/plugins/cloud/const.py:17 xpack/plugins/cloud/const.py:17 +#: xpack/plugins/cloud/const.py:17 msgid "Tencent Cloud" msgstr "腾讯云" -#: xpack.bak/plugins/cloud/const.py:18 xpack/plugins/cloud/const.py:18 +#: xpack/plugins/cloud/const.py:18 msgid "Tencent Cloud (Lighthouse)" msgstr "腾讯云(轻量服务器应用)" -#: xpack.bak/plugins/cloud/const.py:19 xpack/plugins/cloud/const.py:19 +#: xpack/plugins/cloud/const.py:19 msgid "Google Cloud Platform" msgstr "谷歌云" -#: xpack.bak/plugins/cloud/const.py:20 xpack/plugins/cloud/const.py:20 +#: xpack/plugins/cloud/const.py:20 msgid "UCloud" msgstr "ucloud" -#: xpack.bak/plugins/cloud/const.py:21 xpack/plugins/cloud/const.py:21 +#: xpack/plugins/cloud/const.py:21 msgid "Volcengine" msgstr "火山引擎" -#: xpack.bak/plugins/cloud/const.py:23 xpack/plugins/cloud/const.py:23 +#: xpack/plugins/cloud/const.py:23 msgid "VMware" msgstr "VMware" -#: xpack.bak/plugins/cloud/const.py:24 -#: xpack.bak/plugins/cloud/providers/nutanix.py:15 #: xpack/plugins/cloud/const.py:24 xpack/plugins/cloud/providers/nutanix.py:15 msgid "Nutanix" msgstr "Nutanix" -#: xpack.bak/plugins/cloud/const.py:25 xpack/plugins/cloud/const.py:25 +#: xpack/plugins/cloud/const.py:25 msgid "Huawei Private Cloud" msgstr "华为私有云" -#: xpack.bak/plugins/cloud/const.py:26 xpack/plugins/cloud/const.py:26 +#: xpack/plugins/cloud/const.py:26 msgid "Qingyun Private Cloud" msgstr "青云私有云" -#: xpack.bak/plugins/cloud/const.py:27 xpack/plugins/cloud/const.py:27 +#: xpack/plugins/cloud/const.py:27 msgid "CTYun Private Cloud" msgstr "天翼私有云" -#: xpack.bak/plugins/cloud/const.py:28 xpack/plugins/cloud/const.py:28 +#: xpack/plugins/cloud/const.py:28 msgid "OpenStack" msgstr "OpenStack" -#: xpack.bak/plugins/cloud/const.py:29 -#: xpack.bak/plugins/cloud/providers/zstack.py:21 #: xpack/plugins/cloud/const.py:29 xpack/plugins/cloud/providers/zstack.py:21 msgid "ZStack" msgstr "ZStack" -#: xpack.bak/plugins/cloud/const.py:30 xpack/plugins/cloud/const.py:30 +#: xpack/plugins/cloud/const.py:30 msgid "Fusion Compute" msgstr "融合计算" -#: xpack.bak/plugins/cloud/const.py:31 xpack/plugins/cloud/const.py:31 +#: xpack/plugins/cloud/const.py:31 msgid "SCP" msgstr "深信服SCP" -#: xpack.bak/plugins/cloud/const.py:32 xpack/plugins/cloud/const.py:32 +#: xpack/plugins/cloud/const.py:32 msgid "Apsara Stack" msgstr "阿里云专有云" -#: xpack.bak/plugins/cloud/const.py:37 xpack/plugins/cloud/const.py:37 +#: xpack/plugins/cloud/const.py:37 msgid "Private IP" msgstr "私有IP" -#: xpack.bak/plugins/cloud/const.py:38 xpack/plugins/cloud/const.py:38 +#: xpack/plugins/cloud/const.py:38 msgid "Public IP" msgstr "公网IP" -#: xpack.bak/plugins/cloud/const.py:42 xpack.bak/plugins/cloud/models.py:299 -#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:299 +#: xpack/plugins/cloud/const.py:42 xpack/plugins/cloud/models.py:339 msgid "Instance name" msgstr "实例名称" -#: xpack.bak/plugins/cloud/const.py:43 xpack/plugins/cloud/const.py:43 +#: xpack/plugins/cloud/const.py:43 msgid "Instance name and Partial IP" msgstr "实例名称和部分IP" -#: xpack.bak/plugins/cloud/const.py:48 xpack/plugins/cloud/const.py:48 +#: xpack/plugins/cloud/const.py:48 msgid "Succeed" msgstr "成功" -#: xpack.bak/plugins/cloud/const.py:52 xpack/plugins/cloud/const.py:52 -#: xpack/plugins/cloud/manager.py:80 +#: xpack/plugins/cloud/const.py:52 xpack/plugins/cloud/manager.py:90 msgid "Unsync" msgstr "未同步" -#: xpack.bak/plugins/cloud/const.py:53 xpack/plugins/cloud/const.py:53 -#: xpack/plugins/cloud/manager.py:79 +#: xpack/plugins/cloud/const.py:53 xpack/plugins/cloud/manager.py:89 msgid "New Sync" msgstr "新同步" -#: xpack.bak/plugins/cloud/const.py:54 xpack/plugins/cloud/const.py:54 -#: xpack/plugins/cloud/manager.py:79 +#: xpack/plugins/cloud/const.py:54 xpack/plugins/cloud/manager.py:89 msgid "Synced" msgstr "已同步" -#: xpack.bak/plugins/cloud/const.py:55 xpack/plugins/cloud/const.py:55 -#: xpack/plugins/cloud/manager.py:80 +#: xpack/plugins/cloud/const.py:55 xpack/plugins/cloud/manager.py:90 msgid "Released" msgstr "已释放" -#: xpack.bak/plugins/cloud/const.py:59 xpack/plugins/cloud/const.py:59 +#: xpack/plugins/cloud/const.py:59 msgid "And" msgstr "与" -#: xpack.bak/plugins/cloud/const.py:60 xpack/plugins/cloud/const.py:60 +#: xpack/plugins/cloud/const.py:60 msgid "Or" msgstr "或" -#: xpack.bak/plugins/cloud/manager.py:55 -#: xpack.bak/plugins/cloud/providers/gcp.py:64 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:34 -#: xpack/plugins/cloud/manager.py:45 xpack/plugins/cloud/manager.py:55 -#: xpack/plugins/cloud/manager.py:57 xpack/plugins/cloud/providers/gcp.py:64 -#: xpack/plugins/cloud/providers/huaweicloud.py:34 -msgid "Account unavailable" -msgstr "账号无效" +#: xpack/plugins/cloud/const.py:64 +#, fuzzy +#| msgid "Synced Organization" +msgid "Sync region" +msgstr "已同步组织" -#: xpack.bak/plugins/cloud/meta.py:9 xpack/plugins/cloud/meta.py:9 +#: xpack/plugins/cloud/const.py:66 +#, fuzzy +#| msgid "Import" +msgid "Imported" +msgstr "导入" + +#: xpack/plugins/cloud/manager.py:47 +#, fuzzy, python-format +#| msgid "Task execution id" +msgid "Task \"%s\" starts executing" +msgstr "任务执行 ID" + +#: xpack/plugins/cloud/manager.py:81 +#, fuzzy +#| msgid "View details" +msgid "View the task details path: " +msgstr "查看详情" + +#: xpack/plugins/cloud/manager.py:84 +#, fuzzy +#| msgid "Account " +msgid "Account Details" +msgstr "账号" + +#: xpack/plugins/cloud/manager.py:85 +msgid "Synchronization History List" +msgstr "" + +#: xpack/plugins/cloud/manager.py:85 +msgid "Synchronization Instance List" +msgstr "" + +#: xpack/plugins/cloud/manager.py:93 +#, fuzzy +#| msgid "Task execution id" +msgid "Task execution completed" +msgstr "任务执行 ID" + +#: xpack/plugins/cloud/manager.py:97 +#, fuzzy +#| msgid "No user synchronization required" +msgid "Synchronization regions" +msgstr "没有用户需要同步" + +#: xpack/plugins/cloud/manager.py:115 +#, python-format +msgid "Get instances of region \"%s\" error, error: %s" +msgstr "" + +#: xpack/plugins/cloud/manager.py:157 +#, python-format +msgid "Failed to synchronize the instance \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:333 +#, python-format +msgid "" +"The updated platform of asset \"%s\" is inconsistent with the original " +"platform type. Skip platform and protocol updates" +msgstr "" + +#: xpack/plugins/cloud/manager.py:389 +#, fuzzy, python-format +#| msgid "Name already exists" +msgid "The asset \"%s\" already exists" +msgstr "名称已存在" + +#: xpack/plugins/cloud/manager.py:391 +#, fuzzy, python-format +#| msgid "Gather asset facts" +msgid "Update asset \"%s\"" +msgstr "收集资产信息" + +#: xpack/plugins/cloud/manager.py:394 +#, fuzzy, python-format +#| msgid "Asset has been disabled, skipped: {}" +msgid "Asset \"%s\" has been updated" +msgstr "资产已经被禁用, 跳过: {}" + +#: xpack/plugins/cloud/manager.py:404 +#, python-format +msgid "Prepare to create asset \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:425 +#, python-format +msgid "Set nodes \"%s\"" +msgstr "" + +#: xpack/plugins/cloud/manager.py:451 +#, fuzzy, python-format +#| msgid "Delete account: %s" +msgid "Set accounts \"%s\"" +msgstr "删除账号: %s" + +#: xpack/plugins/cloud/manager.py:467 +#, fuzzy, python-format +#| msgid "Image protocol" +msgid "Set protocols \"%s\"" +msgstr "镜像协议" + +#: xpack/plugins/cloud/manager.py:481 xpack/plugins/cloud/tasks.py:27 +msgid "Run sync instance task" +msgstr "执行同步实例任务" + +#: xpack/plugins/cloud/meta.py:9 msgid "Cloud center" msgstr "云管中心" -#: xpack.bak/plugins/cloud/models.py:37 -#: xpack.bak/plugins/cloud/serializers/account.py:68 -#: xpack/plugins/cloud/models.py:37 -#: xpack/plugins/cloud/serializers/account.py:69 +#: xpack/plugins/cloud/models.py:38 +#: xpack/plugins/cloud/serializers/account.py:93 msgid "Attrs" msgstr "属性" -#: xpack.bak/plugins/cloud/models.py:38 xpack/plugins/cloud/models.py:38 +#: xpack/plugins/cloud/models.py:39 msgid "Validity" msgstr "有效" -#: xpack.bak/plugins/cloud/models.py:43 xpack/plugins/cloud/models.py:43 +#: xpack/plugins/cloud/models.py:44 msgid "Cloud account" msgstr "云账号" -#: xpack.bak/plugins/cloud/models.py:45 xpack/plugins/cloud/models.py:45 +#: xpack/plugins/cloud/models.py:46 msgid "Test cloud account" msgstr "测试云账号" -#: xpack.bak/plugins/cloud/models.py:88 -#: xpack.bak/plugins/cloud/serializers/task.py:159 -#: xpack/plugins/cloud/models.py:88 xpack/plugins/cloud/serializers/task.py:160 +#: xpack/plugins/cloud/models.py:102 +#: xpack/plugins/cloud/serializers/account.py:77 +#: xpack/plugins/cloud/serializers/task.py:156 msgid "Regions" msgstr "地域" -#: xpack.bak/plugins/cloud/models.py:91 xpack/plugins/cloud/models.py:91 +#: xpack/plugins/cloud/models.py:105 msgid "Hostname strategy" msgstr "主机名策略" -#: xpack.bak/plugins/cloud/models.py:96 -#: xpack.bak/plugins/cloud/serializers/task.py:162 -#: xpack/plugins/cloud/models.py:96 xpack/plugins/cloud/serializers/task.py:163 +#: xpack/plugins/cloud/models.py:110 msgid "IP network segment group" msgstr "IP网段组" -#: xpack.bak/plugins/cloud/models.py:99 -#: xpack.bak/plugins/cloud/serializers/task.py:167 -#: xpack/plugins/cloud/models.py:99 xpack/plugins/cloud/serializers/task.py:168 +#: xpack/plugins/cloud/models.py:113 +#: xpack/plugins/cloud/serializers/task.py:159 msgid "Sync IP type" msgstr "同步IP类型" -#: xpack.bak/plugins/cloud/models.py:102 -#: xpack.bak/plugins/cloud/serializers/task.py:185 -#: xpack/plugins/cloud/models.py:102 -#: xpack/plugins/cloud/serializers/task.py:186 +#: xpack/plugins/cloud/models.py:116 msgid "Always update" msgstr "总是更新" -#: xpack.bak/plugins/cloud/models.py:104 xpack/plugins/cloud/models.py:104 +#: xpack/plugins/cloud/models.py:118 msgid "Fully synchronous" msgstr "完全同步" -#: xpack.bak/plugins/cloud/models.py:109 xpack/plugins/cloud/models.py:109 +#: xpack/plugins/cloud/models.py:123 msgid "Date last sync" msgstr "最后同步日期" -#: xpack.bak/plugins/cloud/models.py:112 xpack.bak/plugins/cloud/models.py:317 -#: xpack.bak/plugins/cloud/models.py:341 xpack/plugins/cloud/models.py:112 -#: xpack/plugins/cloud/models.py:317 xpack/plugins/cloud/models.py:341 +#: xpack/plugins/cloud/models.py:126 xpack/plugins/cloud/models.py:357 +#: xpack/plugins/cloud/models.py:383 msgid "Strategy" msgstr "策略" -#: xpack.bak/plugins/cloud/models.py:117 xpack.bak/plugins/cloud/models.py:196 -#: xpack/plugins/cloud/models.py:117 xpack/plugins/cloud/models.py:196 +#: xpack/plugins/cloud/models.py:131 xpack/plugins/cloud/models.py:212 msgid "Sync instance task" msgstr "同步实例任务" -#: xpack.bak/plugins/cloud/models.py:207 xpack.bak/plugins/cloud/models.py:259 -#: xpack/plugins/cloud/models.py:207 xpack/plugins/cloud/models.py:259 +#: xpack/plugins/cloud/models.py:223 xpack/plugins/cloud/models.py:275 msgid "Date sync" msgstr "同步日期" -#: xpack.bak/plugins/cloud/models.py:211 xpack/plugins/cloud/models.py:211 +#: xpack/plugins/cloud/models.py:227 msgid "Sync instance snapshot" msgstr "同步实例快照" -#: xpack.bak/plugins/cloud/models.py:215 xpack/plugins/cloud/models.py:215 +#: xpack/plugins/cloud/models.py:231 msgid "Sync instance task execution" msgstr "同步实例任务执行" -#: xpack.bak/plugins/cloud/models.py:239 xpack/plugins/cloud/models.py:239 +#: xpack/plugins/cloud/models.py:255 msgid "Sync task" msgstr "同步任务" -#: xpack.bak/plugins/cloud/models.py:243 xpack/plugins/cloud/models.py:243 +#: xpack/plugins/cloud/models.py:259 msgid "Sync instance task history" msgstr "同步实例任务历史" -#: xpack.bak/plugins/cloud/models.py:246 xpack/plugins/cloud/models.py:246 +#: xpack/plugins/cloud/models.py:262 msgid "Instance" msgstr "实例" -#: xpack.bak/plugins/cloud/models.py:263 xpack/plugins/cloud/models.py:263 +#: xpack/plugins/cloud/models.py:279 msgid "Sync instance detail" msgstr "同步实例详情" -#: xpack.bak/plugins/cloud/models.py:275 -#: xpack.bak/plugins/cloud/serializers/task.py:72 -#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/serializers/task.py:73 +#: xpack/plugins/cloud/models.py:291 xpack/plugins/cloud/serializers/task.py:76 msgid "Rule relation" msgstr "条件关系" -#: xpack.bak/plugins/cloud/models.py:284 xpack/plugins/cloud/models.py:284 +#: xpack/plugins/cloud/models.py:301 msgid "Task strategy" msgstr "任务策略" -#: xpack.bak/plugins/cloud/models.py:288 xpack/plugins/cloud/models.py:288 +#: xpack/plugins/cloud/models.py:328 msgid "Equal" msgstr "等于" -#: xpack.bak/plugins/cloud/models.py:289 xpack/plugins/cloud/models.py:289 +#: xpack/plugins/cloud/models.py:329 msgid "Not Equal" msgstr "不等于" -#: xpack.bak/plugins/cloud/models.py:290 xpack/plugins/cloud/models.py:290 +#: xpack/plugins/cloud/models.py:330 msgid "In" msgstr "在...中" -#: xpack.bak/plugins/cloud/models.py:291 xpack/plugins/cloud/models.py:291 +#: xpack/plugins/cloud/models.py:331 msgid "Contains" msgstr "包含" -#: xpack.bak/plugins/cloud/models.py:292 xpack/plugins/cloud/models.py:292 +#: xpack/plugins/cloud/models.py:332 msgid "Exclude" msgstr "排除" -#: xpack.bak/plugins/cloud/models.py:293 xpack/plugins/cloud/models.py:293 +#: xpack/plugins/cloud/models.py:333 msgid "Startswith" msgstr "以...开头" -#: xpack.bak/plugins/cloud/models.py:294 xpack/plugins/cloud/models.py:294 +#: xpack/plugins/cloud/models.py:334 msgid "Endswith" msgstr "以...结尾" -#: xpack.bak/plugins/cloud/models.py:300 xpack/plugins/cloud/models.py:300 +#: xpack/plugins/cloud/models.py:340 msgid "Instance platform" msgstr "实例平台" -#: xpack.bak/plugins/cloud/models.py:301 xpack/plugins/cloud/models.py:301 +#: xpack/plugins/cloud/models.py:341 msgid "Instance address" msgstr "实例地址" -#: xpack.bak/plugins/cloud/models.py:308 xpack/plugins/cloud/models.py:308 +#: xpack/plugins/cloud/models.py:348 msgid "Rule attr" msgstr "规则属性" -#: xpack.bak/plugins/cloud/models.py:312 xpack/plugins/cloud/models.py:312 +#: xpack/plugins/cloud/models.py:352 msgid "Rule match" msgstr "规则匹配" -#: xpack.bak/plugins/cloud/models.py:314 xpack/plugins/cloud/models.py:314 +#: xpack/plugins/cloud/models.py:354 msgid "Rule value" msgstr "规则值" -#: xpack.bak/plugins/cloud/models.py:321 -#: xpack.bak/plugins/cloud/serializers/task.py:75 -#: xpack/plugins/cloud/models.py:321 xpack/plugins/cloud/serializers/task.py:76 +#: xpack/plugins/cloud/models.py:361 xpack/plugins/cloud/serializers/task.py:79 msgid "Strategy rule" msgstr "条件" -#: xpack.bak/plugins/cloud/models.py:336 xpack/plugins/cloud/models.py:336 +#: xpack/plugins/cloud/models.py:371 +#, fuzzy +#| msgid "Hostname strategy" +msgid "Name strategy" +msgstr "主机名策略" + +#: xpack/plugins/cloud/models.py:378 msgid "Action attr" msgstr "动作属性" -#: xpack.bak/plugins/cloud/models.py:338 xpack/plugins/cloud/models.py:338 +#: xpack/plugins/cloud/models.py:380 msgid "Action value" msgstr "动作值" -#: xpack.bak/plugins/cloud/models.py:345 -#: xpack.bak/plugins/cloud/serializers/task.py:78 -#: xpack/plugins/cloud/models.py:345 xpack/plugins/cloud/serializers/task.py:79 +#: xpack/plugins/cloud/models.py:387 xpack/plugins/cloud/serializers/task.py:82 msgid "Strategy action" msgstr "动作" -#: xpack.bak/plugins/cloud/providers/aws_international.py:18 #: xpack/plugins/cloud/providers/aws_international.py:18 msgid "China (Beijing)" msgstr "中国 (北京)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:19 #: xpack/plugins/cloud/providers/aws_international.py:19 msgid "China (Ningxia)" msgstr "中国 (宁夏)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:22 #: xpack/plugins/cloud/providers/aws_international.py:22 msgid "US East (Ohio)" msgstr "美国东部 (俄亥俄州)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:23 #: xpack/plugins/cloud/providers/aws_international.py:23 msgid "US East (N. Virginia)" msgstr "美国东部 (弗吉尼亚北部)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:24 #: xpack/plugins/cloud/providers/aws_international.py:24 msgid "US West (N. California)" msgstr "美国西部 (加利福尼亚北部)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:25 #: xpack/plugins/cloud/providers/aws_international.py:25 msgid "US West (Oregon)" msgstr "美国西部 (俄勒冈)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:26 #: xpack/plugins/cloud/providers/aws_international.py:26 msgid "Africa (Cape Town)" msgstr "非洲 (开普敦)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:27 #: xpack/plugins/cloud/providers/aws_international.py:27 msgid "Asia Pacific (Hong Kong)" msgstr "亚太地区 (香港)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:28 #: xpack/plugins/cloud/providers/aws_international.py:28 msgid "Asia Pacific (Mumbai)" msgstr "亚太地区 (孟买)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:29 #: xpack/plugins/cloud/providers/aws_international.py:29 msgid "Asia Pacific (Osaka-Local)" msgstr "亚太区域 (大阪当地)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:30 #: xpack/plugins/cloud/providers/aws_international.py:30 msgid "Asia Pacific (Seoul)" msgstr "亚太区域 (首尔)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:31 #: xpack/plugins/cloud/providers/aws_international.py:31 msgid "Asia Pacific (Singapore)" msgstr "亚太区域 (新加坡)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:32 #: xpack/plugins/cloud/providers/aws_international.py:32 msgid "Asia Pacific (Sydney)" msgstr "亚太区域 (悉尼)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:33 #: xpack/plugins/cloud/providers/aws_international.py:33 msgid "Asia Pacific (Tokyo)" msgstr "亚太区域 (东京)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:34 #: xpack/plugins/cloud/providers/aws_international.py:34 msgid "Canada (Central)" msgstr "加拿大 (中部)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:35 #: xpack/plugins/cloud/providers/aws_international.py:35 msgid "Europe (Frankfurt)" msgstr "欧洲 (法兰克福)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:36 #: xpack/plugins/cloud/providers/aws_international.py:36 msgid "Europe (Ireland)" msgstr "欧洲 (爱尔兰)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:37 #: xpack/plugins/cloud/providers/aws_international.py:37 msgid "Europe (London)" msgstr "欧洲 (伦敦)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:38 #: xpack/plugins/cloud/providers/aws_international.py:38 msgid "Europe (Milan)" msgstr "欧洲 (米兰)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:39 #: xpack/plugins/cloud/providers/aws_international.py:39 msgid "Europe (Paris)" msgstr "欧洲 (巴黎)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:40 #: xpack/plugins/cloud/providers/aws_international.py:40 msgid "Europe (Stockholm)" msgstr "欧洲 (斯德哥尔摩)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:41 #: xpack/plugins/cloud/providers/aws_international.py:41 msgid "Middle East (Bahrain)" msgstr "中东 (巴林)" -#: xpack.bak/plugins/cloud/providers/aws_international.py:42 #: xpack/plugins/cloud/providers/aws_international.py:42 msgid "South America (São Paulo)" msgstr "南美洲 (圣保罗)" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:56 -#: xpack.bak/plugins/cloud/providers/jdcloud.py:125 #: xpack/plugins/cloud/providers/baiducloud.py:56 #: xpack/plugins/cloud/providers/jdcloud.py:125 msgid "CN North-Beijing" msgstr "华北-北京" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:57 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:47 -#: xpack.bak/plugins/cloud/providers/jdcloud.py:128 #: xpack/plugins/cloud/providers/baiducloud.py:57 #: xpack/plugins/cloud/providers/huaweicloud.py:47 #: xpack/plugins/cloud/providers/jdcloud.py:128 msgid "CN South-Guangzhou" msgstr "华南-广州" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:58 #: xpack/plugins/cloud/providers/baiducloud.py:58 msgid "CN East-Suzhou" msgstr "华东-苏州" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:59 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:54 #: xpack/plugins/cloud/providers/baiducloud.py:59 #: xpack/plugins/cloud/providers/huaweicloud.py:54 msgid "CN-Hong Kong" msgstr "中国-香港" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:60 #: xpack/plugins/cloud/providers/baiducloud.py:60 msgid "CN Center-Wuhan" msgstr "华中-武汉" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:61 #: xpack/plugins/cloud/providers/baiducloud.py:61 msgid "CN North-Baoding" msgstr "华北-保定" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:62 -#: xpack.bak/plugins/cloud/providers/jdcloud.py:127 #: xpack/plugins/cloud/providers/baiducloud.py:62 #: xpack/plugins/cloud/providers/jdcloud.py:127 msgid "CN East-Shanghai" msgstr "华东-上海" -#: xpack.bak/plugins/cloud/providers/baiducloud.py:63 -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:56 #: xpack/plugins/cloud/providers/baiducloud.py:63 #: xpack/plugins/cloud/providers/huaweicloud.py:56 msgid "AP-Singapore" msgstr "亚太-新加坡" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:44 +#: xpack/plugins/cloud/providers/gcp.py:64 +#: xpack/plugins/cloud/providers/huaweicloud.py:34 +msgid "Account unavailable" +msgstr "账号无效" + #: xpack/plugins/cloud/providers/huaweicloud.py:44 msgid "CN North-Beijing1" msgstr "华北-北京1" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:45 #: xpack/plugins/cloud/providers/huaweicloud.py:45 msgid "CN North-Beijing4" msgstr "华北-北京4" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:46 #: xpack/plugins/cloud/providers/huaweicloud.py:46 msgid "CN North-Ulanqab1" msgstr "华北-乌兰察布一" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:48 #: xpack/plugins/cloud/providers/huaweicloud.py:48 msgid "CN South-Shenzhen" msgstr "华南-广州" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:49 #: xpack/plugins/cloud/providers/huaweicloud.py:49 msgid "CN South-Guangzhou-InvitationOnly" msgstr "华南-广州-友好用户环境" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:50 #: xpack/plugins/cloud/providers/huaweicloud.py:50 msgid "CN East-Shanghai2" msgstr "华东-上海2" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:51 #: xpack/plugins/cloud/providers/huaweicloud.py:51 msgid "CN East-Shanghai1" msgstr "华东-上海1" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:53 #: xpack/plugins/cloud/providers/huaweicloud.py:53 msgid "CN Southwest-Guiyang1" msgstr "西南-贵阳1" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:55 #: xpack/plugins/cloud/providers/huaweicloud.py:55 msgid "AP-Bangkok" msgstr "亚太-曼谷" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:58 #: xpack/plugins/cloud/providers/huaweicloud.py:58 msgid "AF-Johannesburg" msgstr "非洲-约翰内斯堡" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:59 #: xpack/plugins/cloud/providers/huaweicloud.py:59 msgid "LA-Mexico City1" msgstr "拉美-墨西哥城一" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:60 #: xpack/plugins/cloud/providers/huaweicloud.py:60 msgid "LA-Santiago" msgstr "拉美-圣地亚哥" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:61 #: xpack/plugins/cloud/providers/huaweicloud.py:61 msgid "LA-Sao Paulo1" msgstr "拉美-圣保罗一" -#: xpack.bak/plugins/cloud/providers/huaweicloud.py:63 #: xpack/plugins/cloud/providers/huaweicloud.py:63 msgid "TR-Istanbul" msgstr "TR-Istanbul" -#: xpack.bak/plugins/cloud/providers/jdcloud.py:126 #: xpack/plugins/cloud/providers/jdcloud.py:126 msgid "CN East-Suqian" msgstr "华东-宿迁" -#: xpack.bak/plugins/cloud/serializers/account.py:69 -#: xpack/plugins/cloud/serializers/account.py:70 +#: xpack/plugins/cloud/providers/lan.py:79 +#, python-format +msgid "Port \"%(port)s\" of instance IP \"%(ip)s\" is not reachable" +msgstr "" + +#: xpack/plugins/cloud/serializers/account.py:94 msgid "Validity display" msgstr "有效性显示" -#: xpack.bak/plugins/cloud/serializers/account.py:70 -#: xpack/plugins/cloud/serializers/account.py:71 +#: xpack/plugins/cloud/serializers/account.py:95 msgid "Provider display" msgstr "服务商显示" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:17 #: xpack/plugins/cloud/serializers/account_attrs.py:17 msgid "Access key id" msgstr "Access key id" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:41 #: xpack/plugins/cloud/serializers/account_attrs.py:41 msgid "Tenant ID" msgstr "租户 ID" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:44 #: xpack/plugins/cloud/serializers/account_attrs.py:44 msgid "Subscription ID" msgstr "订阅 ID" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:98 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:102 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:126 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:156 -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:206 #: xpack/plugins/cloud/serializers/account_attrs.py:98 #: xpack/plugins/cloud/serializers/account_attrs.py:102 #: xpack/plugins/cloud/serializers/account_attrs.py:126 @@ -9445,52 +9485,42 @@ msgstr "订阅 ID" msgid "API Endpoint" msgstr "API 端点" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:108 #: xpack/plugins/cloud/serializers/account_attrs.py:108 msgid "Auth url" msgstr "认证地址" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:109 #: xpack/plugins/cloud/serializers/account_attrs.py:109 msgid "eg: http://openstack.example.com:5000/v3" msgstr "如: http://openstack.example.com:5000/v3" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:112 #: xpack/plugins/cloud/serializers/account_attrs.py:112 msgid "User domain" msgstr "用户域" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:127 #: xpack/plugins/cloud/serializers/account_attrs.py:127 msgid "Cert File" msgstr "证书文件" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:128 #: xpack/plugins/cloud/serializers/account_attrs.py:128 msgid "Key File" msgstr "密钥文件" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:144 #: xpack/plugins/cloud/serializers/account_attrs.py:144 msgid "Service account key" msgstr "服务账号密钥" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:145 #: xpack/plugins/cloud/serializers/account_attrs.py:145 msgid "The file is in JSON format" msgstr "JSON 格式的文件" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:163 #: xpack/plugins/cloud/serializers/account_attrs.py:163 msgid "IP address invalid `{}`, {}" msgstr "IP 地址无效: `{}`, {}" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:179 #: xpack/plugins/cloud/serializers/account_attrs.py:179 msgid "Such as: 192.168.1.0/24, 10.0.0.0-10.0.0.255" msgstr "例: 192.168.1.0/24,10.0.0.0-10.0.0.255" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:182 #: xpack/plugins/cloud/serializers/account_attrs.py:182 msgid "" "The port is used to detect the validity of the IP address. When the " @@ -9500,248 +9530,47 @@ msgstr "" "端口用来检测 IP 地址的有效性，在同步任务执行时，只会同步有效的 IP 地址。
" "如果端口为 0，则表示所有 IP 地址均有效。" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:190 #: xpack/plugins/cloud/serializers/account_attrs.py:190 msgid "Hostname prefix" msgstr "主机名前缀" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:193 #: xpack/plugins/cloud/serializers/account_attrs.py:193 msgid "IP segment" msgstr "IP 网段" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:197 #: xpack/plugins/cloud/serializers/account_attrs.py:197 msgid "Test port" msgstr "测试端口" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:200 #: xpack/plugins/cloud/serializers/account_attrs.py:200 msgid "Test timeout" msgstr "测试超时时间" -#: xpack.bak/plugins/cloud/serializers/account_attrs.py:216 #: xpack/plugins/cloud/serializers/account_attrs.py:216 msgid "Project" msgstr "project" -#: xpack.bak/plugins/cloud/serializers/task.py:151 -#: xpack/plugins/cloud/serializers/task.py:152 -msgid "" -"Only instances matching the IP range will be synced.
If the instance " -"contains multiple IP addresses, the first IP address that matches will be " -"used as the IP for the created asset.
The default value of * means sync " -"all instances and randomly match IP addresses.
Such as: 192.168.1.0/24, " -"10.1.1.1-10.1.1.20" -msgstr "" -"只有匹配到 IP 段的实例会被同步。
如果实例包含多个 IP 地址，那么第一个匹配" -"到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机匹配 " -"IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。" - -#: xpack.bak/plugins/cloud/serializers/task.py:157 -#: xpack/plugins/cloud/serializers/task.py:158 +#: xpack/plugins/cloud/serializers/task.py:154 msgid "History count" msgstr "执行次数" -#: xpack.bak/plugins/cloud/serializers/task.py:158 -#: xpack/plugins/cloud/serializers/task.py:159 +#: xpack/plugins/cloud/serializers/task.py:155 msgid "Instance count" msgstr "实例个数" -#: xpack.bak/plugins/cloud/tasks.py:27 xpack/plugins/cloud/tasks.py:27 -msgid "Run sync instance task" -msgstr "执行同步实例任务" - -#: xpack.bak/plugins/cloud/tasks.py:41 xpack/plugins/cloud/tasks.py:41 +#: xpack/plugins/cloud/tasks.py:41 msgid "Period clean sync instance task execution" msgstr "定期清除同步实例任务执行记录" -#: xpack.bak/plugins/interface/api.py:52 xpack/plugins/interface/api.py:52 +#: xpack/plugins/interface/api.py:52 msgid "Restore default successfully." msgstr "恢复默认成功！" -#: xpack.bak/plugins/interface/meta.py:9 xpack/plugins/interface/meta.py:9 -#: xpack/plugins/interface/models.py:45 xpack/plugins/interface/models.py:86 +#: xpack/plugins/interface/meta.py:9 xpack/plugins/interface/models.py:45 +#: xpack/plugins/interface/models.py:86 msgid "Interface settings" msgstr "界面设置" -#: xpack.bak/plugins/interface/models.py:23 -msgid "Title of login page" -msgstr "登录页标题" - -#: xpack.bak/plugins/interface/models.py:27 -msgid "Image of login page" -msgstr "登录页图片" - -#: xpack.bak/plugins/interface/models.py:31 -#: xpack/plugins/interface/models.py:31 -msgid "Website icon" -msgstr "网站图标" - -#: xpack.bak/plugins/interface/models.py:35 -msgid "Logo of management page" -msgstr "管理页面 Logo" - -#: xpack.bak/plugins/interface/models.py:39 -msgid "Logo of logout page" -msgstr "退出页面小 Logo" - -#: xpack.bak/plugins/interface/models.py:41 -#: xpack/plugins/interface/models.py:41 -#: xpack/plugins/interface/serializers/interface.py:26 -msgid "Theme" -msgstr "主题" - -#: xpack.bak/plugins/interface/models.py:42 -#: xpack/plugins/interface/models.py:42 -msgid "Footer content" -msgstr "页脚内容" - -#: xpack.bak/plugins/interface/models.py:45 -#: xpack.bak/plugins/interface/models.py:86 -msgid "Interface setting" -msgstr "界面设置" - -#: xpack.bak/plugins/license/api.py:52 xpack/plugins/license/api.py:52 -msgid "License import successfully" -msgstr "许可证导入成功" - -#: xpack.bak/plugins/license/api.py:53 -msgid "License is invalid" -msgstr "无效的许可证" - -#: xpack.bak/plugins/license/meta.py:10 xpack.bak/plugins/license/models.py:144 -#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:144 -msgid "License" -msgstr "许可证" - -#: xpack.bak/plugins/license/models.py:80 xpack/plugins/license/models.py:80 -msgid "Basic edition" -msgstr "企业基础版" - -#: xpack.bak/plugins/license/models.py:82 xpack/plugins/license/models.py:82 -msgid "Standard edition" -msgstr "企业标准版" - -#: xpack.bak/plugins/license/models.py:84 xpack/plugins/license/models.py:84 -msgid "Professional edition" -msgstr "企业专业版" - -#: xpack.bak/plugins/license/models.py:86 xpack/plugins/license/models.py:86 -msgid "Ultimate edition" -msgstr "企业旗舰版" - -#: xpack/exceptions.py:8 -msgid "" -"Based on the current task configuration, assets that do not match the " -"strategy will skipped." -msgstr "" - -#: xpack/plugins/cloud/manager.py:41 -#, fuzzy, python-format -#| msgid "Task execution id" -msgid "Task \"%s\" starts executing" -msgstr "任务执行 ID" - -#: xpack/plugins/cloud/manager.py:71 -#, fuzzy -#| msgid "View details" -msgid "View the task details path: " -msgstr "查看详情" - -#: xpack/plugins/cloud/manager.py:74 -#, fuzzy -#| msgid "Account " -msgid "Account Details" -msgstr "账号" - -#: xpack/plugins/cloud/manager.py:75 -msgid "Synchronization History List" -msgstr "" - -#: xpack/plugins/cloud/manager.py:75 -msgid "Synchronization Instance List" -msgstr "" - -#: xpack/plugins/cloud/manager.py:83 -#, fuzzy -#| msgid "Task execution id" -msgid "Task execution completed" -msgstr "任务执行 ID" - -#: xpack/plugins/cloud/manager.py:87 -#, fuzzy -#| msgid "No user synchronization required" -msgid "Synchronization regions" -msgstr "没有用户需要同步" - -#: xpack/plugins/cloud/manager.py:110 -#, python-format -msgid "Get instances of region \"%s\" error, error: %s" -msgstr "" - -#: xpack/plugins/cloud/manager.py:128 -#, python-format -msgid "The instance IP \"%s\" is not in network segment \"%s\"" -msgstr "" - -#: xpack/plugins/cloud/manager.py:164 -#, python-format -msgid "Failed to synchronize the instance \"%s\"" -msgstr "" - -#: xpack/plugins/cloud/manager.py:316 -#, python-format -msgid "" -"The updated platform of asset \"%s\" is inconsistent with the original " -"platform type. Skip platform and protocol updates" -msgstr "" - -#: xpack/plugins/cloud/manager.py:358 -#, fuzzy, python-format -#| msgid "Name already exists" -msgid "The asset \"%s\" already exists" -msgstr "名称已存在" - -#: xpack/plugins/cloud/manager.py:362 -#, fuzzy, python-format -#| msgid "Gather asset facts" -msgid "Update asset \"%s\"" -msgstr "收集资产信息" - -#: xpack/plugins/cloud/manager.py:365 -#, fuzzy, python-format -#| msgid "Asset has been disabled, skipped: {}" -msgid "Asset \"%s\" has been updated" -msgstr "资产已经被禁用, 跳过: {}" - -#: xpack/plugins/cloud/manager.py:376 -#, python-format -msgid "Prepare to create asset \"%s\"" -msgstr "" - -#: xpack/plugins/cloud/manager.py:388 -#, python-format -msgid "Set nodes \"%s\"" -msgstr "" - -#: xpack/plugins/cloud/manager.py:414 -#, fuzzy, python-format -#| msgid "Delete account: %s" -msgid "Set accounts \"%s\"" -msgstr "删除账号: %s" - -#: xpack/plugins/cloud/manager.py:430 -#, fuzzy, python-format -#| msgid "Image protocol" -msgid "Set protocols \"%s\"" -msgstr "镜像协议" - -#: xpack/plugins/cloud/providers/lan.py:79 -#, python-format -msgid "Port \"%(port)s\" of instance IP \"%(ip)s\" is not reachable" -msgstr "" - #: xpack/plugins/interface/models.py:23 msgid "Login title" msgstr "登录页面标题" @@ -9750,6 +9579,10 @@ msgstr "登录页面标题" msgid "Login image" msgstr "登录页面图片" +#: xpack/plugins/interface/models.py:31 +msgid "Website icon" +msgstr "网站图标" + #: xpack/plugins/interface/models.py:35 msgid "Index logo" msgstr "管理页面 Logo" @@ -9760,6 +9593,15 @@ msgstr "管理页面 Logo" msgid "Logout logo" msgstr "注销登录" +#: xpack/plugins/interface/models.py:41 +#: xpack/plugins/interface/serializers/interface.py:26 +msgid "Theme" +msgstr "主题" + +#: xpack/plugins/interface/models.py:42 +msgid "Footer content" +msgstr "页脚内容" + #: xpack/plugins/interface/serializers/interface.py:37 msgid "Wide logo on top" msgstr "顶部宽 Logo" @@ -9768,12 +9610,74 @@ msgstr "顶部宽 Logo" msgid "Small logo without text" msgstr "方形小 Logo" +#: xpack/plugins/license/api.py:52 +msgid "License import successfully" +msgstr "许可证导入成功" + #: xpack/plugins/license/api.py:53 #, fuzzy #| msgid "Invalid ip" msgid "Invalid license" msgstr "无效 IP" +#: xpack/plugins/license/meta.py:10 xpack/plugins/license/models.py:144 +msgid "License" +msgstr "许可证" + +#: xpack/plugins/license/models.py:80 +msgid "Basic edition" +msgstr "企业基础版" + +#: xpack/plugins/license/models.py:82 +msgid "Standard edition" +msgstr "企业标准版" + +#: xpack/plugins/license/models.py:84 +msgid "Professional edition" +msgstr "企业专业版" + +#: xpack/plugins/license/models.py:86 +msgid "Ultimate edition" +msgstr "企业旗舰版" + +#~ msgid "Send verification code" +#~ msgstr "发送验证码" + +#~ msgid "Session ID" +#~ msgstr "会话ID" + +#~ msgid "Enable MFA" +#~ msgstr "启用 MFA 多因子认证" + +#~ msgid "" +#~ "Only instances matching the IP range will be synced.
If the instance " +#~ "contains multiple IP addresses, the first IP address that matches will be " +#~ "used as the IP for the created asset.
The default value of * means " +#~ "sync all instances and randomly match IP addresses.
Such as: " +#~ "192.168.1.0/24, 10.1.1.1-10.1.1.20" +#~ msgstr "" +#~ "只有匹配到 IP 段的实例会被同步。
如果实例包含多个 IP 地址，那么第一个匹" +#~ "配到的 IP 地址将被用作创建的资产的 IP。
默认值 * 表示同步所有实例和随机" +#~ "匹配 IP 地址。
例如: 192.168.1.0/24,10.1.1.1-10.1.1.20。" + +#~ msgid "Title of login page" +#~ msgstr "登录页标题" + +#~ msgid "Image of login page" +#~ msgstr "登录页图片" + +#~ msgid "Logo of management page" +#~ msgstr "管理页面 Logo" + +#~ msgid "Logo of logout page" +#~ msgstr "退出页面小 Logo" + +#~ msgid "Interface setting" +#~ msgstr "界面设置" + +#~ msgid "License is invalid" +#~ msgstr "无效的许可证" + #~ msgid "Labels" #~ msgstr "标签" @@ -9979,9 +9883,6 @@ msgstr "无效 IP" #~ msgid "Reopen" #~ msgstr "重新打开" -#~ msgid "New file encryption password" -#~ msgstr "文件加密密码" - #~ msgid "Confirm file encryption password" #~ msgstr "确认文件加密密码" diff --git a/apps/i18n/koko/en.json b/apps/i18n/koko/en.json new file mode 100644 index 000000000..8b26b103d --- /dev/null +++ b/apps/i18n/koko/en.json @@ -0,0 +1,52 @@ +{ + "ShareUser": "ForUser", + "ShareUserHelpText": "If left blank, everyone could join the session.", + "GetShareUser": "Enter username", + "UploadSuccess": "Upload success", + "MustSelectOneFile": "Must select one file", + "MustOneFile": "Only support to select one file", + "DownloadSuccess": "Download success", + "Download": "Download", + "Upload": "Upload", + "Cancel": "Cancel", + "UploadTitle": "file upload", + "UploadTips": "Drag file here or click to upload", + "Share": "Share", + "CopyShareURLSuccess": "Copy Share URL Success", + "ThemeConfig": "Theme", + "OnlineUsers": "Online Users", + "User": "User", + "VerifyCode": "Verify Code", + "LinkAddr": "Link", + "ExpiredTime": "Expired", + "SelectAction": "Select", + "CreateSuccess": "Success", + "CreateLink": "Create Share Link", + "CopyLink": "Copy Link Address and Code", + "NoLink": "No Link", + "ConfirmBtn": "Confirm", + "Settings": "Settings", + "Theme": "Theme", + "SelectTheme": "Select Theme", + "ThemeColors": "Theme Colors", + "ExceedTransferSize": "exceed max transfer size", + "WaitFileTransfer": "Wait file transfer to finish", + "EndFileTransfer": "File transfer end", + "ReadOnly": "Read-Only", + "Writable" : "Writable", + "ActionPerm": "Actions", + "Self": "Self", + "RemoveShareUser": "You have been removed from the shared session.", + "JoinShare": "Join Session", + "LeaveShare": "Leave Session", + "Remove": "Remove", + "RemoveShareUserConfirm": "Are you sure to remove the user from the shared session?", + "Minute": "Minute", + "Minutes": "Minutes", + "PauseSession" : "Pause Session", + "ResumeSession" : "Resume Session", + "SyncUserPreferenceSuccess": "Sync user preference success", + "SyncUserPreferenceFailed": "Sync user preference failed", + "Sync": "Sync", + "InputVerifyCode": "Input Verify Code" +} diff --git a/apps/i18n/koko/ja.json b/apps/i18n/koko/ja.json new file mode 100644 index 000000000..6a27280b6 --- /dev/null +++ b/apps/i18n/koko/ja.json @@ -0,0 +1,52 @@ +{ + "ShareUser": "共有ユーザー", + "ShareUserHelpText": "ユーザーが選択されていません。つまり、すべての人が参加できます。", + "GetShareUser": "ユーザー名の入力", + "UploadSuccess": "アップロード成功", + "MustSelectOneFile": "ファイルを選択する必要があります", + "MustOneFile": "ファイルを1つだけ選択できます", + "DownloadSuccess": "ダウンロードに成功しました", + "Download": "ダウンロード", + "Upload": "アップロード", + "Cancel": "キャンセル", + "UploadTitle": "ファイルのアップロード", + "UploadTips": "ファイルをここにドラッグするか、アップロードをクリックします", + "Share": "シェア", + "CopyShareURLSuccess": "レプリケーション共有住所成功", + "ThemeConfig": "テーマ", + "OnlineUsers": "オンラインスタッフ", + "User": "ユーザー", + "VerifyCode": "認証コード", + "LinkAddr": "リンク先", + "ExpiredTime": "有効期限", + "SelectAction": "選択してください", + "CreateSuccess": "作成に成功しました", + "CreateLink": "シェアリンクの作成", + "CopyLink": "リンクと認証コードのコピー", + "NoLink": "住所なし", + "ConfirmBtn": "確定", + "Settings": "設定", + "Theme": "テーマ", + "SelectTheme": "テーマを選択してください", + "ThemeColors": "テーマカラー", + "ExceedTransferSize": "最大転送サイズを超えています", + "WaitFileTransfer": "ファイル転送終了待ち", + "EndFileTransfer": "ファイル転送終了", + "ReadOnly": "読み取り専用", + "Writable" : "書き込み可能", + "ActionPerm": "アクション権限", + "Self": "自分", + "RemoveShareUser": "あなたはすでに共有セッションから削除されました」という意味です", + "JoinShare": "共有セッションに参加", + "LeaveShare": "共有セッションから退出", + "Remove": "削除", + "RemoveShareUserConfirm": "共有セッションから削除してもよろしいですか？", + "Minute": "分間", + "Minutes": "分間", + "PauseSession" : "セッションを一時停止", + "ResumeSession" : "セッションを再開", + "SyncUserPreferenceSuccess": "ユーザー設定の同期に成功しました", + "SyncUserPreferenceFailed": "ユーザー設定の同期に失敗しました", + "Sync": "同期", + "InputVerifyCode": "認証コードを入力してください" +} diff --git a/apps/i18n/koko/zh.json b/apps/i18n/koko/zh.json new file mode 100644 index 000000000..880b7decd --- /dev/null +++ b/apps/i18n/koko/zh.json @@ -0,0 +1,52 @@ +{ + "ShareUser": "分享用户", + "ShareUserHelpText": "未选择用户，即允许所有人加入", + "GetShareUser": "输入用户名", + "UploadSuccess": "上传成功", + "MustSelectOneFile": "必须选择一个文件", + "MustOneFile": "只能选择一个文件", + "DownloadSuccess": "下载成功", + "Download": "下载", + "Upload": "上传", + "Cancel": "取消", + "UploadTitle": "上传文件", + "UploadTips": "将文件拖到此处，或点击上传", + "Share": "分享", + "CopyShareURLSuccess": "复制分享地址成功", + "ThemeConfig": "主题", + "OnlineUsers": "在线人员", + "User": "用户", + "VerifyCode": "验证码", + "LinkAddr": "链接地址", + "ExpiredTime": "有效期限", + "SelectAction": "请选择", + "CreateSuccess": "创建成功", + "CreateLink": "创建分享链接", + "CopyLink": "复制链接及验证码", + "NoLink": "无地址", + "ConfirmBtn": "确定", + "Settings": "设置", + "Theme": "主题", + "SelectTheme": "请选择主题", + "ThemeColors": "主题颜色", + "ExceedTransferSize": "超过最大传输大小", + "WaitFileTransfer": "等待文件传输结束", + "EndFileTransfer": "文件传输结束", + "ReadOnly": "只读", + "Writable" : "读写", + "ActionPerm": "操作权限", + "Self": "我", + "RemoveShareUser": "你已经被移除共享会话", + "JoinShare": "加入共享", + "LeaveShare": "离开共享", + "Remove": "移除", + "RemoveShareUserConfirm": "确定要移除该用户吗？", + "Minute": "分钟", + "Minutes": "分钟", + "PauseSession" : "暂停此会话", + "ResumeSession" : "恢复此会话", + "SyncUserPreferenceSuccess": "同步设置成功", + "SyncUserPreferenceFailed": "同步设置失败", + "Sync": "同步", + "InputVerifyCode": "请输入验证码" +} diff --git a/apps/i18n/koko/zh_hant.json b/apps/i18n/koko/zh_hant.json new file mode 100644 index 000000000..95e11a0fe --- /dev/null +++ b/apps/i18n/koko/zh_hant.json @@ -0,0 +1,52 @@ +{ + "ShareUser": "分享用戶", + "ShareUserHelpText": "未選擇用戶，即允許所有人加入", + "GetShareUser": "輸入使用者名稱", + "UploadSuccess": "上傳成功", + "MustSelectOneFile": "必須選擇一個文件", + "MustOneFile": "只能選擇一個文件", + "DownloadSuccess": "下載成功", + "Download": "下載", + "Upload": "上傳", + "Cancel": "取消", + "UploadTitle": "上傳文件", + "UploadTips": "將文件拖到此處，或點擊上傳", + "Share": "分享", + "CopyShareURLSuccess": "複製分享地址成功", + "ThemeConfig": "主題", + "OnlineUsers": "在線人員", + "User": "用戶", + "VerifyCode": "驗證碼", + "LinkAddr": "連結地址", + "ExpiredTime": "有效期限", + "SelectAction": "請選擇", + "CreateSuccess": "創建成功", + "CreateLink": "創建分享連結", + "CopyLink": "複製連結及驗證碼", + "NoLink": "無地址", + "ConfirmBtn": "確定", + "Settings": "設置", + "Theme": "主題", + "SelectTheme": "請選擇主題", + "ThemeColors": "主題顏色", + "ExceedTransferSize": "超過最大傳輸大小", + "WaitFileTransfer": "等待文件傳輸結束", + "EndFileTransfer": "文件傳輸結束", + "ReadOnly": "只讀", + "Writable": "讀寫", + "ActionPerm": "操作權限", + "Self": "我", + "RemoveShareUser": "你已經被移除共享會話", + "JoinShare": "加入共享", + "LeaveShare": "離開共享", + "Remove": "移除", + "RemoveShareUserConfirm": "確定要移除該用戶嗎？", + "Minute": "分鐘", + "Minutes": "分鐘", + "PauseSession": "暫停此會話", + "ResumeSession": "恢復此會話", + "SyncUserPreferenceSuccess": "同步設定成功", + "SyncUserPreferenceFailed": "同步設定失敗", + "Sync": "同步", + "InputVerifyCode": "請輸入驗證碼" +} \ No newline at end of file diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index f7f9627d0..eb6f92bb2 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -1,6 +1,6 @@ { "ACLs": "ACLs", - "APIKey": "Api key", + "APIKey": "API key", "AWS_China": "AWS(China)", "AWS_Int": "AWS(International)", "About": "About", @@ -42,7 +42,7 @@ "ActionCount": "Action count", "PermAction": "Permission Action", "ActionSetting": "Action setting", - "Actions": "Action", + "Actions": "Actions", "ActionsTips": "The effects of each authority's agreement are different, click on the icon behind the authority to view", "Activate": "Activate", "ActivateSelected": "Activate selected", @@ -86,7 +86,7 @@ "Announcement": "Announcement", "AnonymousAccount": "Anonymous account", "AnonymousAccountTip": "Connect to assets without using username and password, only support web type and custom type assets", - "ApiKey": "Api key", + "ApiKey": "API key", "ApiKeyList": "Authenticate via api key in the header of each request, which differs from one request to another, offering greater security than token method. please consult the documentation for usage.
to minimize the risk of leaks, the secret can only be viewed upon creation, and each user can create up to 10", "ApiKeyWarning": "To reduce the risk of accesskey leakage, the secret is only provided at creation and cannot be queried later, please keep it safe.", "AppEndpoint": "App access address", @@ -149,7 +149,7 @@ "AssetProtocolHelpText": "! The protocols supported by the assets are restricted by the platform. Click the settings button to view the protocol settings. If updates are required, please update the platform", "AssetTree": "Asset tree", "Assets": "Assets", - "AssetsAmount": "Asset amount", + "AssetsOfNumber": "Number of asset", "AssetsTotal": "Total assets", "AssignedInfo": "Approval information", "Assignee": "Handler", @@ -158,6 +158,7 @@ "AttrValue": "Attribute value", "Audits": "Audits", "Auth": "Authentication", + "AuthConfig": "Authentication", "AuthLimit": "Login restriction", "AuthSAMLCertHelpText": "Save after uploading the certificate key, then view sp metadata", "AuthSAMLKeyHelpText": "Sp certificates and keys are used for encrypted communication with idp", @@ -169,7 +170,7 @@ "AutoPush": "Auto push", "Automations": "Automations", "AverageTimeCost": "Average spend time", - "AwaitingMyApproval": "Approval pending", + "AwaitingMyApproval": "Assigned", "Azure": "Azure (china)", "Backup": "Backup", "BackupAccountsHelpText": "Backup account information externally. it can be stored in an external system or sent via email, supporting segmented delivery.", @@ -207,7 +208,6 @@ "CACertificate": "Ca certificate", "CAS": "CAS", "CMPP2": "Cmpp v2.0", - "CTYunPrivate": "Tianyi private cloud", "CalculationResults": "Error in cron expression", "CanDragSelect": "Select time period by dragging mouse", "Cancel": "Cancel", @@ -223,7 +223,7 @@ "ChangeOrganization": "Change organization", "ChangePassword": "Change password", "EditRecipient": "Edit recipient", - "ChangeSecretParams": "Change password parameters", + "ChangeSecretParams": "Change secret parameters", "ChangeViewHelpText": "Click to switch different views", "Chat": "Chat", "ChatHello": "Hello! Can i help you?", @@ -251,12 +251,13 @@ "Closed": "Completed", "CloudAccountCreate": "Create a cloud account", "CloudAccountDetail": "Details of cloud account", - "CloudAccountList": "Cloud accounts", + "CloudAccountList": "Accounts", "CloudAccountUpdate": "Update the cloud account", "CloudCreate": "Create asset - cloud", "CloudRegionTip": "The region was not obtained, please check the account", "CloudSource": "Sync source", "CloudSync": "Cloud provider", + "CloudSyncConfig": "Cloud sync settings", "CloudUpdate": "Update the asset - cloud", "Cluster": "Cluster", "CollectionSucceed": "Collection successful", @@ -373,6 +374,7 @@ "DatePasswordLastUpdated": "Last password update date", "DateStart": "Start date", "DateSync": "Sync date", + "Datetime": "Datetime", "DateUpdated": "Update date", "Day": "Day", "DeclassificationLogNum": "Password change logs", @@ -592,7 +594,7 @@ "IsActive": "Active", "IsAlwaysUpdate": "Keeping assets up to date", "IsAlwaysUpdateHelpTip": "Whether to synchronize and update asset information, including hostname, ip, platform, domain, node, etc. each time a synchronization task is performed", - "IsFinished": "Is it done", + "IsFinished": "Finished", "IsLocked": "Suspend", "IsSuccess": "Success", "IsSyncAccountHelpText": "Upon collection completion, the collected account will be synced to asset", @@ -654,7 +656,7 @@ "LoginNum": "Total login logs", "LoginPasswordSetting": "Login password", "LoginRequiredMsg": "The account has logged out, please login again.", - "LoginSSHKeySetting": "Login SSH Key", + "LoginSSHKeySetting": "Login SSH key", "LoginSucceeded": "Login successful", "LoginTitleTip": "Note: it will be displayed on the enterprise edition user ssh login koko login page (e.g.: welcome to use jumpserver open source bastion)", "LoginUserRanking": "Login user ranking", @@ -701,7 +703,7 @@ "MoveAssetToNode": "Move assets to nodes", "MsgSubscribe": "Subscription", "MyAssets": "My assets", - "MyTickets": "I initiated", + "MyTickets": "Submitted", "Name": "Name", "NavHelp": "Navigation", "NeedReLogin": "Need to re-login", @@ -713,7 +715,7 @@ "NewFile": "Create new file", "NewPassword": "New password", "NewPublicKey": "New Public Key", - "NewSSHKey": "New SSH Key", + "NewSSHKey": "New SSH key", "NewSyncCount": "New sync", "Next": "Next", "No": "No", @@ -725,7 +727,7 @@ "NoPermissionVew": "No permission to view the current page", "NoUnreadMsg": "You have unread notifications", "Node": "Node", - "NodeAmount": "Nodes", + "NodeOfNumber": "Number of node", "NodeInformation": "Node information", "NodeSearchStrategy": "Node search strategy", "NormalLoad": "Normal", @@ -790,7 +792,7 @@ "PasskeyAddDisableInfo": "Your authentication source is {source}, and adding a passkey is not supported", "Passphrase": "Key password", "Password": "Password", - "PasswordAndSSHKey": "Password & SSH Key", + "PasswordAndSSHKey": "Password & SSH key", "PasswordChangeLog": "Password change", "PasswordExpired": "Password expired", "PasswordPlaceholder": "Please enter password", @@ -828,6 +830,7 @@ "Port": "Port", "Ports": "Port", "Preferences": "Preferences", + "PrepareSyncTask": "Preparing to perform synchronization task...", "Primary": "Primary", "Priority": "Priority", "PrivateCloud": "Private cloud", @@ -882,6 +885,8 @@ "RegularlyPerform": "Periodic execution", "Reject": "Reject", "Rejected": "Rejected", + "ReleaseAssets": "Release assets", + "ReleaseAssetsHelpTips": "Whether to automatically delete assets synchronized through this task and released on the cloud at the end of the task", "ReleasedCount": "Released", "RelevantApp": "Application", "RelevantAsset": "Assets", @@ -967,10 +972,10 @@ "SMS": "Message", "SMSProvider": "SMS service provider", "SMTP": "Server", - "SSHKey": "SSH Key", + "SSHKey": "SSH key", "SSHKeyOfProfileSSHUpdatePage": "You can reset and download the SSH public key by clicking the button below, or copy your SSH public key and submit it.", "SSHPort": "SSH Port", - "SSHSecretKey": "SSH Key", + "SSHSecretKey": "SSH secret key", "SafeCommand": "Secure command", "SameAccount": "Same account", "SameAccountTip": "Account with the same username as authorized users", @@ -1005,6 +1010,7 @@ "SelectLabelFilter": "Select tag for search", "SelectPlatforms": "Select platform", "SelectProperties": "Attributes", + "SelectProviderMsg": "Please select a cloud platform", "SelectResource": "Select resources", "SelectTemplate": "Select template", "SelectValueOrCreateNew": "Select tag value or create new one", @@ -1068,6 +1074,7 @@ "Startswith": "Starts with...", "State": "Status", "StateClosed": "Is closed", + "StatePrivate": "State private", "Status": "Status", "StatusGreen": "Recently in good condition", "StatusRed": "Last task execution failed", @@ -1096,6 +1103,7 @@ "SupportedProtocol": "Protocols", "SupportedProtocolHelpText": "Set supported protocols for the asset, you can modify the custom configurations, such as sftp directory, rdp ad domain, etc., by clicking on the set button", "Sync": "Sync", + "SyncAction": "Synchronized action", "SyncDelete": "Sync deletion", "SyncDeleteSelected": "Sync deletion selected", "SyncErrorMsg": "Sync failed", @@ -1106,11 +1114,15 @@ "SyncInstanceTaskList": "Synchronization task", "SyncInstanceTaskUpdate": "Update the sync task", "SyncProtocolToAsset": "Sync protocols to assets", + "SyncManual": "Manual sync", + "SyncOnline": "Online sync", + "SyncRegion": "Sync region", "SyncSelected": "Sync selected", "SyncSetting": "Sync settings", "SyncStrategy": "Sync policy", "SyncSuccessMsg": "Sync succeeded", "SyncTask": "Sync tasks", + "SyncTiming": "Timing sync", "SyncUpdateAccountInfo": "Sync new secret to accounts", "SyncUser": "Sync users", "SyncedCount": "Synchronized", @@ -1179,6 +1191,9 @@ "TotalJobFailed": "Failed execution actions", "TotalJobLog": "Total job executions", "TotalJobRunning": "Running jobs", + "TotalSyncAsset": "Number of assets", + "TotalSyncRegion": "Number of regions", + "TotalSyncStrategy": "Number of strategies", "Transfer": "Transfer", "Tuesday": "Tue", "TwoAssignee": "Subscribe to authorization id", @@ -1226,7 +1241,7 @@ "UseSSL": "Use ssl/tls", "User": "User", "UserAclLists": "Login ACLs", - "UserAssetActivity": "User/asset activity", + "UserAssetActivity": "User/Asset activity", "UserCreate": "Create user", "UserData": "User", "UserDetail": "User details", @@ -1252,7 +1267,7 @@ "UsernamePlaceholder": "Please enter username", "Users": "User", "UsersAmount": "User", - "UsersAndUserGroups": "Users/user groups", + "UsersAndUserGroups": "Users/groups", "UsersTotal": "Total accounts", "Valid": "Valid", "Variable": "Variable", diff --git a/apps/i18n/lina/ja.json b/apps/i18n/lina/ja.json index 5825e015c..3979a1429 100644 --- a/apps/i18n/lina/ja.json +++ b/apps/i18n/lina/ja.json @@ -34,10 +34,10 @@ "AccountTemplateList": "アカウントテンプレートリスト", "AccountTemplateUpdateSecretHelpText": "テンプレートによって作成されたアカウントをアカウントリストに表示します。秘密の文を更新すると、テンプレートで作成されたアカウントの秘密の文も更新されます。", "Accounts": "アカウント", - "Action": "Action", + "Action": "動作", "ActionCount": "Action数", "ActionSetting": "Action設定", - "Actions": "Action", + "Actions": "操作", "ActionsTips": "各権限の役割はプロトコルにより異なります、アイコンをクリックして確認してください", "Activate": "有効化", "ActivateSelected": "選択を有効化", @@ -152,6 +152,7 @@ "AttrValue": "プロパティ値", "Audits": "監査台", "Auth": "認証設定", + "AuthConfig": "資格認定構成", "AuthLimit": "ログイン制限", "AuthSAMLCertHelpText": "証明書キーをアップロードした後で保存し、SP Metadataを確認してください", "AuthSAMLKeyHelpText": "SP 証明書とキーはIDPとの暗号化通信用です", @@ -261,6 +262,8 @@ "CloudRegionTip": "地域が取得できませんでした。アカウントを確認してください", "CloudSource": "同期ソース", "CloudSync": "クラウド同期", + "CloudSyncConfig": "クラウド同期構成", + "Clouds": "クラウド プラットフォーム", "CloudUpdate": "資産の更新-クラウドプラットフォーム", "Cluster": "クラスター", "CollectionSucceed": "お気に入り登録成功", @@ -376,6 +379,7 @@ "DatePasswordLastUpdated": "最終パスワード更新日", "DateStart": "開始日", "DateSync": "同期日", + "Datetime": "日時", "DateUpdated": "更新日", "Day": "日", "DeclassificationLogNum": "パスワード変更ログ数", @@ -591,7 +595,7 @@ "IsActive": "Activate", "IsAlwaysUpdate": "最新の資産を保持", "IsAlwaysUpdateHelpTip": "同期タスクを実行するたびに、資産情報（ホスト名、ip、プラットフォーム、ドメイン、ノードなど）を同期更新するかどうか", - "IsFinished": "完了したか", + "IsFinished": "完了", "IsLocked": "一時停止しますか", "IsSuccess": "成功", "IsSyncAccountHelpText": "収集が完了すると、収集したアカウントが資産に同期されます", @@ -725,6 +729,10 @@ "NoPermission": "権限なし", "NoPermission403": "403 権限がありません", "NoPermissionVew": "現在のページを表示する権限がありません", + "NoPublished": "未発表", + "NoResourceImport": "インポートできるリソースがありません", + "NoSQLProtocol": "非リレーショナルデータベース", + "NoSystemUserWasSelected": "選択されていないシステムユーザー", "NoUnreadMsg": "未読メッセージなし", "Node": "ノード", "NodeAmount": "ノード数", @@ -830,6 +838,9 @@ "PolicyName": "ポリシー名称", "Port": "ポート", "Ports": "ポート", + "PrepareSyncTask": "同期タスクの実行準備中...", + "PrimaryProtocol": "主要協議は、資産にとって最も基本的で最も一般的に使用されるプロトコルであり、1つのみ設定でき、必ず設定する必要があります", + "PriorityHelpMessage": "1-100、1最低優先度、100最高優先度。複数のユーザーを許可する場合、優先度の高いシステムユーザーはデフォルトのログインユーザーになります", "Preferences": "好みの設定", "Primary": "主な", "Priority": "優先順位", @@ -999,6 +1010,8 @@ "Select": "選択", "SelectAdhoc": "コマンドの選択", "SelectAll": "全選択", + "SelectCreateMethod": "作り方を選ぶ", + "SelectProviderMsg": "クラウドプラットフォームを選択してください", "SelectAtLeastOneAssetOrNodeErrMsg": "アセットまたはノードは少なくとも一つ選択してください", "SelectAttrs": "属性の選択", "SelectByAttr": "プロパティフィルタ", @@ -1097,21 +1110,33 @@ "SuperAdmin": "スーパー管理者", "SuperOrgAdmin": "スーパー管理者+組織管理", "Support": "サポート", + "SupportedProtocol": "サポートされるプロトコル", + "SupportedProtocolHelpText": "資産がサポートするプロトコルを設定します。設定ボタンをクリックして、SFTPディレクトリ、RDP ADドメインなどのプロトコルのカスタム構成を変更します。", + "SwitchPage": "ビューを切り替える", + "SwitchToUser": "Suユーザー", + "SwitchToUserListTips": "次のユーザーからアセットに接続すると、現在のシステムユーザーログインを使用して切り替えます。", + "SymbolSet": "特殊記号集合", + "SymbolSetHelpText": "このタイプのデータベースでサポートされている特殊記号の集合を入力してください。生成されたランダムパスワードにこのようなデータベースでサポートされていない特殊文字があると、変更計画は失敗します", + "Sync": "同期する", + "SyncAction": "同期アクション", + "SyncDelete": "同期削除", "SupportedProtocol": "サポートされているプロトコル", "SupportedProtocolHelpText": "資産がサポートするプロトコルを設定します。設定ボタンをクリックして、プロトコルのカスタム設定を変更することができます。例えば、SFTPディレクトリやRDP ADドメインなど", - "Sync": "同期化", - "SyncDelete": "同時に削除", "SyncDeleteSelected": "選択を同期削除", "SyncErrorMsg": "同期失敗:", "SyncInstanceTaskCreate": "同期タスクを作成", "SyncInstanceTaskDetail": "同期タスクの詳細", "SyncInstanceTaskHistoryAssetList": "インスタンスリストの同期", - "SyncInstanceTaskHistoryList": "履歴リストを同期する", + "SyncInstanceTaskHistoryList": "履歴リストの同期", + "SyncManual": "手動同期", + "SyncOnline": "オンライン同期", + "SyncRegion": "地域を同期", + "SyncSelected": "選択した同期", "SyncInstanceTaskList": "同期タスクリスト", "SyncInstanceTaskUpdate": "同期タスクの更新", "SyncProtocolToAsset": "同期プロトコルを資産へ", - "SyncSelected": "選択したものを同期", "SyncSetting": "同期設定", + "SyncTiming": "タイミング同期", "SyncStrategy": "同期方針", "SyncSuccessMsg": "同期成功", "SyncTask": "同期化シスクリプト", @@ -1183,6 +1208,10 @@ "TotalJobFailed": "実行に失敗したジョブ数", "TotalJobLog": "タスク実行総数", "TotalJobRunning": "実行中のジョブ数", + "TotalSyncAsset": "同期資産数（個）", + "TotalSyncRegion": "同期地域数（個）", + "TotalSyncStrategy": "バインドポリシー数（個）", + "True": "はい", "Transfer": "転送", "Tuesday": "火曜日", "TwoAssignee": "二次受理者", @@ -1304,4 +1333,4 @@ "ZoneHelpMessage": "エリアとはアセットの位置で、データセンターやパブリッククラウド、あるいはVPCが該当します。エリアにはゲートウェイを設定でき、ネットワークが直接接続できない場合、ゲートウェイを経由してアセットにログインすることができます", "ZoneList": "地域リスト", "ZoneUpdate": "更新エリア" -} \ No newline at end of file +} diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index 0057baef3..992485ef1 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -8,6 +8,7 @@ "AccessIP": "IP 白名单", "SuEnabled": "启用开关", "AccessKey": "访问密钥", + "AccessKeys": "访问密钥", "AccountTemplateList": "账号模版列表", "HistoryRecord": "历史记录", "UserPasswordChangeLog": "用户密码修改日志", @@ -59,9 +60,8 @@ "Accounts": "账号", "Action": "动作", "ActionCount": "动作数量", - "PermAction": "授权动作", "ActionSetting": "动作设置", - "Actions": "动作", + "Actions": "操作", "ActionsTips": "各个权限作用协议不尽相同，点击权限后面的图标查看", "Activate": "激活", "Active": "激活中", @@ -173,12 +173,12 @@ "AttrValue": "属性值", "Audits": "审计台", "Auth": "认证设置", + "AuthConfig": "配置认证", "AuthLimit": "登录限制", "AuthSAMLCertHelpText": "上传证书密钥后保存, 然后查看 SP Metadata", "AuthSAMLKeyHelpText": "SP 证书和密钥 是用来和 IDP 加密通信的", "AuthSaml2UserAttrMapHelpText": "左侧的键为 SAML2 用户属性，右侧的值为认证平台用户属性", "AuthSecurity": "认证安全", - "PasswordAndSSHKey": "认证设置", "AuthSettings": "认证配置", "AddInDetailText": "创建或更新成功后，添加详细信息", "AuthUserAttrMapHelpText": "左侧的键为 JumpServer 用户属性，右侧的值为认证平台用户属性", @@ -271,6 +271,7 @@ "CloudRegionTip": "未获取到地域，请检查账号", "CloudSource": "同步源", "CloudSync": "云同步", + "CloudSyncConfig": "云同步配置", "CloudUpdate": "更新资产-云平台", "Cluster": "集群", "CollectionSucceed": "收藏成功", @@ -302,6 +303,7 @@ "ConceptContent": "我想让你像一个 Python 解释器一样行事。我将给你 Python 代码，你将执行它。不要提供任何解释。除了代码的输出，不要用任何东西来回应。", "ConceptTitle": "🤔 Python 解释器 ", "Config": "配置", + "Configured": "已配置", "Confirm": "确认", "ConfirmPassword": "确认密码", "ConnectAssets": "连接资产", @@ -345,8 +347,8 @@ "CriticalLoad": "严重", "CronExpression": "crontab完整表达式", "CrontabOfCreateUpdatePage": "例如：每周日 03:05 执行 <5 3 * * 0>
使用5位 Linux crontab 表达式 <分 时 日 月 星期> （在线工具）
如果同时设置了定期执行和周期执行，优先使用定期执行", - "CurrentConnections": "当前连接数", "CurrentConnectionUsers": "当前会话用户数", + "CurrentConnections": "当前连接数", "CurrentUserVerify": "验证当前用户", "Custom": "自定义", "CustomCol": "自定义列表字段", @@ -384,6 +386,7 @@ "DatePasswordLastUpdated": "最后更新密码日期", "DateStart": "开始日期", "DateSync": "同步日期", + "Datetime": "日期时间", "DateUpdated": "更新日期", "Day": "日", "DeclassificationLogNum": "改密日志数", @@ -408,6 +411,7 @@ "DeviceUpdate": "更新资产-网络设备", "Digit": "数字", "DingTalk": "钉钉", + "DingTalkOAuth": "钉钉认证", "DingTalkTest": "测试", "Disable": "禁用", "DisplayName": "名称", @@ -476,6 +480,7 @@ "FaviconTip": "提示：网站图标（建议图片大小为: 16px*16px）", "Features": "功能设置", "FeiShu": "飞书", + "FeiShuOAuth": "飞书认证", "FeiShuTest": "测试", "FieldRequiredError": "此字段是必填项", "FileExplorer": "文件浏览", @@ -512,6 +517,7 @@ "Generate": "生成", "GenerateAccounts": "重新生成账号", "GenerateSuccessMsg": "账号生成成功", + "GenericSetting": "通用配置", "GoHomePage": "去往首页", "Goto": "转到", "GrantedAssets": "授权的资产", @@ -564,6 +570,7 @@ "Inactive": "禁用", "Index": "索引", "Info": "信息", + "InformationModification": "信息更改", "InheritPlatformConfig": "继承自平台配置，如需更改，请更改平台中的配置。", "InitialDeploy": "初始化部署", "Input": "输入", @@ -585,7 +592,7 @@ "IpGroupHelpText": "* 表示匹配所有。例如: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:db8:1a:1110::/64", "IsActive": "激活", "IsAlwaysUpdate": "资产保持最新", - "IsFinished": "是否完成", + "IsFinished": "完成", "IsLocked": "是否暂停", "IsSuccess": "成功", "IsSyncAccountHelpText": "收集完成后会把收集的账号同步到资产", @@ -609,6 +616,7 @@ "TagList": "标签列表", "TagUpdate": "更新标签", "Language": "语言", + "LarkOAuth": "Lark 认证", "Last30": "最近 30 次", "Last30Days": "近30天", "Last7Days": "近7天", @@ -630,7 +638,6 @@ "LockedIP": "已锁定 IP {count} 个", "Log": "日志", "LogData": "日志数据", - "LoginLogTotal": "登录成功日志数", "Logging": "日志记录", "LoginAssetConfirm": "资产登录复核", "LoginAssetToday": "今日活跃资产数", @@ -642,9 +649,11 @@ "LoginFrom": "登录来源", "LoginImageTip": "提示：将会显示在企业版用户登录页面（建议图片大小为: 492*472px）", "LoginLog": "登录日志", + "LoginLogTotal": "登录成功日志数", "LoginNum": "登录数", "LoginPasswordSetting": "登录密码", "LoginRequiredMsg": "账号已退出，请重新登录", + "LoginSSHKeySetting": "登录 SSH 公钥", "LoginSucceeded": "登录成功", "LoginTitleTip": "提示：将会显示在企业版用户 SSH 登录 KoKo 登录页面（eg: 欢迎使用JumpServer开源堡垒机)", "LoginUserRanking": "登录账号排名", @@ -678,7 +687,6 @@ "MenuPermissions": "授权管理", "MenuUsers": "用户管理", "Message": "消息", - "NotificationConfiguration": "通知设置", "MessageType": "消息类型", "MfaLevel": "多因子认证", "Min": "分钟", @@ -703,6 +711,8 @@ "NewDirectory": "新建目录", "NewFile": "新建文件", "NewPassword": "新密码", + "NewPublicKey": "新 SSH 公钥", + "NewSSHKey": "SSH 公钥", "NewSyncCount": "新同步", "Next": "下一步", "No": "否", @@ -712,6 +722,7 @@ "NoPermission": "暂无权限", "NoPermission403": "403 暂无权限", "NoPermissionVew": "没有权限查看当前页面", + "NoResourceImport": "没有资源可导入", "NoUnreadMsg": "暂无未读消息", "Node": "节点", "NodeAmount": "节点数量", @@ -722,6 +733,7 @@ "NotSet": "未设置", "NotSpecialEmoji": "不允许输入特殊表情符号", "Nothing": "无", + "NotificationConfiguration": "通知设置", "Notifications": "通知设置", "Now": "现在", "Number": "编号", @@ -736,7 +748,6 @@ "OfflineUpload": "离线上传", "OldPassword": "原密码", "OldPublicKey": "旧 SSH 公钥", - "NewPublicKey": "新 SSH 公钥", "OneAssignee": "一级受理人", "OneAssigneeType": "一级受理人类型", "OneClickReadMsg": "你确定全部标记为已读吗?", @@ -776,6 +787,7 @@ "PasskeyAddDisableInfo": "你的认证来源是 {source}, 不支持添加 Passkey", "Passphrase": "密钥密码", "Password": "密码", + "PasswordAndSSHKey": "认证设置", "PasswordChangeLog": "改密日志", "PasswordExpired": "密码过期了", "PasswordPlaceholder": "请输入密码", @@ -790,11 +802,13 @@ "PauseTaskSendSuccessMsg": "暂停任务已下发，请稍后刷新查看", "Pending": "待处理", "PermAccount": "授权账号", + "PermAction": "授权动作", "PermUserList": "授权用户", "PermissionCompany": "授权公司", "PermissionName": "授权规则名称", "Permissions": "权限", "PersonalInformationImprovement": "个人信息完善", + "PersonalSettings": "个人设置", "Plan": "计划", "Platform": "平台", "PlatformCreate": "创建平台", @@ -810,6 +824,8 @@ "PolicyName": "策略名称", "Port": "端口", "Ports": "端口", + "Preferences": "偏好设置", + "PrepareSyncTask": "准备执行同步任务中...", "Priority": "优先级", "PrivateCloud": "私有云", "PrivateKey": "私钥", @@ -818,6 +834,7 @@ "PrivilegedOnly": "仅特权账号", "PrivilegedTemplate": "特权的", "Product": "产品", + "Profile": "个人信息", "ProfileSetting": "个人信息设置", "Project": "项目名", "Prompt": "提示词", @@ -863,6 +880,8 @@ "RegularlyPerform": "定期执行", "Reject": "拒绝", "Rejected": "已拒绝", + "ReleaseAssets": "同步释放资产", + "ReleaseAssetsHelpTips": "是否在任务结束时，自动删除通过此任务同步下来且已经在云上释放的资产", "ReleasedCount": "已释放", "RelevantApp": "应用", "RelevantAsset": "资产", @@ -948,7 +967,6 @@ "SMTP": "邮件服务器", "SSHKey": "SSH公钥", "SSHKeyOfProfileSSHUpdatePage": "你可以点击下面的按钮重置并下载 SSH 公钥，或者复制你的 SSH 公钥并提交。", - "LoginSSHKeySetting": "登录 SSH 公钥", "SSHPort": "SSH 端口", "SSHSecretKey": "SSH 密钥", "SafeCommand": "安全命令", @@ -984,6 +1002,7 @@ "SelectTagFilter": "选择标签搜索", "SelectPlatforms": "选择平台", "SelectProperties": "选择属性", + "SelectProviderMsg": "请选择一个云平台", "SelectResource": "选择资源", "SelectTemplate": "选择模版", "SelectValueOrCreateNew": "选择标签值或创建新的", @@ -1014,15 +1033,11 @@ "SessionsAudit": "会话审计", "SessionsNum": "会话数", "Set": "已设置", - "DingTalkOAuth": "钉钉认证", "SetFailed": "设置失败", - "FeiShuOAuth": "飞书认证", - "LarkOAuth": "Lark 认证", "SetMFA": "MFA 认证", - "SlackOAuth": "Slack 认证", - "Configured": "已配置", "SetSuccess": "设置成功", "SetToDefault": "设为默认", + "SetToDefaultStorage": "设置为默认存储", "WeComOAuth": "企业微信认证", "Setting": "设置", "SettingInEndpointHelpText": "在 系统设置 / 组件设置 / 服务端点 中配置服务地址和端口", @@ -1037,6 +1052,7 @@ "Skip": "忽略当前资产", "Skipped": "已跳过", "Slack": "Slack", + "SlackOAuth": "Slack 认证", "Source": "来源", "SourceIP": "源地址", "SourcePort": "源端口", @@ -1090,6 +1106,7 @@ "SupportedProtocol": "支持的协议", "SupportedProtocolHelpText": "设置资产支持的协议，点击设置按钮可以为协议修改自定义配置，如 SFTP 目录，RDP AD 域等", "Sync": "同步", + "SyncAction": "同步动作", "SyncDelete": "同步删除", "SyncDeleteSelected": "同步删除所选", "SyncErrorMsg": "同步失败: ", @@ -1099,11 +1116,15 @@ "SyncInstanceTaskHistoryList": "同步历史列表", "SyncInstanceTaskList": "同步任务列表", "SyncInstanceTaskUpdate": "更新同步任务", + "SyncManual": "手动同步", + "SyncOnline": "在线同步", + "SyncRegion": "正在同步地域", "SyncSelected": "同步所选", "SyncSetting": "同步设置", "SyncStrategy": "同步策略", "SyncSuccessMsg": "同步成功", "SyncTask": "同步任务", + "SyncTiming": "定时同步", "SyncUpdateAccountInfo": "同步更新账号信息", "SyncUser": "同步用户", "SyncedCount": "已同步", @@ -1168,6 +1189,9 @@ "TotalJobFailed": "执行失败作业数", "TotalJobLog": "作业执行总数", "TotalJobRunning": "运行中作业数", + "TotalSyncAsset": "同步资产数（个）", + "TotalSyncRegion": "同步地域数（个）", + "TotalSyncStrategy": "绑定策略数（个）", "Transfer": "传输", "Tuesday": "周二", "TwoAssignee": "二级受理人", @@ -1198,7 +1222,6 @@ "UpdateNodeAssetHardwareInfo": "更新节点资产硬件信息", "UpdatePlatformHelpText": "只有资产的原平台类型与所选平台类型相同时才会进行更新，若更新前后的平台类型不同则不会更新。", "UpdateSSHKey": "更新SSH公钥", - "NewSSHKey": "SSH 公钥", "UpdateSelected": "更新所选", "UpdateSuccessMsg": "更新成功", "Updated": "已更新", @@ -1233,9 +1256,7 @@ "UserLoginAclUpdate": "更新用户登录控制", "UserLoginLimit": "用户登录限制", "UserLoginTrend": "账号登录趋势", - "PersonalSettings": "个人设置", "UserSession": "用户会话", - "Preferences": "偏好设置", "UserUpdate": "更新用户", "Username": "用户名", "UsernamePlaceholder": "请输入用户名", @@ -1263,6 +1284,7 @@ "Volcengine": "火山引擎", "Warning": "警告", "WeCom": "企业微信", + "WeComOAuth": "企业微信认证", "WeComTest": "测试", "WebCreate": "创建资产-Web", "WebHelpMessage": "Web 类型资产依赖于远程应用，请前往系统设置在远程应用中配置", @@ -1279,6 +1301,7 @@ "Workbench": "工作台", "Workspace": "工作空间", "Yes": "是", + "YourProfile": "个人信息", "ZStack": "ZStack", "Zone": "区域", "ZoneCreate": "创建区域", @@ -1286,8 +1309,6 @@ "ZoneHelpMessage": "区域是资产所在的位置，可以是机房，公有云 或者 VPC。区域中可以设置网关，当网络不能直达的时候，可以使用网关跳转登录到资产", "ZoneList": "区域列表", "ZoneUpdate": "更新区域", - "YourProfile": "个人信息", - "InformationModification": "信息更改", "Phone": "手机", "TailLog": "追踪日志", "NoLog": "无日志", diff --git a/apps/i18n/lina/zh_hant.json b/apps/i18n/lina/zh_hant.json index 4ade04d69..ee23b4fc8 100644 --- a/apps/i18n/lina/zh_hant.json +++ b/apps/i18n/lina/zh_hant.json @@ -43,7 +43,7 @@ "Action": "動作", "ActionCount": "動作數量", "ActionSetting": "動作設置", - "Actions": "權限", + "Actions": "操作", "Activate": "啟用", "Active": "活躍", "ActiveAsset": "近期被登入過", @@ -190,6 +190,7 @@ "Auditor": "審計員", "Audits": "審計台", "Auth": "認證設置", + "AuthConfig": "配寘認證資訊", "AuthLimit": "登入限制", "AuthMethod": "認證方式", "AuthSecurity": "認證安全", @@ -301,6 +302,7 @@ "CloudPlatform": "雲平台", "CloudSource": "同步源", "CloudSync": "雲同步", + "CloudSyncConfig": "雲同步配寘", "CloudUpdate": "更新資產-雲平台", "Clouds": "雲平台", "Cluster": "集群", @@ -442,6 +444,7 @@ "DatePasswordUpdated": "密碼更新日期", "DateStart": "開始日期", "DateSync": "同步日期", + "Datetime": "日期時間", "DateUpdated": "更新日期", "DeactiveSelected": "禁用所選", "DeclassificationLogNum": "改密日誌數", @@ -729,7 +732,6 @@ "LockedIP": "已鎖定 IP {count} 個", "Log": "日誌", "LogData": "日誌數據", - "LoginLogTotal": "登入成功日誌數", "Logging": "日誌記錄", "Login": "用戶登入", "LoginAssetConfirm": "資產登入覆核", @@ -744,6 +746,7 @@ "LoginIP": "登入IP", "LoginImageTip": "提示：將會顯示在企業版使用者登入頁面（建議圖片大小為: 492*472px）", "LoginLog": "登入日誌", + "LoginLogTotal": "登入成功日誌數", "LoginModeHelpMessage": "如果選擇手動登入模式，使用者名稱和密碼可以不填寫", "LoginModel": "登入模式", "LoginNum": "登入數", @@ -832,6 +835,7 @@ "NoPermission403": "403 暫無權限", "NoPermissionVew": "沒有權限查看當前頁面", "NoPublished": "未發布", + "NoResourceImport": "沒有資源可導入", "NoSQLProtocol": "非關係資料庫", "NoSystemUserWasSelected": "未選擇系統用戶", "NoUnreadMsg": "暫無未讀消息", @@ -963,6 +967,7 @@ "PleaseSelect": "請選擇", "PolicyName": "策略名稱", "Ports": "埠", + "PrepareSyncTask": "準備執行同步任務中...", "Primary": "主要", "PrimaryProtocol": "主要協議, 資產最基本最常用的協議，只能且必須設置一個", "PriorityHelpMessage": "1-100, 1最低優先度，100最高優先度。授權多個用戶時，高優先度的系統用戶將會作為默認登入用戶", @@ -1037,6 +1042,8 @@ "RelNot": "非", "RelOr": "或", "Relation": "關係", + "ReleaseAssets": "同步釋放資產", + "ReleaseAssetsHelpTips": "是否在任務結束時，自動删除通過此任務同步下來且已經在雲上釋放的資產", "ReleasedCount": "已釋放", "RelevantApp": "應用", "RelevantAsset": "資產", @@ -1166,6 +1173,7 @@ "SelectLabelFilter": "選擇標籤搜索", "SelectPlatforms": "選擇平台", "SelectProperties": "選擇屬性", + "SelectProviderMsg": "請選擇一個雲平臺", "SelectResource": "選擇資源", "SelectTemplate": "選擇模板", "SelectValueOrCreateNew": "選擇標籤值或創建新的", @@ -1267,6 +1275,7 @@ "SymbolSet": "特殊符號集合", "SymbolSetHelpText": "請輸入此類型資料庫支持的特殊符號集合，若生成的隨機密碼中有此類資料庫不支持的特殊字元，改密計劃將會失敗", "Sync": "同步", + "SyncAction": "同步動作", "SyncDelete": "同步刪除", "SyncInstanceTaskCreate": "創建同步任務", "SyncInstanceTaskDetail": "同步任務詳情", @@ -1274,12 +1283,16 @@ "SyncInstanceTaskHistoryList": "同步歷史列表", "SyncInstanceTaskList": "同步任務列表", "SyncInstanceTaskUpdate": "更新同步任務", + "SyncManual": "手動同步", + "SyncOnline": "線上同步", "SyncProtocolToAsset": "同步協議到資產", + "SyncRegion": "正在同步地域", "SyncSelected": "同步所選", "SyncSetting": "同步設定", "SyncStrategy": "同步策略", "SyncSuccessMsg": "同步成功", "SyncTask": "同步任務", + "SyncTiming": "定時同步", "SyncUpdateAccountInfo": "同步更新帳號資訊", "SyncUser": "同步用戶", "SyncedCount": "已同步", @@ -1365,6 +1378,9 @@ "TotalJobFailed": "執行失敗作業數", "TotalJobLog": "作業執行總數", "TotalJobRunning": "運行中作業數", + "TotalSyncAsset": "同步資產數（個）", + "TotalSyncRegion": "同步地域數（個）", + "TotalSyncStrategy": "綁定策略數（個）", "Transfer": "傳輸", "True": "是", "Tuesday": "週二", @@ -1700,7 +1716,7 @@ "ip_group": "IP 組", "ips": "請輸入逗號分割的IP位址組", "isEffective": "已生效的", - "isFinished": "是否完成", + "IsFinished": "完成", "isSuccess": "成功", "isValid": "有效", "is_locked": "是否暫停", diff --git a/apps/jumpserver/routing.py b/apps/jumpserver/routing.py index a23e2978b..0c8e78063 100644 --- a/apps/jumpserver/routing.py +++ b/apps/jumpserver/routing.py @@ -3,6 +3,7 @@ from channels.db import database_sync_to_async from channels.routing import ProtocolTypeRouter, URLRouter from django.core.asgi import get_asgi_application from django.core.handlers.asgi import ASGIRequest +from django.conf import settings from authentication.backends.drf import ( SignatureAuthentication, @@ -20,6 +21,10 @@ urlpatterns = ops_urlpatterns + \ setting_urlpatterns + \ terminal_urlpatterns +if settings.XPACK_ENABLED: + from xpack.plugins.cloud.urls.ws_urls import urlpatterns as xcloud_urlpatterns + urlpatterns += xcloud_urlpatterns + @database_sync_to_async def get_signature_user(scope): diff --git a/apps/jumpserver/settings/libs.py b/apps/jumpserver/settings/libs.py index 445fa4202..b8859f7a8 100644 --- a/apps/jumpserver/settings/libs.py +++ b/apps/jumpserver/settings/libs.py @@ -165,8 +165,8 @@ CELERY_RESULT_SERIALIZER = 'pickle' CELERY_RESULT_BACKEND = CELERY_BROKER_URL CELERY_ACCEPT_CONTENT = ['json', 'pickle'] CELERY_RESULT_EXPIRES = 600 -CELERY_WORKER_TASK_LOG_FORMAT = '%(message)s' -CELERY_WORKER_LOG_FORMAT = '%(message)s' +CELERY_WORKER_TASK_LOG_FORMAT = '%(asctime).19s %(message)s' +CELERY_WORKER_LOG_FORMAT = '%(asctime).19s %(message)s' CELERY_TASK_EAGER_PROPAGATES = True CELERY_WORKER_REDIRECT_STDOUTS = True CELERY_WORKER_REDIRECT_STDOUTS_LEVEL = "INFO" diff --git a/apps/perms/serializers/permission.py b/apps/perms/serializers/permission.py index a7e75d393..16f5c000b 100644 --- a/apps/perms/serializers/permission.py +++ b/apps/perms/serializers/permission.py @@ -39,7 +39,7 @@ class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSeriali user_groups_amount = serializers.IntegerField(read_only=True, label=_("Groups amount")) assets_amount = serializers.IntegerField(read_only=True, label=_("Assets amount")) nodes_amount = serializers.IntegerField(read_only=True, label=_("Nodes amount")) - actions = ActionChoicesField(required=False, allow_null=True, label=_("Actions")) + actions = ActionChoicesField(required=False, allow_null=True, label=_("Action")) is_valid = serializers.BooleanField(read_only=True, label=_("Is valid")) is_expired = serializers.BooleanField(read_only=True, label=_("Is expired")) accounts = serializers.ListField(label=_("Accounts"), required=False) @@ -61,7 +61,7 @@ class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSeriali fields = fields_mini + fields_m2m + fields_generic read_only_fields = ["created_by", "date_created", "from_ticket"] extra_kwargs = { - "actions": {"label": _("Actions")}, + "actions": {"label": _("Action")}, "is_expired": {"label": _("Is expired")}, "is_valid": {"label": _("Is valid")}, } diff --git a/apps/terminal/connect_methods.py b/apps/terminal/connect_methods.py index 0294ccab1..4fcef7ab3 100644 --- a/apps/terminal/connect_methods.py +++ b/apps/terminal/connect_methods.py @@ -68,7 +68,7 @@ class NativeClient(TextChoices): @classmethod def xpack_methods(cls): - return [cls.mstsc] + return [cls.mstsc, cls.db_client] @classmethod def get_methods(cls, os='windows'): @@ -151,6 +151,7 @@ class ConnectMethodUtil: Protocol.mysql, Protocol.mariadb, Protocol.sqlserver, Protocol.postgresql, + Protocol.oracle ], # 限制客户端的协议，比如 koko 虽然也支持 数据库的 ssh 连接，但是不再这里拉起 # Listen协议: [Asset协议] diff --git a/apps/terminal/serializers/command.py b/apps/terminal/serializers/command.py index 2372bc795..eb99c43a0 100644 --- a/apps/terminal/serializers/command.py +++ b/apps/terminal/serializers/command.py @@ -16,7 +16,7 @@ class SimpleSessionCommandSerializer(serializers.ModelSerializer): user = serializers.CharField(label=_("User")) # 限制 64 字符，见 validate_user asset = serializers.CharField(max_length=128, label=_("Asset")) input = serializers.CharField(label=_("Command")) - session = serializers.CharField(max_length=36, label=_("Session ID")) + session = serializers.CharField(max_length=36, label=_("Session")) risk_level = LabeledChoiceField( choices=RiskLevelChoices.choices, required=False, label=_("Risk level"),