diff --git a/.github/actions/engine-verify-setup/action.yml b/.github/actions/engine-verify-setup/action.yml index 1cfedb12b1c..ee15d70c886 100644 --- a/.github/actions/engine-verify-setup/action.yml +++ b/.github/actions/engine-verify-setup/action.yml @@ -37,7 +37,7 @@ runs: libasound2-dev libasound2-plugins libpipewire-0.3-dev libspa-0.2-dev libclang-dev \ libx11-dev libxrandr-dev libxcb1-dev libxcb-randr0-dev libxcb-shm0-dev \ libxcb-xfixes0-dev libxfixes-dev libwayland-dev libxkbcommon-dev \ - libdbus-1-dev libudev-dev libva-dev mesa-vulkan-drivers libvulkan1 >/dev/null + libdbus-1-dev libudev-dev libva-dev mesa-vulkan-drivers libvulkan1 unzip >/dev/null - name: Rust toolchain if: inputs.rust-cache == 'true' diff --git a/.github/actions/install-desktop-deps/action.yml b/.github/actions/install-desktop-deps/action.yml index 575f197509b..e6d622f4e98 100644 --- a/.github/actions/install-desktop-deps/action.yml +++ b/.github/actions/install-desktop-deps/action.yml @@ -17,6 +17,14 @@ runs: # setup.js stages -> soname mismatch and the loader fails at launch. Keeping # them absent forces the binary to link the same FFmpeg 7 that gets bundled. run: | + # GitHub's AWS-hosted Ubuntu runners list us-east-2.ec2.archive.ubuntu.com + # as their first apt mirror, and that mirror serves packages at tens of + # kB/s, so this install can outlast the job's time limit. apt only falls + # back to the next mirror on an error, never on a slow one. Use the + # Ubuntu mirror the Azure-hosted and Blacksmith runners already use. + if [ -f /etc/apt/apt-mirrors.txt ]; then + sudo sed -i -E 's#^https?://[a-z0-9-]+\.ec2\.archive\.ubuntu\.com/ubuntu/?#http://azure.archive.ubuntu.com/ubuntu/#' /etc/apt/apt-mirrors.txt + fi sudo apt update sudo apt install -y --no-install-recommends \ libwebkit2gtk-4.1-dev \ @@ -36,6 +44,7 @@ runs: libasound2-dev \ libasound2-plugins \ pulseaudio-utils \ + dbus-daemon \ libdbus-1-dev \ libudev-dev \ libx11-dev \ @@ -54,5 +63,6 @@ runs: rpm \ cpio \ libarchive-tools \ + unzip \ zstd \ patchelf diff --git a/.github/workflows/arch-package.yml b/.github/workflows/arch-package.yml index e7e20ad5116..4d5552d2bbc 100644 --- a/.github/workflows/arch-package.yml +++ b/.github/workflows/arch-package.yml @@ -1,6 +1,7 @@ name: Arch package on: + merge_group: pull_request: paths: - "scripts/build-linux-arch-package*" @@ -11,7 +12,34 @@ permissions: contents: read jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/arch-package.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + test: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} name: Arch package versions runs-on: blacksmith-2vcpu-ubuntu-2404 container: archlinux:base-devel@sha256:68bfc3b0d277b08a99101dc9b94aaa03e5ae70cf1b4fb965c03b2b87b915760d diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6ec1a24fa7..0d479d41e31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: branches: - main pull_request: + merge_group: workflow_dispatch: permissions: @@ -35,6 +36,10 @@ jobs: uses: dorny/paths-filter@v3 id: filter with: + # In the merge queue, compare the queued commit with the commit it + # was built on, so only this pull request's changes pick the jobs. + base: ${{ github.event.merge_group.base_sha }} + ref: ${{ github.event.merge_group.head_sha }} filters: | rust: - '.cargo/**' @@ -90,6 +95,9 @@ jobs: - uses: ./.github/actions/setup-js + - name: Lint tests + run: bun run lint:tests + - run: bun run --cwd apps/web next typegen - name: Check MCP card bundle @@ -280,8 +288,12 @@ jobs: - name: Test desktop regressions run: | cargo test --locked -p cap-utils -p cap-cli-install --lib + cargo test --locked -p cap-automation cargo test --locked -p cap --bin cap record::tests cargo test --locked -p cap --bin cap recordings::tests + cargo test --locked -p cap --bin cap credentials::tests + cargo test --locked -p cap --test cli auth_status_ + cargo test --locked -p cap --test cli mcp_cancellation_stops_wait_polling cargo test --locked -p cap --bin cap automation::tests::cli_save_to_location cargo test --locked -p cap --bin cap export::tests::instant_export_preserves_a_hard_link_to_the_recording cargo test --locked -p cap --test cli recordings_list @@ -309,19 +321,12 @@ jobs: settings: - target: aarch64-apple-darwin runner: blacksmith-6vcpu-macos-15 - # Cap still ships an Intel build, and Blacksmith has no Intel Macs. - - target: x86_64-apple-darwin - runner: macos-26-intel - target: x86_64-pc-windows-msvc runner: blacksmith-8vcpu-windows-2025 - target: x86_64-unknown-linux-gnu runner: blacksmith-8vcpu-ubuntu-2404 - # The Intel build is not a merge gate and takes over an hour on a - # GitHub-hosted runner, so it runs on main and by hand, not on PRs. - exclude: - - settings: - target: x86_64-apple-darwin - runner: ${{ github.event_name == 'pull_request' && 'macos-26-intel' || 'none' }} + # The Intel macOS build runs only in nightly and release builds + # (desktop-release.yml), not in CI. runs-on: ${{ matrix.settings.runner }} env: # Full debuginfo for the opt-level 2 dependency tree is most of the @@ -360,16 +365,16 @@ jobs: env: RUST_TARGET_TRIPLE: ${{ matrix.settings.target }} - # setup.js strips the local symbols from Microsoft's ONNX Runtime dylib - # before Cap bundles it; the C API ort loads through must still resolve - # and run a real inference. + # The ONNX Runtime setup.js prepares must load through ort's C API and + # run a real inference on every platform Cap ships. On macOS setup.js + # also strips the dylib's local symbols, so check the API still resolves. - name: Test the prepared ONNX Runtime - if: ${{ runner.os == 'macOS' }} shell: bash run: | set -euo pipefail - dylib=target/native-deps/onnxruntime/lib/libonnxruntime.dylib - nm -gU "$dylib" | grep -q OrtGetApiBase + if [[ "$RUNNER_OS" == "macOS" ]]; then + nm -gU target/native-deps/onnxruntime/lib/libonnxruntime.dylib | grep -q OrtGetApiBase + fi cargo test --locked -p cap-camera-effects --lib segmentation::tests::inference_runs_from_a_caller_with_a_tiny_stack -- --ignored --exact # The test build compiles every line the binary build does (the app has diff --git a/.github/workflows/database-profile-reliability.yml b/.github/workflows/database-profile-reliability.yml index c8679548945..ebcdd0b9ab8 100644 --- a/.github/workflows/database-profile-reliability.yml +++ b/.github/workflows/database-profile-reliability.yml @@ -1,6 +1,7 @@ name: Database Profile Reliability on: + merge_group: workflow_dispatch: pull_request: paths: @@ -26,7 +27,34 @@ concurrency: cancel-in-progress: true jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/database-profile-reliability.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + profile-contract: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} name: Profile, activation, and consent compatibility runs-on: ubuntu-24.04 timeout-minutes: 10 diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml index 7b93d117f9e..c95c402038b 100644 --- a/.github/workflows/desktop-release.yml +++ b/.github/workflows/desktop-release.yml @@ -794,7 +794,8 @@ jobs: "Cap.exe", "cap-muxer.exe", "cap-cli.exe", "avcodec-61.dll", "avdevice-61.dll", "avfilter-10.dll", "avformat-61.dll", "avutil-59.dll", "postproc-58.dll", "swresample-5.dll", "swscale-8.dll", - "dxcompiler.dll", "dxil.dll", "onnxruntime.dll", "onnxruntime_providers_shared.dll" + "dxcompiler.dll", "dxil.dll", "onnxruntime.dll", "onnxruntime_providers_shared.dll", + "msvcp140.dll", "msvcp140_1.dll", "vcruntime140.dll", "vcruntime140_1.dll" ) $forbiddenFiles = @("cap-gpui.exe", "cap-exporter.exe") foreach ($installer in $installers) { diff --git a/.github/workflows/docker-build-media-server.yml b/.github/workflows/docker-build-media-server.yml index d144229cb36..ba163f23c40 100644 --- a/.github/workflows/docker-build-media-server.yml +++ b/.github/workflows/docker-build-media-server.yml @@ -1,6 +1,7 @@ name: "Docker Build Media Server" on: + merge_group: workflow_dispatch: inputs: tag: @@ -32,7 +33,34 @@ concurrency: cancel-in-progress: true jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/docker-build-media-server.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + audio-metrics: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} name: Audio intelligibility alignment runs-on: ubuntu-24.04 timeout-minutes: 5 @@ -50,7 +78,27 @@ jobs: "$RUNNER_TEMP/audio-metrics/bin/python" -m pip install --disable-pip-version-check --no-input --only-binary=:all: numpy==2.4.1 scipy==1.18.1 pystoi==0.4.1 "$RUNNER_TEMP/audio-metrics/bin/python" scripts/test-audio-intelligibility.py + railway-dockerfile: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} + # The Railway media server builds apps/media-server/Dockerfile, whose test + # chain differs from Dockerfile.standalone. Building it here keeps that + # chain from failing unnoticed. + name: Build Railway Dockerfile + runs-on: ubuntu-24.04 + timeout-minutes: 30 + permissions: + contents: read + steps: + - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 + with: + persist-credentials: false + - name: Build apps/media-server/Dockerfile with its tests + run: docker build --progress=plain -f apps/media-server/Dockerfile -t cap-media-server:railway-check . + build: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} name: Build Docker Image (${{ matrix.platform }}) runs-on: ${{ matrix.runner }} timeout-minutes: 25 @@ -74,7 +122,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - if: github.event_name != 'pull_request' + if: (github.event_name != 'pull_request' && github.event_name != 'merge_group') uses: docker/login-action@v3 with: registry: ghcr.io @@ -92,16 +140,16 @@ jobs: context: ./apps/media-server file: ./apps/media-server/Dockerfile.standalone platforms: linux/${{ matrix.platform }} - push: ${{ github.event_name != 'pull_request' }} - load: ${{ github.event_name == 'pull_request' }} - tags: ${{ github.event_name == 'pull_request' && 'cap-media-server:verification' || '' }} - outputs: ${{ github.event_name != 'pull_request' && format('type=image,name=ghcr.io/{0}/cap-media-server,push-by-digest=true', env.REPOSITORY_OWNER) || '' }} + push: ${{ (github.event_name != 'pull_request' && github.event_name != 'merge_group') }} + load: ${{ (github.event_name == 'pull_request' || github.event_name == 'merge_group') }} + tags: ${{ (github.event_name == 'pull_request' || github.event_name == 'merge_group') && 'cap-media-server:verification' || '' }} + outputs: ${{ (github.event_name != 'pull_request' && github.event_name != 'merge_group') && format('type=image,name=ghcr.io/{0}/cap-media-server,push-by-digest=true', env.REPOSITORY_OWNER) || '' }} cache-from: type=gha,scope=media-server-${{ matrix.platform }} cache-to: type=gha,mode=max,scope=media-server-${{ matrix.platform }} - name: Verify recording decode in the production image env: - MEDIA_IMAGE: ${{ github.event_name == 'pull_request' && 'cap-media-server:verification' || format('ghcr.io/{0}/cap-media-server@{1}', env.REPOSITORY_OWNER, steps.build.outputs.digest) }} + MEDIA_IMAGE: ${{ (github.event_name == 'pull_request' || github.event_name == 'merge_group') && 'cap-media-server:verification' || format('ghcr.io/{0}/cap-media-server@{1}', env.REPOSITORY_OWNER, steps.build.outputs.digest) }} run: | docker run --rm --network none --entrypoint bun "$MEDIA_IMAGE" test \ src/__tests__/lib/audio-quality-policy.test.ts \ @@ -160,7 +208,7 @@ jobs: - name: Verify the server runs without root in the production image env: - MEDIA_IMAGE: ${{ github.event_name == 'pull_request' && 'cap-media-server:verification' || format('ghcr.io/{0}/cap-media-server@{1}', env.REPOSITORY_OWNER, steps.build.outputs.digest) }} + MEDIA_IMAGE: ${{ (github.event_name == 'pull_request' || github.event_name == 'merge_group') && 'cap-media-server:verification' || format('ghcr.io/{0}/cap-media-server@{1}', env.REPOSITORY_OWNER, steps.build.outputs.digest) }} run: | test "$(docker run --rm --network none "$MEDIA_IMAGE" id -u)" = 1000 docker volume create media-gpu-cache @@ -175,7 +223,7 @@ jobs: - name: Verify long recording performance in the production image env: - MEDIA_IMAGE: ${{ github.event_name == 'pull_request' && 'cap-media-server:verification' || format('ghcr.io/{0}/cap-media-server@{1}', env.REPOSITORY_OWNER, steps.build.outputs.digest) }} + MEDIA_IMAGE: ${{ (github.event_name == 'pull_request' || github.event_name == 'merge_group') && 'cap-media-server:verification' || format('ghcr.io/{0}/cap-media-server@{1}', env.REPOSITORY_OWNER, steps.build.outputs.digest) }} run: | docker run --rm --network none --cpus 2 --memory 2g \ -e MEDIA_SERVER_RECORDING_PERFORMANCE_TESTS=1 \ @@ -189,14 +237,14 @@ jobs: src/__tests__/lib/drive-resumable-upload.test.ts - name: Export Digest - if: github.event_name != 'pull_request' + if: (github.event_name != 'pull_request' && github.event_name != 'merge_group') run: | mkdir -p /tmp/digests digest="${{ steps.build.outputs.digest }}" touch "/tmp/digests/${digest#sha256:}" - name: Upload Digest - if: github.event_name != 'pull_request' + if: (github.event_name != 'pull_request' && github.event_name != 'merge_group') uses: actions/upload-artifact@v4 with: name: digests-media-server-${{ matrix.platform }} @@ -207,7 +255,7 @@ jobs: merge: name: Create Multi-Architecture Manifest needs: build - if: github.event_name != 'pull_request' + if: (github.event_name != 'pull_request' && github.event_name != 'merge_group') runs-on: ubuntu-latest permissions: contents: read diff --git a/.github/workflows/glass-probe.yml b/.github/workflows/glass-probe.yml index 57f960e09b4..01733fa1a38 100644 --- a/.github/workflows/glass-probe.yml +++ b/.github/workflows/glass-probe.yml @@ -5,6 +5,7 @@ name: Glass probe (real app) # fitted to Apple's own glass. on: + merge_group: pull_request: types: [opened, synchronize, reopened, ready_for_review] paths: @@ -33,10 +34,27 @@ jobs: runs-on: blacksmith-2vcpu-ubuntu-2404 timeout-minutes: 5 outputs: - run: ${{ steps.scope.outputs.run }} + run: ${{ steps.queue.outputs.run || steps.scope.outputs.run }} steps: + - uses: actions/checkout@v4 + if: github.event_name == 'merge_group' + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + if: github.event_name == 'merge_group' + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/glass-probe.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" - name: Scope id: scope + if: github.event_name != 'merge_group' env: GH_TOKEN: ${{ github.token }} EVENT: ${{ github.event_name }} diff --git a/.github/workflows/gpui-app-bench.yml b/.github/workflows/gpui-app-bench.yml index 8e414de31c6..7da1fc6a303 100644 --- a/.github/workflows/gpui-app-bench.yml +++ b/.github/workflows/gpui-app-bench.yml @@ -1,6 +1,7 @@ name: GPUI app benchmark on: + merge_group: pull_request: paths: - "apps/desktop-gpui/patches/**" @@ -26,11 +27,37 @@ permissions: contents: read jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/gpui-app-bench.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + editor: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }} name: Editor draw benchmark (macOS) # Benchmarks build GPUI twice and run for up to two hours, so pull requests # from forks do not start them; maintainers can run them with workflow_dispatch. - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository runs-on: blacksmith-6vcpu-macos-15 timeout-minutes: 150 env: @@ -72,7 +99,7 @@ jobs: shell: bash env: BASE_INPUT: ${{ inputs.base }} - PR_BASE: ${{ github.event.pull_request.base.sha }} + PR_BASE: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha }} run: | set -euo pipefail node scripts/sync-desktop-versions.mjs diff --git a/.github/workflows/gpui-bench.yml b/.github/workflows/gpui-bench.yml index 024f986805f..c6960eb88e9 100644 --- a/.github/workflows/gpui-bench.yml +++ b/.github/workflows/gpui-bench.yml @@ -1,6 +1,7 @@ name: GPUI frame benchmarks on: + merge_group: pull_request: paths: - "apps/desktop-gpui/patches/**" @@ -29,11 +30,37 @@ permissions: contents: read jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/gpui-bench.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + bench: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }} name: GPUI benchmarks (${{ matrix.settings.name }}) # Benchmarks build GPUI twice and run for up to two hours, so pull requests # from forks do not start them; maintainers can run them with workflow_dispatch. - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository timeout-minutes: 150 strategy: fail-fast: false @@ -84,7 +111,7 @@ jobs: shell: bash env: BASE_INPUT: ${{ inputs.base }} - PR_BASE: ${{ github.event.pull_request.base.sha }} + PR_BASE: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha }} run: | set -euo pipefail ./scripts/prepare-gpui-dependency.sh @@ -170,9 +197,10 @@ jobs: if-no-files-found: ignore test: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }} name: GPUI tests (${{ matrix.settings.name }}) # Same as the benchmarks: GPUI's test builds are long, so forks do not start them. - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository timeout-minutes: 120 strategy: fail-fast: false diff --git a/.github/workflows/infra-database.yml b/.github/workflows/infra-database.yml index b124d94cb2e..449c1bbd10d 100644 --- a/.github/workflows/infra-database.yml +++ b/.github/workflows/infra-database.yml @@ -1,6 +1,7 @@ name: Infra Database on: + merge_group: workflow_dispatch: pull_request: paths: @@ -11,6 +12,21 @@ on: - "apps/web/app/(infra)/**" - "apps/web/app/api/developer/**" - "apps/web/app/api/cron/developer-storage/**" + - "apps/web/lib/user-preferences-sql.ts" + - "apps/web/lib/media-input-policy-strikes.ts" + - "apps/web/lib/organization-member-removal.ts" + - "packages/web-backend/src/Spaces/**" + - "packages/web-backend/src/Folders/FoldersPolicy.ts" + - "apps/web/actions/notifications/**" + - "apps/web/actions/analytics/**" + - "apps/web/actions/caps/**" + - "apps/web/actions/spaces/video-order.ts" + - "apps/web/actions/videos/archive.ts" + - "apps/web/actions/loom-import-overview.ts" + - "apps/web/lib/space-video-order*" + - "apps/web/lib/messenger/data.ts" + - "apps/web/actions/messenger.ts" + - "apps/web/app/api/messenger/**" - "packages/database/schema.ts" - "packages/database/migrations/**" - ".github/workflows/infra-database.yml" @@ -24,6 +40,21 @@ on: - "apps/web/app/(infra)/**" - "apps/web/app/api/developer/**" - "apps/web/app/api/cron/developer-storage/**" + - "apps/web/lib/user-preferences-sql.ts" + - "apps/web/lib/media-input-policy-strikes.ts" + - "apps/web/lib/organization-member-removal.ts" + - "packages/web-backend/src/Spaces/**" + - "packages/web-backend/src/Folders/FoldersPolicy.ts" + - "apps/web/actions/notifications/**" + - "apps/web/actions/analytics/**" + - "apps/web/actions/caps/**" + - "apps/web/actions/spaces/video-order.ts" + - "apps/web/actions/videos/archive.ts" + - "apps/web/actions/loom-import-overview.ts" + - "apps/web/lib/space-video-order*" + - "apps/web/lib/messenger/data.ts" + - "apps/web/actions/messenger.ts" + - "apps/web/app/api/messenger/**" - "packages/database/schema.ts" - "packages/database/migrations/**" - ".github/workflows/infra-database.yml" @@ -36,7 +67,34 @@ concurrency: cancel-in-progress: true jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/infra-database.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + infra-database: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} name: Infra billing and uploads against MySQL runs-on: ubuntu-24.04 timeout-minutes: 15 @@ -76,4 +134,4 @@ jobs: env: CAP_INFRA_TEST_DATABASE_URL: mysql://root@127.0.0.1:3306/cap_infra_tests CAP_INFRA_ROUND_TRIPS_DATABASE_URL: mysql://root@127.0.0.1:3306/cap_infra_tests - run: bun run vitest run __tests__/integration/infra-*-database.test.ts + run: bun run vitest run __tests__/integration/infra-*-database.test.ts __tests__/integration/user-preferences-database.test.ts __tests__/integration/space-creator-membership-database.test.ts __tests__/integration/dashboard-library-database.test.ts __tests__/integration/messenger-poll-database.test.ts diff --git a/.github/workflows/instant-reliability.yml b/.github/workflows/instant-reliability.yml index 227cec6771d..2804d9d37a6 100644 --- a/.github/workflows/instant-reliability.yml +++ b/.github/workflows/instant-reliability.yml @@ -10,11 +10,15 @@ name: Instant reliability (real app) # Instant with a virtual camera drawn into the video. on: + merge_group: pull_request: types: [opened, synchronize, reopened, ready_for_review] paths: - "apps/desktop-gpui/src/upload.rs" - "apps/desktop-gpui/src/upload/**" + - "apps/desktop-gpui/src/automation.rs" + - "apps/desktop-gpui/src/automation/**" + - "crates/automation/**" - "apps/desktop-gpui/src/recording.rs" - "apps/desktop-gpui/src/session.rs" - "apps/desktop-gpui/src/library.rs" @@ -55,10 +59,27 @@ jobs: runs-on: blacksmith-2vcpu-ubuntu-2404 timeout-minutes: 5 outputs: - run: ${{ steps.scope.outputs.run }} + run: ${{ steps.queue.outputs.run || steps.scope.outputs.run }} steps: + - uses: actions/checkout@v4 + if: github.event_name == 'merge_group' + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + if: github.event_name == 'merge_group' + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/instant-reliability.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" - name: Scope id: scope + if: github.event_name != 'merge_group' env: GH_TOKEN: ${{ github.token }} EVENT: ${{ github.event_name }} diff --git a/.github/workflows/linux-desktop-reliability.yml b/.github/workflows/linux-desktop-reliability.yml index 910291184d4..06bf4a39ad7 100644 --- a/.github/workflows/linux-desktop-reliability.yml +++ b/.github/workflows/linux-desktop-reliability.yml @@ -7,6 +7,7 @@ name: Linux desktop reliability # the tray, approve the screen share), stops it, and checks it finished. on: + merge_group: pull_request: paths: - "apps/desktop-gpui/**" @@ -47,10 +48,27 @@ jobs: runs-on: blacksmith-2vcpu-ubuntu-2404 timeout-minutes: 5 outputs: - run: ${{ steps.scope.outputs.run }} + run: ${{ steps.queue.outputs.run || steps.scope.outputs.run }} steps: + - uses: actions/checkout@v4 + if: github.event_name == 'merge_group' + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + if: github.event_name == 'merge_group' + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/linux-desktop-reliability.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" - name: Scope id: scope + if: github.event_name != 'merge_group' env: GH_TOKEN: ${{ github.token }} EVENT: ${{ github.event_name }} @@ -69,6 +87,69 @@ jobs: echo "A fork pull request that changes no app code does not run the Linux desktop suite." | tee -a "$GITHUB_STEP_SUMMARY" fi + # One build serves the GNOME editor, Hyprland and niri jobs, so they start + # as soon as the app is built instead of after every GNOME scenario. + build: + name: Build cap-gpui (Linux) + needs: scope + if: needs.scope.outputs.run == 'true' + runs-on: blacksmith-8vcpu-ubuntu-2404 + timeout-minutes: 60 + env: + CARGO_PROFILE_DEV_DEBUG: "0" + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Install Linux desktop dependencies + uses: ./.github/actions/install-desktop-deps + + - name: Rust setup + uses: dtolnay/rust-toolchain@1.95.0 + with: + targets: x86_64-unknown-linux-gnu + + - uses: ./.github/actions/setup-rust-cache + with: + target: x86_64-unknown-linux-gnu + prefix-key: v1-rust-gpui + save-cache: "false" + workspaces: apps/desktop-gpui -> target + + - name: Run setup + run: node scripts/setup.js + env: + RUST_TARGET_TRIPLE: x86_64-unknown-linux-gnu + + - name: Prepare GPUI dependency + run: | + node scripts/sync-desktop-versions.mjs + ./scripts/prepare-gpui-dependency.sh + + # With debug assertions, wgpu-types turns on Vulkan debug labels, which + # release builds never use. Labelling a GPUI buffer races with the + # export creating its own Vulkan instance, and the Vulkan loader + # (1.4.341) crashes in loader_get_icd_and_device about once per 100 + # exports. Building only wgpu-types without them gives the app the + # release build's instance flags. + - name: Build cap-gpui + run: >- + cargo +1.95.0 build --manifest-path apps/desktop-gpui/Cargo.toml --locked --bin cap-gpui + --config 'profile.dev.package.wgpu-types.debug-assertions=false' + + - name: Package the build + run: | + mkdir -p "$RUNNER_TEMP/build/libs" + cp apps/desktop-gpui/target/debug/cap-gpui "$RUNNER_TEMP/build/cap-gpui" + strip --strip-debug "$RUNNER_TEMP/build/cap-gpui" + cp -a target/native-deps/lib/. "$RUNNER_TEMP/build/libs/" + + - uses: actions/upload-artifact@v4 + with: + name: cap-gpui-linux + path: ${{ runner.temp }}/build + retention-days: 1 + desktops: name: Record on GNOME needs: scope @@ -213,10 +294,45 @@ jobs: grep -qx "$line" "$RUNNER_TEMP/out/gnome-no-control/result.txt" done + - name: Check results + run: | + bash scripts/linux-desktop-harness/check-results.sh \ + "$RUNNER_TEMP/out/gnome" "$RUNNER_TEMP/out/gnome-tray" "$RUNNER_TEMP/out/gnome-terminal" + + - name: Upload logs + if: always() + uses: actions/upload-artifact@v4 + with: + name: linux-desktop-reliability-gnome + path: ${{ runner.temp }}/out + if-no-files-found: ignore + + gnome-apps: + name: Record on GNOME (editor, screenshots, relaunch) + needs: build + runs-on: blacksmith-8vcpu-ubuntu-2404 + timeout-minutes: 45 + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - uses: actions/download-artifact@v4 + with: + name: cap-gpui-linux + path: ${{ runner.temp }}/build + + - name: Make the build executable + run: chmod +x "$RUNNER_TEMP/build/cap-gpui" + + - name: Fetch the Cap package for desktop integration + run: | + curl --fail --location --retry 3 -o "$RUNNER_TEMP/cap.deb" "$CAP_DEB_URL" + echo "$CAP_DEB_SHA256 $RUNNER_TEMP/cap.deb" | sha256sum --check + - name: GNOME 50 settings window closes from its own button env: - DEV_BIN: ${{ github.workspace }}/apps/desktop-gpui/target/debug/cap-gpui - DEV_LIBS: ${{ github.workspace }}/target/native-deps/lib + DEV_BIN: ${{ runner.temp }}/build/cap-gpui + DEV_LIBS: ${{ runner.temp }}/build/libs SCENARIO: settings-close run: | sudo -E bash scripts/linux-desktop-harness/run-desktop.sh gnome "$RUNNER_TEMP/cap.deb" \ @@ -226,8 +342,8 @@ jobs: - name: GNOME 50 relaunch from the app grid reaches the running Cap env: - DEV_BIN: ${{ github.workspace }}/apps/desktop-gpui/target/debug/cap-gpui - DEV_LIBS: ${{ github.workspace }}/target/native-deps/lib + DEV_BIN: ${{ runner.temp }}/build/cap-gpui + DEV_LIBS: ${{ runner.temp }}/build/libs SCENARIO: reopen run: | sudo -E bash scripts/linux-desktop-harness/run-desktop.sh gnome "$RUNNER_TEMP/cap.deb" \ @@ -237,8 +353,8 @@ jobs: - name: GNOME 50 relaunch brings Cap to the front over its settings env: - DEV_BIN: ${{ github.workspace }}/apps/desktop-gpui/target/debug/cap-gpui - DEV_LIBS: ${{ github.workspace }}/target/native-deps/lib + DEV_BIN: ${{ runner.temp }}/build/cap-gpui + DEV_LIBS: ${{ runner.temp }}/build/libs SCENARIO: raise run: | for window in main onboarding; do @@ -250,8 +366,8 @@ jobs: - name: GNOME 50 editor background image from the portal file chooser env: - DEV_BIN: ${{ github.workspace }}/apps/desktop-gpui/target/debug/cap-gpui - DEV_LIBS: ${{ github.workspace }}/target/native-deps/lib + DEV_BIN: ${{ runner.temp }}/build/cap-gpui + DEV_LIBS: ${{ runner.temp }}/build/libs SCENARIO: pick-background run: | sudo -E bash scripts/linux-desktop-harness/run-desktop.sh gnome "$RUNNER_TEMP/cap.deb" \ @@ -264,8 +380,8 @@ jobs: # GNOME's default wallpaper is JPEG XL. - name: GNOME 50 editor background from the desktop wallpaper env: - DEV_BIN: ${{ github.workspace }}/apps/desktop-gpui/target/debug/cap-gpui - DEV_LIBS: ${{ github.workspace }}/target/native-deps/lib + DEV_BIN: ${{ runner.temp }}/build/cap-gpui + DEV_LIBS: ${{ runner.temp }}/build/libs SCENARIO: wallpaper run: | sudo -E bash scripts/linux-desktop-harness/run-desktop.sh gnome "$RUNNER_TEMP/cap.deb" \ @@ -280,8 +396,8 @@ jobs: # has focus. - name: GNOME 50 screenshot, allowed when the portal asks env: - DEV_BIN: ${{ github.workspace }}/apps/desktop-gpui/target/debug/cap-gpui - DEV_LIBS: ${{ github.workspace }}/target/native-deps/lib + DEV_BIN: ${{ runner.temp }}/build/cap-gpui + DEV_LIBS: ${{ runner.temp }}/build/libs SCENARIO: screenshot run: | sudo -E bash scripts/linux-desktop-harness/run-desktop.sh gnome "$RUNNER_TEMP/cap.deb" \ @@ -293,8 +409,8 @@ jobs: - name: GNOME 50 screenshot from a terminal launch (Cap names itself so.cap.Cap) env: - DEV_BIN: ${{ github.workspace }}/apps/desktop-gpui/target/debug/cap-gpui - DEV_LIBS: ${{ github.workspace }}/target/native-deps/lib + DEV_BIN: ${{ runner.temp }}/build/cap-gpui + DEV_LIBS: ${{ runner.temp }}/build/libs SCENARIO: screenshot run: | sudo -E bash scripts/linux-desktop-harness/run-desktop.sh gnome "$RUNNER_TEMP/cap.deb" \ @@ -306,8 +422,8 @@ jobs: - name: GNOME 50 area recording (portal stream cropped to the area) env: - DEV_BIN: ${{ github.workspace }}/apps/desktop-gpui/target/debug/cap-gpui - DEV_LIBS: ${{ github.workspace }}/target/native-deps/lib + DEV_BIN: ${{ runner.temp }}/build/cap-gpui + DEV_LIBS: ${{ runner.temp }}/build/libs run: | sudo -E bash scripts/linux-desktop-harness/run-desktop.sh gnome "$RUNNER_TEMP/cap.deb" \ "$RUNNER_TEMP/out/gnome-area" LAUNCH=dock APPROVE_SHORTCUT_AFTER=6 AREA=200,150,800,450 @@ -318,8 +434,8 @@ jobs: - name: GNOME 50 editor export to MP4 and GIF env: - DEV_BIN: ${{ github.workspace }}/apps/desktop-gpui/target/debug/cap-gpui - DEV_LIBS: ${{ github.workspace }}/target/native-deps/lib + DEV_BIN: ${{ runner.temp }}/build/cap-gpui + DEV_LIBS: ${{ runner.temp }}/build/libs SCENARIO: export run: | sudo -E bash scripts/linux-desktop-harness/run-desktop.sh gnome "$RUNNER_TEMP/cap.deb" \ @@ -330,35 +446,17 @@ jobs: grep -qx "$line" "$RUNNER_TEMP/out/gnome-export/result.txt" done - - name: Check results - run: | - bash scripts/linux-desktop-harness/check-results.sh \ - "$RUNNER_TEMP/out/gnome" "$RUNNER_TEMP/out/gnome-tray" "$RUNNER_TEMP/out/gnome-terminal" - - - name: Package the build for the Hyprland job - run: | - mkdir -p "$RUNNER_TEMP/build/libs" - cp apps/desktop-gpui/target/debug/cap-gpui "$RUNNER_TEMP/build/cap-gpui" - strip --strip-debug "$RUNNER_TEMP/build/cap-gpui" - cp -a target/native-deps/lib/. "$RUNNER_TEMP/build/libs/" - - - uses: actions/upload-artifact@v4 - with: - name: cap-gpui-linux - path: ${{ runner.temp }}/build - retention-days: 1 - - name: Upload logs if: always() uses: actions/upload-artifact@v4 with: - name: linux-desktop-reliability-gnome + name: linux-desktop-reliability-gnome-apps path: ${{ runner.temp }}/out if-no-files-found: ignore hyprland: name: Record on Hyprland - needs: desktops + needs: build # vkms, the virtual display Hyprland runs on, is in the hosted runner's # extra kernel modules; Blacksmith's kernel does not ship it. runs-on: ubuntu-24.04 @@ -556,7 +654,7 @@ jobs: niri: name: Record on niri - needs: desktops + needs: build # niri 26.04 shares screencasts only as DMA-BUFs with a mandatory # modifier (GitHub #2941). It refuses software rendering, so this builds # the release with only that check removed and runs it on vkms. diff --git a/.github/workflows/merge-queue.yml b/.github/workflows/merge-queue.yml new file mode 100644 index 00000000000..0de59337c6d --- /dev/null +++ b/.github/workflows/merge-queue.yml @@ -0,0 +1,46 @@ +name: Merge queue + +# "Merge queue" is the check to require. In the merge queue it waits for every +# workflow that declares merge_group (scripts/ci/merge_queue.py expected) to +# finish on the queued commit and fails as soon as one fails, so a workflow +# added to the queue is a merge gate without another ruleset change. On pull +# requests it only checks the queue helpers: the queue run is the one that +# decides. + +on: + pull_request: + merge_group: + +permissions: + actions: read + checks: read + contents: read + +concurrency: + group: merge-queue-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + gate: + name: Merge queue + # GitHub-hosted, because this job only waits on the API for up to the + # length of the slowest queue workflow. + runs-on: ubuntu-latest + timeout-minutes: 170 + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + sparse-checkout: | + .github/workflows + scripts/ci + + - name: Check the queue helpers + run: python3 scripts/ci/merge_queue.py test + + - name: Wait for the queue workflows + if: github.event_name == 'merge_group' + env: + GITHUB_TOKEN: ${{ github.token }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py gate --head "$HEAD" diff --git a/.github/workflows/perf-budget.yml b/.github/workflows/perf-budget.yml index 401f5a036ac..78c063c80ef 100644 --- a/.github/workflows/perf-budget.yml +++ b/.github/workflows/perf-budget.yml @@ -5,6 +5,7 @@ name: Perf budget # drifts between jobs. "Perf budget" is the job to require. on: + merge_group: pull_request: types: [opened, synchronize, reopened, ready_for_review] workflow_dispatch: @@ -38,7 +39,9 @@ jobs: EVENT: ${{ github.event_name }} PR: ${{ github.event.pull_request.number }} DRAFT: ${{ github.event.pull_request.draft }} - SAME_REPO: ${{ github.event.pull_request.head.repo.full_name == github.repository }} + SAME_REPO: ${{ github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'merge_group' }} + MQ_BASE: ${{ github.event.merge_group.base_sha }} + MQ_HEAD: ${{ github.event.merge_group.head_sha }} RUSTUP_TOOLCHAIN: stable run: | set -euo pipefail @@ -49,7 +52,11 @@ jobs: echo "Draft: the perf budget runs once the pull request is ready." | tee -a "$GITHUB_STEP_SUMMARY" echo "run=false" >> "$GITHUB_OUTPUT"; exit 0 fi - gh api "repos/$GITHUB_REPOSITORY/pulls/$PR/files" --paginate --jq '.[].filename' > "$RUNNER_TEMP/changed.txt" + if [[ "$EVENT" == merge_group ]]; then + python3 scripts/ci/merge_queue.py files --base "$MQ_BASE" --head "$MQ_HEAD" > "$RUNNER_TEMP/changed.txt" + else + gh api "repos/$GITHUB_REPOSITORY/pulls/$PR/files" --paginate --jq '.[].filename' > "$RUNNER_TEMP/changed.txt" + fi python3 scripts/verify/plan.py risk --files "$RUNNER_TEMP/changed.txt" --output "$RUNNER_TEMP/risk.txt" # A change to the budget itself is measured only from this # repository's branches, so a fork cannot queue the macOS job by @@ -65,9 +72,20 @@ jobs: echo "run=false" >> "$GITHUB_OUTPUT" fi + # Workload groups (scripts/verify/perf-ab.py GROUPS) run side by side, one + # runner each; every base and head pair still shares one machine. In one + # job they took about 19 minutes, 8 of them on report-only playback. measure: + name: measure (${{ matrix.group }}) needs: scope if: needs.scope.outputs.run == 'true' + strategy: + fail-fast: false + matrix: + group: + - export + - export-camera-and-seek + - playback runs-on: blacksmith-6vcpu-macos-26 timeout-minutes: 120 steps: @@ -94,7 +112,7 @@ jobs: - name: Base worktree env: BASE_INPUT: ${{ inputs.base }} - PR_BASE: ${{ github.event.pull_request.base.sha }} + PR_BASE: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha }} run: | set -euo pipefail base="${BASE_INPUT:-}" @@ -123,12 +141,13 @@ jobs: --head "$RUNNER_TEMP/perf/head/binaries.json" \ --fixtures "$RUNNER_TEMP/perf/fixtures" \ --out "$RUNNER_TEMP/perf/runs" \ + --group "${{ matrix.group }}" \ --summary "$GITHUB_STEP_SUMMARY" - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 if: always() with: - name: perf-budget + name: perf-budget-${{ matrix.group }} path: ${{ runner.temp }}/perf/runs/**/perf-budget.md if-no-files-found: ignore diff --git a/.github/workflows/picker-smoke.yml b/.github/workflows/picker-smoke.yml index f2ceb4facd3..4344352e1e5 100644 --- a/.github/workflows/picker-smoke.yml +++ b/.github/workflows/picker-smoke.yml @@ -1,6 +1,7 @@ name: Picker smoke (real app) on: + merge_group: pull_request: types: [opened, synchronize, reopened, ready_for_review] paths: @@ -37,10 +38,27 @@ jobs: runs-on: blacksmith-2vcpu-ubuntu-2404 timeout-minutes: 5 outputs: - run: ${{ steps.scope.outputs.run }} + run: ${{ steps.queue.outputs.run || steps.scope.outputs.run }} steps: + - uses: actions/checkout@v4 + if: github.event_name == 'merge_group' + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + if: github.event_name == 'merge_group' + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/picker-smoke.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" - name: Scope id: scope + if: github.event_name != 'merge_group' env: GH_TOKEN: ${{ github.token }} EVENT: ${{ github.event_name }} @@ -73,10 +91,6 @@ jobs: slug: macos target: aarch64-apple-darwin runner: blacksmith-6vcpu-macos-15 - - name: Windows - slug: windows - target: x86_64-pc-windows-msvc - runner: windows-2022 - name: Linux X11 slug: linux-x11 target: x86_64-unknown-linux-gnu @@ -160,12 +174,6 @@ jobs: sleep 2 scripts/picker-smoke/run.sh "$app" "$out" ;; - Windows) - export PATH="$(cygpath "$GITHUB_WORKSPACE/target/debug"):$PATH" - notepad.exe & - sleep 2 - scripts/picker-smoke/run.sh "$app.exe" "$out" - ;; Linux) export LD_LIBRARY_PATH="$GITHUB_WORKSPACE/target/native-deps/lib:$GITHUB_WORKSPACE/target/debug${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" Xvfb :99 -screen 0 1920x1080x24 -noreset & @@ -179,24 +187,151 @@ jobs: ;; esac + - name: Upload logs + if: always() + uses: actions/upload-artifact@v4 + with: + name: picker-smoke-${{ matrix.settings.slug }} + path: ${{ runner.temp }}/picker-smoke + retention-days: 7 + + # Windows Graphics Capture needs the hosted runner's interactive console + # session (Blacksmith Windows VMs run jobs in session 0, with no desktop), but + # a hosted runner cannot restore Blacksmith's build cache and compiled the app + # cold in about 33 minutes. Blacksmith builds it from the warm cache instead + # and the hosted runner only runs it. + build-windows: + name: Build the app (Windows) + needs: scope + if: needs.scope.outputs.run == 'true' + runs-on: blacksmith-8vcpu-windows-2025 + timeout-minutes: 60 + env: + CARGO_PROFILE_DEV_DEBUG: "0" + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Rust setup + uses: dtolnay/rust-toolchain@1.95.0 + with: + targets: x86_64-pc-windows-msvc + + - uses: ./.github/actions/setup-rust-cache + with: + target: x86_64-pc-windows-msvc + prefix-key: v1-rust-gpui + save-cache: "false" + workspaces: apps/desktop-gpui -> target + + - name: Run setup + shell: bash + run: node scripts/setup.js + env: + RUST_TARGET_TRIPLE: x86_64-pc-windows-msvc + + - name: Prepare GPUI dependency + shell: bash + run: | + node scripts/sync-desktop-versions.mjs + ./scripts/prepare-gpui-dependency.sh + + - name: Build the app + shell: bash + run: | + cargo +1.95.0 build --manifest-path apps/desktop-gpui/Cargo.toml --locked \ + --target x86_64-pc-windows-msvc --bin cap-gpui + + # A debug build reads files from the source trees it was compiled in, by + # absolute path: gpui_windows compiles its HLSL shaders at startup from + # its CARGO_MANIFEST_DIR in ../zed-cap, and the app reads bundled + # wallpapers and music from apps/desktop-gpui. The hosted job puts them + # back at those paths. + - name: Stage the app + shell: bash + run: | + stage="$RUNNER_TEMP/stage" + mkdir -p "$stage/gpui-windows-shaders" + cp apps/desktop-gpui/target/x86_64-pc-windows-msvc/debug/cap-gpui.exe "$stage/" + zed="$(cd ../zed-cap && pwd -W)" + cp ../zed-cap/crates/gpui_windows/src/*.hlsl "$stage/gpui-windows-shaders/" + printf '%s' "$GITHUB_WORKSPACE" > "$stage/build-workspace.txt" + printf '%s' "$zed" > "$stage/build-zed.txt" + ls -la "$stage" "$stage/gpui-windows-shaders" + + - uses: actions/upload-artifact@v4 + with: + name: picker-smoke-windows-app + path: ${{ runner.temp }}/stage + retention-days: 1 + + smoke-windows: + name: Picker smoke (Windows) + needs: build-windows + runs-on: windows-2022 + timeout-minutes: 30 + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - uses: actions/download-artifact@v4 + with: + name: picker-smoke-windows-app + path: ${{ runner.temp }}/app + + - name: Put the build's source files back at its paths + shell: pwsh + run: | + $app = "$env:RUNNER_TEMP\app" + $debug = "$env:GITHUB_WORKSPACE\apps\desktop-gpui\target\x86_64-pc-windows-msvc\debug" + New-Item -ItemType Directory -Force $debug | Out-Null + Copy-Item "$app\cap-gpui.exe" $debug + $workspace = (Get-Content "$app\build-workspace.txt" -Raw).Trim() + if ($workspace -ne $env:GITHUB_WORKSPACE) { + New-Item -ItemType Directory -Force (Split-Path $workspace) | Out-Null + cmd /c mklink /J "$workspace" "$env:GITHUB_WORKSPACE" + if ($LASTEXITCODE -ne 0) { throw "mklink failed" } + } + $shaders = Join-Path (Get-Content "$app\build-zed.txt" -Raw).Trim() "crates\gpui_windows\src" + New-Item -ItemType Directory -Force $shaders | Out-Null + Copy-Item "$app\gpui-windows-shaders\*.hlsl" $shaders + Get-ChildItem $shaders + + # FFmpeg and ONNX Runtime DLLs into target/debug, which the probes put + # on PATH. + - name: Run setup + shell: bash + run: node scripts/setup.js + env: + RUST_TARGET_TRIPLE: x86_64-pc-windows-msvc + + - name: Picker probe + shell: bash + run: | + export PATH="$(cygpath "$GITHUB_WORKSPACE/target/debug"):$PATH" + notepad.exe & + sleep 2 + scripts/picker-smoke/run.sh \ + "$GITHUB_WORKSPACE/apps/desktop-gpui/target/x86_64-pc-windows-msvc/debug/cap-gpui.exe" \ + "$RUNNER_TEMP/picker-smoke" + # An area recording keeps its outline on screen, out of the video and # out of the mouse's way (picker_probe/area_recording.rs). Windows only: # macOS leaves the outline out of the capture by window number, which a # screenshot does not, and Linux closes the outline when recording. - name: Area recording probe - if: ${{ runner.os == 'Windows' }} shell: bash run: | export PATH="$(cygpath "$GITHUB_WORKSPACE/target/debug"):$PATH" CAP_PICKER_PROBE_AREA_RECORDING=1 PICKER_SMOKE_POLLS=480 \ scripts/picker-smoke/run.sh \ - "$GITHUB_WORKSPACE/apps/desktop-gpui/target/${{ matrix.settings.target }}/debug/cap-gpui.exe" \ + "$GITHUB_WORKSPACE/apps/desktop-gpui/target/x86_64-pc-windows-msvc/debug/cap-gpui.exe" \ "$RUNNER_TEMP/picker-smoke/area-recording" - name: Upload logs if: always() uses: actions/upload-artifact@v4 with: - name: picker-smoke-${{ matrix.settings.slug }} + name: picker-smoke-windows path: ${{ runner.temp }}/picker-smoke retention-days: 7 diff --git a/.github/workflows/recording-reliability.yml b/.github/workflows/recording-reliability.yml index d7be8f0c131..bda5a216855 100644 --- a/.github/workflows/recording-reliability.yml +++ b/.github/workflows/recording-reliability.yml @@ -1,6 +1,7 @@ name: Recording Reliability on: + merge_group: workflow_dispatch: pull_request: paths: @@ -30,7 +31,34 @@ concurrency: cancel-in-progress: true jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/recording-reliability.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + recording-contract: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} name: Recording ownership, preservation, and recovery runs-on: ubuntu-24.04 timeout-minutes: 15 diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index 0877f46d839..eeadf53dadf 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -1,6 +1,7 @@ name: Status app on: + merge_group: pull_request: paths: - "apps/status/**" @@ -17,7 +18,34 @@ permissions: contents: read jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/status.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + verify: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/sync-tests.yml b/.github/workflows/sync-tests.yml index 2fe441dd908..b299ac6548e 100644 --- a/.github/workflows/sync-tests.yml +++ b/.github/workflows/sync-tests.yml @@ -12,6 +12,7 @@ name: A/V Sync Tests # Findings are published as a job-summary table and a JSON artifact per OS. on: + merge_group: workflow_dispatch: schedule: - cron: "0 5 * * *" @@ -45,14 +46,67 @@ permissions: contents: read jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/sync-tests.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + + # Each runner's steps are split into parts that run side by side, so every + # step keeps its environment. One job per runner took about 25 minutes, most + # of it these steps one after another: the timestamp tests (5 to 12 min), the + # synthetic device matrix (3.5 min on every runner) and the Linux playback + # harness (7 to 10 min). + # + # macOS runs on Blacksmith: hosted macOS runs at most five jobs at once for + # the organisation, and two hosted parts queued 6.5 and 25 minutes (run + # 44154886695). Blacksmith Macs have no hardware video encoder, so the + # encoder crates also run on one hosted Mac, which has VideoToolbox's. sync-tests: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} + name: sync-tests (${{ matrix.runner }}, ${{ matrix.parts }}) strategy: fail-fast: false matrix: - runner: - - macos-latest - - windows-2022 - - ubuntu-24.04 + include: + - runner: blacksmith-6vcpu-macos-15 + parts: timestamp + - runner: blacksmith-6vcpu-macos-15 + parts: units,matrix + - runner: macos-latest + parts: encoders + - runner: windows-2022 + parts: timestamp + - runner: windows-2022 + parts: units + - runner: windows-2022 + parts: matrix + - runner: ubuntu-24.04 + parts: timestamp,units + - runner: ubuntu-24.04 + parts: matrix + - runner: ubuntu-24.04 + parts: playback runs-on: ${{ matrix.runner }} permissions: contents: read @@ -94,9 +148,11 @@ jobs: run: Add-Content -Path $env:GITHUB_PATH -Value "${{ github.workspace }}\\target\\ffmpeg\\bin" - name: RNNoise lifecycle regression tests + if: contains(format(',{0},', matrix.parts), ',units,') run: cargo test --locked -p cap-rnnoise --lib - name: Recording metadata and harness regression tests + if: contains(format(',{0},', matrix.parts), ',units,') shell: bash run: | cargo test --locked -p cap-project --lib @@ -104,7 +160,7 @@ jobs: python -B scripts/test-capbench.py - name: Compile recording process supervisor (Windows) - if: runner.os == 'Windows' + if: runner.os == 'Windows' && contains(format(',{0},', matrix.parts), ',units,') shell: pwsh run: Add-Type -Path scripts/recording-reliability-owned-process.cs @@ -144,6 +200,7 @@ jobs: Start-Service -Name Audiosrv -ErrorAction SilentlyContinue - name: Timestamp pipeline unit + property tests + if: contains(format(',{0},', matrix.parts), ',timestamp,') shell: bash run: | cargo test --locked -p cap-timestamp -p cap-enc-ffmpeg -p ffmpeg-hw-device @@ -157,6 +214,7 @@ jobs: cargo test --locked -p cap-rendering --lib zoom_spring::tests::precompute_cost_is_bounded_for_long_projects -- --exact --nocapture --test-threads=1 - name: Editor audio playback and export regressions + if: contains(format(',{0},', matrix.parts), ',units,') shell: bash run: | cargo test --locked -p cap-audio --lib @@ -167,6 +225,7 @@ jobs: cargo test --locked -p cap-editor --lib playback::tests:: - name: Render farm engine + if: contains(format(',{0},', matrix.parts), ',units,') shell: bash run: cargo test --locked -p cap-render-farm @@ -174,6 +233,7 @@ jobs: # scenarios: pause/resume excision, stall-recovery bursts with # same-microsecond timestamps, segment assembly and A/V alignment. - name: Instant mode scenario harness + if: contains(format(',{0},', matrix.parts), ',units,') shell: bash run: | cargo test --locked -p cap-recording --test instant_mode_scenarios @@ -184,6 +244,7 @@ jobs: # once rotted into breaking every non-macOS test build via ungated # macOS-only imports. - name: Compile recording test harnesses + if: contains(format(',{0},', matrix.parts), ',units,') shell: bash run: | cargo check --locked -p cap-recording --tests @@ -191,8 +252,19 @@ jobs: # The AVFoundation encoder (studio camera/display on macOS) has its own # pts handling; its fps-matrix duration tests guard against re-timing # sources that deliver at a different rate than configured. + - name: VideoToolbox FFmpeg encoder tests (macOS) + if: runner.os == 'macOS' && contains(format(',{0},', matrix.parts), ',encoders,') + shell: bash + # One test at a time: tests opening VideoToolbox sessions in + # parallel exhaust the runner's sessions (-12903). The variable turns + # a missing zero-copy VideoToolbox encoder into a failure instead of + # a skip. + env: + CAP_REQUIRE_VIDEOTOOLBOX: "1" + run: cargo test --locked -p cap-enc-ffmpeg -- --test-threads=1 + - name: AVFoundation encoder tests (macOS) - if: runner.os == 'macOS' + if: runner.os == 'macOS' && contains(format(',{0},', matrix.parts), ',encoders,') shell: bash run: | cargo test --locked -p cap-enc-avfoundation @@ -201,7 +273,7 @@ jobs: # a missing endpoint (driver install regression) into a hard failure # instead of a silent skip. - name: WASAPI loopback endpoint tests (Windows) - if: runner.os == 'Windows' + if: runner.os == 'Windows' && contains(format(',{0},', matrix.parts), ',units,') shell: bash env: CAP_REQUIRE_AUDIO_ENDPOINT: "1" @@ -209,6 +281,7 @@ jobs: cargo test --locked -p cap-recording --test windows_loopback -- --nocapture - name: Synthetic device matrix + if: contains(format(',{0},', matrix.parts), ',matrix,') id: matrix continue-on-error: true shell: bash @@ -234,13 +307,13 @@ jobs: # exercised here; the macOS AVAssetReader path is covered by running # `cap selftest playback` locally on real hardware. - name: Editor playback sync harness - if: runner.os == 'Linux' + if: runner.os == 'Linux' && contains(format(',{0},', matrix.parts), ',playback,') shell: bash run: | cargo run --locked -p cap -- --log-level info selftest playback --duration 30 --json - name: Report findings - if: always() + if: always() && contains(format(',{0},', matrix.parts), ',matrix,') shell: bash run: | REPORT="${{ github.workspace }}/sync-matrix-${{ matrix.runner }}.json" @@ -271,7 +344,7 @@ jobs: } >> "$GITHUB_STEP_SUMMARY" - name: Upload findings - if: always() + if: always() && contains(format(',{0},', matrix.parts), ',matrix,') uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: sync-matrix-${{ matrix.runner }} diff --git a/.github/workflows/test-self-hosting.yml b/.github/workflows/test-self-hosting.yml index 3f5255fda97..8e0619813b3 100644 --- a/.github/workflows/test-self-hosting.yml +++ b/.github/workflows/test-self-hosting.yml @@ -1,6 +1,7 @@ name: "Test Self-Hosting" on: + merge_group: workflow_dispatch: push: branches: @@ -20,7 +21,34 @@ on: - ".github/workflows/test-self-hosting.yml" jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/test-self-hosting.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + test-docker-compose: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} name: Test Docker Compose Self-Hosting runs-on: ubuntu-latest timeout-minutes: 15 diff --git a/.github/workflows/validate-migration-journal.yml b/.github/workflows/validate-migration-journal.yml index 300da0a8c1c..098d83ecb2e 100644 --- a/.github/workflows/validate-migration-journal.yml +++ b/.github/workflows/validate-migration-journal.yml @@ -1,12 +1,40 @@ name: Validate Migrations on: + merge_group: pull_request: paths: - "packages/database/migrations/**" jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/validate-migration-journal.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + validate-journal: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} runs-on: ubuntu-latest steps: - name: Checkout PR branch diff --git a/.github/workflows/verify-recording.yml b/.github/workflows/verify-recording.yml index 3420e677f8a..a6b878242fe 100644 --- a/.github/workflows/verify-recording.yml +++ b/.github/workflows/verify-recording.yml @@ -59,6 +59,7 @@ on: - cron: "41 3 * * *" pull_request: types: [opened, synchronize, reopened, ready_for_review] + merge_group: push: branches: - ci/verify-ci @@ -81,6 +82,7 @@ jobs: run: ${{ steps.scope.outputs.run }} runners: ${{ steps.scope.outputs.runners }} tier: ${{ steps.scope.outputs.tier }} + windows-shards: ${{ steps.scope.outputs.windows-shards }} steps: - uses: actions/checkout@v4 with: @@ -94,8 +96,12 @@ jobs: PR: ${{ github.event.pull_request.number }} DRAFT: ${{ github.event.pull_request.draft }} BEFORE: ${{ github.event.before }} + MQ_BASE: ${{ github.event.merge_group.base_sha }} + MQ_HEAD: ${{ github.event.merge_group.head_sha }} INPUT_TIER: ${{ inputs.tier }} INPUT_RUNNERS: ${{ inputs.runners }} + INPUT_CASE: ${{ inputs.case_filter }} + INPUT_SOAK: ${{ inputs.soak_secs }} RUSTUP_TOOLCHAIN: stable run: | set -euo pipefail @@ -117,6 +123,9 @@ jobs: if [[ "$EVENT" == pull_request ]]; then gh api "repos/$GITHUB_REPOSITORY/pulls/$PR/files" --paginate --jq '.[].filename' > "$files" max=3000 + elif [[ "$EVENT" == merge_group ]]; then + python3 scripts/ci/merge_queue.py files --base "$MQ_BASE" --head "$MQ_HEAD" > "$files" + max=3000 elif [[ "$BEFORE" =~ ^0+$ ]]; then : > "$files"; echo Cargo.toml >> "$files" max=300 @@ -134,10 +143,24 @@ jobs: runners='["blacksmith-6vcpu-macos-26"]'; tier=fast fi ;; esac + # Windows records each case in real time, one after another (22 min + # for the full tier in one job). Cases split across hosted runners + # by the hash of their id (CAP_VERIFY_SHARD), so every case runs in + # exactly one shard; with these counts the longest shard is about + # the longest case (mp4-holds, 7 min). A case filter or soak runs in + # one job. + if [[ -n "${INPUT_CASE:-}" || -n "${INPUT_SOAK:-}" ]]; then + windows_shards='[1]' + elif [[ "$tier" == full ]]; then + windows_shards='[1,2,3,4,5]' + else + windows_shards='[1,2,3]' + fi { echo "run=$run" echo "runners=$runners" echo "tier=$tier" + echo "windows-shards=$windows_shards" } >> "$GITHUB_OUTPUT" if [[ "$run" == true ]]; then echo "real capture: $tier tier on $runners" | tee -a "$GITHUB_STEP_SUMMARY" @@ -356,12 +379,17 @@ jobs: # 38997642473, 38997747111). Hosted Windows has no audio endpoints, so the # stimulus stays silent and system audio is not recorded. real-capture-windows: - name: real-capture (windows-2022) + name: real-capture (windows-2022, ${{ matrix.shard }}/${{ strategy.job-total }}) needs: scope if: needs.scope.outputs.run == 'true' + strategy: + fail-fast: false + matrix: + shard: ${{ fromJSON(needs.scope.outputs.windows-shards) }} runs-on: windows-2022 timeout-minutes: 60 env: + CAP_VERIFY_SHARD: ${{ matrix.shard }}/${{ strategy.job-total }} CAP_VERIFY_CAPTURE: display CAP_VERIFY_REQUIRE_CAPTURE: "1" CAP_VERIFY_TIER: ${{ needs.scope.outputs.tier }} @@ -398,13 +426,13 @@ jobs: # Without the manifest the next restore cannot tell which sources the # cached build came from (scripts/verify/mtime.py). - name: Record sources of the cached build - if: github.event_name != 'pull_request' && steps.setup.outputs.build-cache-hit != 'true' + if: github.event_name != 'pull_request' && github.event_name != 'merge_group' && matrix.shard == 1 && steps.setup.outputs.build-cache-hit != 'true' shell: bash run: | "$(command -v python3 || command -v python)" scripts/verify/mtime.py record target/ci-verify/verify-src-manifest.txt - name: Save build cache - if: github.event_name != 'pull_request' && steps.setup.outputs.build-cache-hit != 'true' + if: github.event_name != 'pull_request' && github.event_name != 'merge_group' && matrix.shard == 1 && steps.setup.outputs.build-cache-hit != 'true' uses: actions/cache/save@v4 with: path: | @@ -421,13 +449,13 @@ jobs: - name: Summary if: always() shell: bash - run: python scripts/verify/summary.py --title "real capture windows-2022 ${{ needs.scope.outputs.tier }}" "$CAP_VERIFY_REPORT_DIR" >> "$GITHUB_STEP_SUMMARY" || true + run: python scripts/verify/summary.py --title "real capture windows-2022 ${{ needs.scope.outputs.tier }} shard ${{ matrix.shard }}/${{ strategy.job-total }}" "$CAP_VERIFY_REPORT_DIR" >> "$GITHUB_STEP_SUMMARY" || true - name: Upload artifacts if: always() uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: - name: verify-recording-windows-2022 + name: verify-recording-windows-2022-${{ needs.scope.outputs.tier }}-${{ matrix.shard }} path: | ${{ github.workspace }}/verify-report ${{ github.workspace }}/verify-dump diff --git a/.github/workflows/windows-recording-encoder.yml b/.github/workflows/windows-recording-encoder.yml index dbfa6d79466..a07386c8ae6 100644 --- a/.github/workflows/windows-recording-encoder.yml +++ b/.github/workflows/windows-recording-encoder.yml @@ -1,11 +1,17 @@ name: Windows recording encoder # The segmented recording encoder's tests on Windows, the only platform where -# a hardware encoder that fails mid-recording is replaced with libx264. +# a hardware encoder that fails mid-recording is replaced with libx264, and the +# Media Foundation self-test that runs in a child process because Intel's +# transform faults on odd frame sizes. on: + merge_group: pull_request: paths: - "crates/enc-ffmpeg/**" + - "crates/enc-mediafoundation/**" + - "crates/media-info/**" + - "crates/export/tests/windows_odd_size_export.rs" - "crates/recording/src/output_pipeline/win_fragmented_m4s.rs" - "Cargo.lock" - ".github/workflows/windows-recording-encoder.yml" @@ -13,6 +19,9 @@ on: branches: [main] paths: - "crates/enc-ffmpeg/**" + - "crates/enc-mediafoundation/**" + - "crates/media-info/**" + - "crates/export/tests/windows_odd_size_export.rs" - "crates/recording/src/output_pipeline/win_fragmented_m4s.rs" - "Cargo.lock" - ".github/workflows/windows-recording-encoder.yml" @@ -26,7 +35,34 @@ concurrency: cancel-in-progress: true jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/windows-recording-encoder.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + segmented-encoder: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} name: Segmented encoder (windows-2022) runs-on: windows-2022 timeout-minutes: 45 @@ -55,3 +91,24 @@ jobs: - name: Segmented encoder tests run: cargo test --locked -p cap-enc-ffmpeg --lib mux::segmented_stream -- --nocapture + + - name: Encoder selection and isolated self-test tests + run: cargo test --locked -p cap-media-info --lib intel_h264_mft && cargo test --locked -p cap-enc-ffmpeg --lib self_test -- --nocapture + + # The fault runs wherever the self-test runs: in a child it fails only + # the child, in this process it would end the test with 0xc0000005. + - name: Media Foundation self-test fault falls back (access violation) + env: + CAP_H264_SELF_TEST_FAULT: access_violation + run: cargo test --locked -p cap-enc-ffmpeg --lib video::h264::self_test_tests::media_foundation_self_test_fault_falls_back_to_libx264_at_odd_sizes -- --exact --nocapture + + - name: Media Foundation self-test fault falls back (fast fail 0xc0000409) + env: + CAP_H264_SELF_TEST_FAULT: abort + run: cargo test --locked -p cap-enc-ffmpeg --lib video::h264::self_test_tests::media_foundation_self_test_fault_falls_back_to_libx264_at_odd_sizes -- --exact --nocapture + + - name: Odd size export with a faulting Media Foundation self-test + env: + CAP_DEBUG_H264_ENCODER_ORDER: h264_mf,libx264 + CAP_H264_SELF_TEST_FAULT: access_violation + run: cargo test --locked -p cap-export --test windows_odd_size_export -- --nocapture --test-threads=1 diff --git a/.github/workflows/windows-targets.yml b/.github/workflows/windows-targets.yml index ca235f3a565..0b42d189a6a 100644 --- a/.github/workflows/windows-targets.yml +++ b/.github/workflows/windows-targets.yml @@ -1,6 +1,7 @@ name: Windows Target Discovery on: + merge_group: pull_request: paths: - "crates/scap-targets/**" @@ -20,7 +21,34 @@ concurrency: cancel-in-progress: true jobs: + # GitHub ignores paths filters in the merge queue, so the queue run applies + # this workflow's pull_request paths to the queued change itself. + scope: + name: Scope + if: github.event_name == 'merge_group' + runs-on: blacksmith-2vcpu-ubuntu-2404 + timeout-minutes: 5 + outputs: + run: ${{ steps.queue.outputs.run }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + fetch-depth: 2 + filter: blob:none + sparse-checkout: | + .github/workflows + scripts/ci + - name: Merge queue scope + id: queue + env: + BASE: ${{ github.event.merge_group.base_sha }} + HEAD: ${{ github.event.merge_group.head_sha }} + run: python3 scripts/ci/merge_queue.py scope --workflow .github/workflows/windows-targets.yml --base "$BASE" --head "$HEAD" >> "$GITHUB_OUTPUT" + windows-targets: + needs: scope + if: ${{ !cancelled() && needs.scope.outputs.run != 'false' }} name: Native Windows window discovery runs-on: windows-2022 timeout-minutes: 20 diff --git a/AGENTS.md b/AGENTS.md index 3d71adc66a3..a9a96a02286 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -44,6 +44,14 @@ Additionally, `unused_must_use = "deny"` applies to all Rust code: every `Result - a11y rules are enforced everywhere (`apps/web`, `packages/ui`, etc.). - CSS overrides: `noUnknownAtRules`, `noUnknownTypeSelector`, `noDescendingSpecificity` are off for `**/*.css`. +### Tests: wait on signals, not time +`scripts/test-lint` runs Oxlint with the `@interfere/landmines` testing rules over every test file in `apps/`, `packages/` and `scripts/` (`bun run lint:tests`, a CI gate). Write the honest form the first time: +- **No fixed sleeps** (`await new Promise((r) => setTimeout(r, n))`, `Bun.sleep`). Await the operation, a promise its handler resolves, or move time with fake timers. +- **No polling spies or request recorders** with `expect.poll` / `vi.waitFor`. Resolve a `Promise.withResolvers()` deferred from the callback and await it. +- **No retries or raised per-test timeouts.** A test that passes on rerun is a flake to fix. +- **No test doubles** in `apps/media-server`, `apps/render-farm`, `apps/discord-bot`, `apps/status`, `packages/*` and `scripts/*`: no `spyOn(...).mockReturnValue`, `vi.mock`, or replaced `fetch`. Use the real implementation and a real local server. `apps/web` and `apps/chrome-extension` are exempt until they have a real database and browser harness. +- Existing violations are frozen per file in `scripts/test-lint/oxlintrc.json` (sleeps, polls, timeouts) and `scripts/test-lint/test-doubles-allow.json` (doubles). Counts only go down: when you fix one, lower the entry (delete it at 0). Never raise a count or add an entry. + ### TypeScript — strictness - Avoid `any`. Use `unknown` + narrowing, or existing shared types from `@cap/utils`, `@cap/web-domain`, generated bindings, etc. - Do not introduce `@ts-expect-error` / `@ts-ignore` without a concrete reason. Prefer fixing the type. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bab21ce453f..c65f889d54e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,6 +41,7 @@ Then run `bun run cap-setup` to install native dependencies such as FFmpeg. On Windows, llvm, clang, and VCPKG must be installed. On MacOS, cmake must be installed. +On Linux, `unzip` must be installed. `bun run cap-setup` does not yet install these dependencies for you. To run both `@cap/desktop` and `@cap/web` together, use `bun run dev`. diff --git a/Cargo.lock b/Cargo.lock index d2896ce862a..38516898a11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1087,6 +1087,7 @@ dependencies = [ "cap-camera", "cap-cli-install", "cap-editor", + "cap-enc-ffmpeg", "cap-export", "cap-media-info", "cap-project", @@ -1386,6 +1387,7 @@ dependencies = [ name = "cap-enc-ffmpeg" version = "0.1.0" dependencies = [ + "cap-enc-mediafoundation", "cap-frame-converter", "cap-media-info", "ffmpeg-next", @@ -1691,12 +1693,15 @@ dependencies = [ "base64 0.22.1", "cap-audio", "cap-editor", + "cap-enc-ffmpeg", "cap-export", "cap-project", "cap-rendering", "ffmpeg-next", + "libc", "serde", "serde_json", + "tempfile", "tokio", "tracing", "tracing-subscriber", diff --git a/apps/cli/Cargo.toml b/apps/cli/Cargo.toml index 0a660f81c52..ab966828c77 100644 --- a/apps/cli/Cargo.toml +++ b/apps/cli/Cargo.toml @@ -11,6 +11,7 @@ cap-recording = { path = "../../crates/recording" } cap-rendering = { path = "../../crates/rendering" } cap-editor = { path = "../../crates/editor" } cap-export = { path = "../../crates/export" } +cap-enc-ffmpeg = { path = "../../crates/enc-ffmpeg" } cap-media-info = { path = "../../crates/media-info" } cap-timestamp = { path = "../../crates/timestamp" } cap-utils = { path = "../../crates/utils" } diff --git a/apps/cli/src/automation.rs b/apps/cli/src/automation.rs index 4ce1dd52a0b..c0a0b5efe43 100644 --- a/apps/cli/src/automation.rs +++ b/apps/cli/src/automation.rs @@ -43,7 +43,7 @@ fn capture_target_kind(target: &ScreenCaptureTarget) -> Option Some(cap_automation::CaptureTargetKind::Window), ScreenCaptureTarget::Display { .. } => Some(cap_automation::CaptureTargetKind::Display), ScreenCaptureTarget::Area { .. } => Some(cap_automation::CaptureTargetKind::Area), - ScreenCaptureTarget::CameraOnly => None, + ScreenCaptureTarget::CameraOnly | ScreenCaptureTarget::AudioOnly => None, } } diff --git a/apps/cli/src/credentials.rs b/apps/cli/src/credentials.rs index ca3b497529e..8513e0eb2b1 100644 --- a/apps/cli/src/credentials.rs +++ b/apps/cli/src/credentials.rs @@ -206,10 +206,24 @@ fn agent_grants_path() -> Result { .ok_or_else(|| "Could not locate the user configuration directory".to_string()) } +fn with_keyring( + operation: impl FnOnce() -> keyring::Result + Send, +) -> Result { + std::thread::scope(|scope| { + std::thread::Builder::new() + .name("cap-keyring".to_string()) + .spawn_scoped(scope, operation) + .map_err(|error| error.to_string())? + .join() + .map_err(|_| "The OS credential store panicked".to_string())? + .map_err(|error| error.to_string()) + }) +} + fn load_agent_keyring() -> Result { - let entry = keyring::Entry::new(AGENT_KEYRING_SERVICE, AGENT_KEYRING_USER) - .map_err(|error| error.to_string())?; - let value = entry.get_password().map_err(|error| error.to_string())?; + let value = with_keyring(|| { + keyring::Entry::new(AGENT_KEYRING_SERVICE, AGENT_KEYRING_USER)?.get_password() + })?; serde_json::from_str(&value).map_err(|error| error.to_string()) } @@ -283,10 +297,11 @@ fn write_restricted_file(_path: &std::path::Path, _bytes: &[u8]) -> Result<(), S } fn load_agent_access_grants() -> StoredAgentAccessGrants { - let keyring = keyring::Entry::new(AGENT_KEYRING_SERVICE, AGENT_GRANTS_KEYRING_USER) - .and_then(|entry| entry.get_password()) - .ok() - .and_then(|value| serde_json::from_str(&value).ok()); + let keyring = with_keyring(|| { + keyring::Entry::new(AGENT_KEYRING_SERVICE, AGENT_GRANTS_KEYRING_USER)?.get_password() + }) + .ok() + .and_then(|value| serde_json::from_str(&value).ok()); if let Some(grants) = keyring { return grants; } @@ -333,8 +348,10 @@ pub fn store_agent_access_grant( }, ); let serialized = serde_json::to_string(&grants).map_err(|error| error.to_string())?; - let keyring_result = keyring::Entry::new(AGENT_KEYRING_SERVICE, AGENT_GRANTS_KEYRING_USER) - .and_then(|entry| entry.set_password(&serialized)); + let keyring_result = with_keyring(|| { + keyring::Entry::new(AGENT_KEYRING_SERVICE, AGENT_GRANTS_KEYRING_USER)? + .set_password(&serialized) + }); if keyring_result.is_ok() { let _ = std::fs::remove_file(agent_grants_path()?); return Ok(AgentCredentialStorage::Keyring); @@ -361,8 +378,9 @@ pub fn store_agent( ) -> Result { validate_agent_server(credential.server.clone())?; let serialized = serde_json::to_string(credential).map_err(|error| error.to_string())?; - let keyring_result = keyring::Entry::new(AGENT_KEYRING_SERVICE, AGENT_KEYRING_USER) - .and_then(|entry| entry.set_password(&serialized)); + let keyring_result = with_keyring(|| { + keyring::Entry::new(AGENT_KEYRING_SERVICE, AGENT_KEYRING_USER)?.set_password(&serialized) + }); if keyring_result.is_ok() { let _ = std::fs::remove_file(agent_credential_path()?); return Ok(AgentCredentialStorage::Keyring); @@ -419,11 +437,9 @@ pub fn resolve_agent() -> Result { } pub fn delete_agent() -> Result<(), String> { - if let Ok(entry) = keyring::Entry::new(AGENT_KEYRING_SERVICE, AGENT_KEYRING_USER) { - let _ = entry.delete_credential(); - } - if let Ok(entry) = keyring::Entry::new(AGENT_KEYRING_SERVICE, AGENT_GRANTS_KEYRING_USER) { - let _ = entry.delete_credential(); + for user in [AGENT_KEYRING_USER, AGENT_GRANTS_KEYRING_USER] { + let _ = + with_keyring(|| keyring::Entry::new(AGENT_KEYRING_SERVICE, user)?.delete_credential()); } for path in [agent_credential_path()?, agent_grants_path()?] { match std::fs::remove_file(path) { @@ -753,6 +769,25 @@ pub async fn status(format: OutputFormat) -> Result<(), String> { mod tests { use super::*; + #[tokio::test] + async fn keyring_operations_run_outside_the_async_runtime() { + assert_eq!( + with_keyring(|| { + assert!(tokio::runtime::Handle::try_current().is_err()); + Ok(42) + }), + Ok(42) + ); + } + + #[test] + fn keyring_operations_preserve_backend_errors() { + assert_eq!( + with_keyring(|| Err::<(), _>(keyring::Error::NoEntry)), + Err(keyring::Error::NoEntry.to_string()) + ); + } + #[test] fn agent_servers_require_https_except_for_loopback_development() { assert_eq!( diff --git a/apps/cli/src/export.rs b/apps/cli/src/export.rs index 7beefbe6e93..e989ca005d2 100644 --- a/apps/cli/src/export.rs +++ b/apps/cli/src/export.rs @@ -3,7 +3,7 @@ use std::{ path::{Path, PathBuf}, sync::{ Arc, Mutex, - atomic::{AtomicBool, AtomicU32, Ordering}, + atomic::{AtomicBool, AtomicU32, AtomicU64, Ordering}, }, }; @@ -87,6 +87,12 @@ pub struct Export { /// Emit a final JSON completion event to stdout ({"type":"Completed","path":"..."}). Implied by --json #[arg(long)] completion_json: bool, + /// Export the recorded tracks as separate files instead of one video: a comma-separated list of + /// screen, camera, microphone, system-audio, or `all`. They follow the edited timeline and are + /// written to the --output folder (default '/output/tracks') as Screen.mp4, Camera.mp4, + /// Microphone.wav and System audio.wav. Takes --fps (default 60); one project at a time + #[arg(long, value_name = "TRACKS")] + tracks: Option, } #[derive(Default)] @@ -453,6 +459,11 @@ impl Export { completion_json: bool, stdout: &Arc>, ) -> Result<(), String> { + if let Some(tracks) = self.tracks.clone() { + return self + .run_tracks(&tracks, progress_json, completion_json, stdout) + .await; + } let settings = self.resolve_settings()?; let (projects, output) = split_projects_and_output(self.project_paths, self.output)?; @@ -659,6 +670,150 @@ impl Export { } } +impl Export { + fn tracks_conflicts(&self) -> Option<&'static str> { + if self.settings_json.is_some() { + Some("--settings-json") + } else if self.format.is_some() { + Some("--format") + } else if self.resolution.is_some() { + Some("--resolution") + } else if self.quality.is_some() { + Some("--quality") + } else if self.optimize_filesize { + Some("--optimize-filesize") + } else { + None + } + } + + async fn run_tracks( + self, + tracks: &str, + progress_json: bool, + completion_json: bool, + stdout: &Arc>, + ) -> Result<(), String> { + if let Some(flag) = self.tracks_conflicts() { + return Err(format!( + "--tracks cannot be combined with {flag}; tracks keep their recorded size and only take --fps" + )); + } + let fps = self.fps.unwrap_or_else(|| default_fps(ExportFormat::Mp4)); + if fps == 0 { + return Err("--fps must be greater than zero".to_string()); + } + let (projects, output) = split_projects_and_output(self.project_paths, self.output)?; + let [project_path] = projects.as_slice() else { + return Err("--tracks exports one project at a time".to_string()); + }; + + ensure_remuxed(project_path.clone()).await?; + let meta = RecordingMeta::load_for_project(project_path) + .map_err(|e| format!("Failed to load recording meta: {e}"))?; + let Some(studio) = meta.studio_meta() else { + return Err(cap_export::tracks::TrackExportError::NotStudio.to_string()); + }; + let selection = parse_tracks(tracks, || { + let recordings = cap_rendering::ProjectRecordingsMeta::new(&meta.project_path, studio)?; + Ok(cap_export::tracks::available_tracks( + &recordings, + &meta.project_config(), + )) + })?; + let output = output.unwrap_or_else(|| project_path.join("output").join("tracks")); + + let total = Arc::new(AtomicU64::new(0)); + let done = Arc::new(AtomicU64::new(0)); + let progress_stdout = Arc::clone(stdout); + let progress_done = Arc::clone(&done); + let progress_total = Arc::clone(&total); + let files = cap_export::tracks::export_tracks( + project_path.clone(), + None, + cap_export::tracks::TrackExportSettings { + tracks: selection, + fps, + force_ffmpeg_decoder: self.force_ffmpeg_decoder, + }, + output.clone(), + Arc::new(AtomicBool::new(false)), + move |progress| { + progress_done.store(progress.done, Ordering::Relaxed); + progress_total.store(progress.total, Ordering::Relaxed); + if progress_json { + let _ = emit_export_message( + &progress_stdout, + &ExportProgressMessage::Progress { + rendered_count: progress.done.min(u64::from(u32::MAX)) as u32, + total_frames: progress.total.min(u64::from(u32::MAX)) as u32, + }, + ); + } + }, + ) + .await + .map_err(|error| error.to_string())?; + + if progress_json || completion_json { + emit_export_message(stdout, &ExportProgressMessage::Completed { path: &output })?; + } else { + println!("Exported {} tracks to {}", files.len(), output.display()); + for file in &files { + if let Some(name) = file.file_name() { + println!(" {}", name.to_string_lossy()); + } + } + } + info!( + "Exported {} tracks to '{}' ({}/{} steps)", + files.len(), + output.display(), + done.load(Ordering::Relaxed), + total.load(Ordering::Relaxed) + ); + Ok(()) + } +} + +/// `all`, or a comma-separated list of track names, in a stable order. +fn parse_tracks( + value: &str, + available: impl FnOnce() -> Result, String>, +) -> Result, String> { + use cap_export::tracks::TrackKind; + let names = value + .split(',') + .map(str::trim) + .filter(|name| !name.is_empty()) + .collect::>(); + if names.is_empty() { + return Err( + "--tracks needs at least one of screen, camera, microphone, system-audio, or all" + .to_string(), + ); + } + if names.iter().any(|name| name.eq_ignore_ascii_case("all")) { + if names.len() > 1 { + return Err("--tracks all cannot be combined with other track names".to_string()); + } + return available(); + } + let mut tracks = names + .iter() + .map(|name| { + TrackKind::from_slug(name).ok_or_else(|| { + format!( + "Unknown track '{name}'; use screen, camera, microphone, system-audio, or all" + ) + }) + }) + .collect::, _>>()?; + tracks.sort(); + tracks.dedup(); + Ok(tracks) +} + /// Remux a recording left as fragments (status `NeedsRemux`) into a progressive `display.mp4` before /// export, reusing the shared `RecoveryManager`. A graceful `cap record` stop already remuxes in /// `finalize`, so this only fires for recordings interrupted before that (e.g. a killed worker); @@ -1021,6 +1176,31 @@ fn emit_export_message( mod tests { use super::*; + #[test] + fn track_lists_parse_in_a_stable_order() { + use cap_export::tracks::TrackKind; + let none = || -> Result, String> { panic!("only `all` lists the project") }; + assert_eq!( + parse_tracks("system-audio, mic,screen,mic", none).unwrap(), + [ + TrackKind::Screen, + TrackKind::Microphone, + TrackKind::SystemAudio + ] + ); + assert_eq!( + parse_tracks("ALL", || Ok(vec![TrackKind::Screen, TrackKind::Camera])).unwrap(), + [TrackKind::Screen, TrackKind::Camera] + ); + assert!(parse_tracks("all,screen", none).is_err()); + assert!(parse_tracks(" , ", none).is_err()); + assert!( + parse_tracks("screen,cursor", none) + .unwrap_err() + .contains("Unknown track 'cursor'") + ); + } + fn playable_instant_project() -> tempfile::TempDir { ffmpeg::init().unwrap(); let project = tempfile::tempdir().unwrap(); diff --git a/apps/cli/src/guide.rs b/apps/cli/src/guide.rs index 1fe6537afd4..8d93cc7f80e 100644 --- a/apps/cli/src/guide.rs +++ b/apps/cli/src/guide.rs @@ -194,7 +194,7 @@ fn build() -> Guide { notes: Some( "EXCEPTION: export NDJSON uses PascalCase `type` tags and snake_case fields \ (rendered_count, total_frames) for desktop compatibility. --format selects the \ - CONTAINER (mp4/gif/mov), NOT output mode; use --json for machine-readable output. Pass several projects to export them in one run; each is written to '.' inside the output directory.", + CONTAINER (mp4/gif/mov), NOT output mode; use --json for machine-readable output. Pass several projects to export them in one run; each is written to '.' inside the output directory. --tracks screen,camera,microphone,system-audio (or all) writes the recorded tracks as separate files that follow the edit into the --output folder; Completed.path is that folder.", ), ..cmd( "export", diff --git a/apps/cli/src/main.rs b/apps/cli/src/main.rs index 2944d5656ea..b786226c238 100644 --- a/apps/cli/src/main.rs +++ b/apps/cli/src/main.rs @@ -453,6 +453,8 @@ struct CompletionsArgs { } fn main() { + cap_enc_ffmpeg::isolated_self_test::run_child_or_register_host(); + #[cfg(target_os = "linux")] if let Some(threads) = cap_utils::linux_runtime::llvmpipe_thread_count() { // Mesa counts host CPUs inside containers; configure it before creating the CLI runtime. diff --git a/apps/cli/src/selftest/playback.rs b/apps/cli/src/selftest/playback.rs index 977cccaa5ca..866c22617d4 100644 --- a/apps/cli/src/selftest/playback.rs +++ b/apps/cli/src/selftest/playback.rs @@ -872,6 +872,7 @@ mod fixture { cursor: None, keyboard: None, display_notch: None, + cursor_shape_version: None, }; // Clip offsets exactly as the studio recorder persists them. let offsets = segment.calculate_audio_offsets(); @@ -881,6 +882,8 @@ mod fixture { segments: vec![segment], cursors: Default::default(), status: Some(StudioRecordingStatus::Complete), + cursor_shape_version: 0, + audio_only: false, }, }; diff --git a/apps/desktop-gpui/Cargo.lock b/apps/desktop-gpui/Cargo.lock index e67b4e0d3dd..33ea76a47c0 100644 --- a/apps/desktop-gpui/Cargo.lock +++ b/apps/desktop-gpui/Cargo.lock @@ -1397,6 +1397,21 @@ dependencies = [ "workspace-hack", ] +[[package]] +name = "cap-automation" +version = "0.1.0" +dependencies = [ + "cap-project", + "serde", + "serde_json", + "specta", + "thiserror 1.0.69", + "tokio", + "tracing", + "uuid", + "workspace-hack", +] + [[package]] name = "cap-camera" version = "0.1.0" @@ -1544,6 +1559,7 @@ dependencies = [ "block2 0.6.2", "bytes", "cap-audio", + "cap-automation", "cap-camera", "cap-camera-effects", "cap-cli-install", @@ -1585,6 +1601,7 @@ dependencies = [ "libc", "lyon_tessellation", "minisign-verify", + "notify-rust", "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-core-graphics", @@ -1597,6 +1614,7 @@ dependencies = [ "resvg 0.45.1", "rfd", "rodio", + "same-file", "sanitize-filename", "scap-targets", "semver", @@ -1612,6 +1630,7 @@ dependencies = [ "tracing", "tracing-appender", "tracing-subscriber", + "trash", "tray-icon", "unicode-segmentation", "wayland-client", @@ -1670,6 +1689,7 @@ dependencies = [ name = "cap-enc-ffmpeg" version = "0.1.0" dependencies = [ + "cap-enc-mediafoundation", "cap-frame-converter", "cap-media-info", "ffmpeg-next", @@ -3627,7 +3647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -8762,7 +8782,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -9537,7 +9557,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -11135,10 +11155,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.3", "once_cell", "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -11701,6 +11721,24 @@ dependencies = [ "strength_reduce", ] +[[package]] +name = "trash" +version = "5.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be89b3fe156965d29ac4f8522f3a640c655affdd9f21cb4f36857f0c92c00317" +dependencies = [ + "chrono", + "libc", + "log", + "objc2 0.6.5", + "objc2-foundation 0.3.2", + "once_cell", + "percent-encoding", + "scopeguard", + "urlencoding", + "windows 0.62.2", +] + [[package]] name = "tray-icon" version = "0.21.3" @@ -12907,7 +12945,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/apps/desktop-gpui/Cargo.toml b/apps/desktop-gpui/Cargo.toml index a39d6dc923a..db0159e9937 100644 --- a/apps/desktop-gpui/Cargo.toml +++ b/apps/desktop-gpui/Cargo.toml @@ -57,6 +57,7 @@ cap-enc-ffmpeg = { path = "../../crates/enc-ffmpeg" } cap-timestamp = { path = "../../crates/timestamp" } cap-utils = { path = "../../crates/utils" } cap-project = { path = "../../crates/project" } +cap-automation = { path = "../../crates/automation" } # The cursor style picker draws the same SVG assets the renderer composites. # gpui's `svg()` keeps only a glyph's alpha, so the two-tone cursor art has to # be rasterised instead: `resvg` at the pin cap-rendering already builds, into @@ -94,6 +95,7 @@ cap-export = { path = "../../crates/export" } # workspace pins, and cap-recording already builds it, so this is an import, # not an extra dependency tree. ffmpeg = { package = "ffmpeg-next", git = "https://github.com/CapSoftware/rust-ffmpeg", rev = "49db1fede112" } +notify-rust = "4.18" # Camera preview frames and Recents thumbnails both become gpui `RenderImage`s, # and the frame container type must match gpui's image crate version exactly # (`image = "0.25.1"` in the zed fork's workspace) or `Frame` would be two @@ -119,7 +121,7 @@ sys-locale = "0.3" # lockfile through gpui, so this makes an existing build unit direct. unicode-segmentation = "1" # spawn_blocking for finalize; the runtime itself comes from gpui_tokio. -tokio = { version = "1", features = ["rt", "time"] } +tokio = { version = "1", features = ["rt", "sync", "time"] } # The crate 0.6.0's global-shortcut plugin wrapped, at the same pin: stored # bindings are W3C `KeyboardEvent.code` strings and this owns the platform # mapping (Carbon RegisterEventHotKey on macOS). @@ -135,6 +137,10 @@ chrono = "0.4" serde_json = "1" serde = { version = "1", features = ["derive"] } sanitize-filename = "0.6.0" +# Moves media of clips removed from a project to the OS trash, so the user +# can still recover it. Its platform deps (objc2 0.6, windows 0.62) are +# already in the tree. +trash = "=5.2.9" semver = "1" base64 = "0.22" minisign-verify = "0.2.4" @@ -207,6 +213,7 @@ libc = "0.2" [target.'cfg(windows)'.dependencies] clipboard-rs = "0.2.4" raw-window-handle = "0.6" +same-file = "1.0.6" tray-icon = { version = "0.21.1", default-features = false } windows-sys = { version = "0.59", features = [ "Win32_Foundation", diff --git a/apps/desktop-gpui/assets/icons/eraser.svg b/apps/desktop-gpui/assets/icons/eraser.svg new file mode 100644 index 00000000000..e10d4110e95 --- /dev/null +++ b/apps/desktop-gpui/assets/icons/eraser.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/desktop-gpui/kernels/src/png.rs b/apps/desktop-gpui/kernels/src/png.rs index 4a0377a5853..ed7ca5ada6b 100644 --- a/apps/desktop-gpui/kernels/src/png.rs +++ b/apps/desktop-gpui/kernels/src/png.rs @@ -248,12 +248,15 @@ fn adaptive_filter( } fn sum_abs(buf: &[u8]) -> u64 { - buf.chunks(32) + // Each chunk sums to at most 256 * 128, keeping the narrow reduction exact. + buf.chunks(256) .map(|chunk| { - chunk - .iter() - .map(|&b| u64::from((b as i8).unsigned_abs())) - .sum::() + u64::from( + chunk + .iter() + .map(|&b| u16::from((b as i8).unsigned_abs())) + .sum::(), + ) }) .sum() } @@ -315,6 +318,35 @@ fn paeth(a: u8, b: u8, c: u8) -> u8 { mod tests { use super::*; + #[test] + fn signed_filter_cost_matches_wide_reference_across_chunk_boundaries() { + for len in (0..=1_025).chain([15_360, 65_537, 1_048_577]) { + for byte in [0, 127, 128, 255] { + let bytes = vec![byte; len]; + let expected = len as u64 * u64::from((byte as i8).unsigned_abs()); + assert_eq!(sum_abs(&bytes), expected, "byte {byte}, length {len}"); + } + + let mut state = 0x1234_5678_u32; + let bytes: Vec<_> = (0..len) + .map(|index| { + state ^= state << 13; + state ^= state >> 17; + state ^= state << 5; + if len <= 1_025 { + index as u8 + } else { + state as u8 + } + }) + .collect(); + let expected = bytes.iter().fold(0u64, |sum, &byte| { + sum + u64::from((byte as i8).unsigned_abs()) + }); + assert_eq!(sum_abs(&bytes), expected, "length {len}"); + } + } + fn screen_like(width: u32, height: u32, channels: usize) -> Vec { let mut state = 0x2545_f491_u32; let mut data = Vec::with_capacity(width as usize * height as usize * channels); diff --git a/apps/desktop-gpui/locales/de.toml b/apps/desktop-gpui/locales/de.toml index c96d36f22a2..5dfc0b08922 100644 --- a/apps/desktop-gpui/locales/de.toml +++ b/apps/desktop-gpui/locales/de.toml @@ -206,6 +206,10 @@ fps_30 = "30 FPS" fps_60 = "60 FPS (empfohlen)" label = "Maximale Bildrate" +[settings.general.recording.keep_drawings] +description = "Zeichnungen bleiben, bis Sie sie löschen. Wenn aus, verblasst jede einige Sekunden nach dem Zeichnen." +label = "Zeichnungen auf dem Bildschirm behalten" + [settings.general.recording.marker_sound] description = "Spielt einen kurzen Ton ab, wenn Sie während einer Studio-Aufnahme einen Marker hinzufügen. Ihr Mikrofon oder der Systemton kann ihn mit aufnehmen." label = "Ton für Marker abspielen" @@ -300,6 +304,7 @@ open_link = "Link öffnen" retry_upload = "Hochladen wiederholen" show_all = "Alle anzeigen" title = "Aufnahmen" +save_audio = "Audio speichern" [settings.recordings.empty] all = "Keine Aufnahmen" @@ -367,7 +372,7 @@ screen_region = "Bildschirmbereich" [settings.options.post_studio] do_nothing = "Nichts tun" open_editor = "Editor öffnen" -show_cap = "Cap anzeigen" +show_overlay = "Im Overlay zeigen" [settings.options.post_screenshot] copy = "In die Zwischenablage kopieren" @@ -390,16 +395,19 @@ cancelling_description = "Für Bildschirmfotos und Aufnahmen, die per Tastenkür cancelling_title = "Abbrechen" closing_editor_description = "Für den Bildschirmfoto-Editor und den Video-Editor." closing_editor_title = "Editor schließen" +conflict = "Wird bereits von „{shortcut}“ verwendet." needs_modifier_macos = "Verwenden Sie ⌘, ⌃ oder ⌥, damit das Tastenkürzel beim Tippen nicht stört." needs_modifier_other = "Verwenden Sie Strg, Alt oder Win, damit das Tastenkürzel beim Tippen nicht stört." -record_shortcut = "Kürzel festlegen" +not_set = "Nicht festgelegt" recording_description = "Starten Sie eine Aufnahme, ohne Cap vorher zu öffnen." recording_hint = "Drücken Sie die gewünschten Tasten. Esc bricht ab, die Rücktaste entfernt das Kürzel." recording_title = "Aufnahme" +replace = "Ersetzen" saved = "Gespeichert. Drücken Sie {keys} in einer beliebigen App, um {effect}." saved_moved = "Gespeichert. Drücken Sie {keys} in einer beliebigen App, um {effect}. Von „{shortcut}“ entfernt." screenshots_description = "Tastenkürzel funktionieren in jeder App. Klicken Sie auf eines, um es zu ändern." screenshots_title = "Bildschirmfotos" +shared = "Gleiche Tasten wie „{shortcut}“, daher wird beides ausgeführt." type_shortcut = "Kürzel eingeben…" unavailable = "Eine andere App oder das System verwendet dieses Tastenkürzel bereits. Klicken Sie, um ein anderes zu wählen." unsupported_key = "Diese Taste kann nicht in einem Tastenkürzel verwendet werden. Versuchen Sie einen Buchstaben, eine Zahl oder eine F-Taste." @@ -451,8 +459,8 @@ screenshot_open_editor_hint = "Erst beschriften" studio_do_nothing = "Nichts tun" studio_open_editor = "Editor öffnen" studio_open_editor_hint = "Sofort bearbeiten" -studio_show_cap = "Cap anzeigen" -studio_show_cap_hint = "Zurück zum Rekorder" +studio_show_overlay = "Overlay zeigen" +studio_show_overlay_hint = "Kopieren, teilen, exportieren" [settings.shortcuts.label] add_marker = "Marker hinzufügen" @@ -468,8 +476,10 @@ screenshot_area = "Bereich fotografieren" screenshot_display = "Bildschirm fotografieren" screenshot_window = "Fenster fotografieren" start_instant = "Instant-Aufnahme starten" +start_selected = "Im ausgewählten Modus starten" start_studio = "Studio-Aufnahme starten" stop = "Aufnahme stoppen" +toggle_drawing = "Auf dem Bildschirm zeichnen" [settings.shortcuts.effect] add_marker = "diesen Moment in einer Studio-Aufnahme markieren" @@ -479,13 +489,10 @@ instant_copy_and_open = "den ausgewählten Bildschirm oder das ausgewählte Fens open_picker = "Cap zu öffnen und auszuwählen, was Sie aufnehmen möchten" pause = "die laufende Aufnahme zu pausieren oder fortzusetzen" picker_area_instant = "einen Bereich auszuwählen und ihn im Instant-Modus aufzunehmen" -picker_area_screenshot = "einen Bereich auszuwählen und ein Bildschirmfoto davon zu machen" picker_area_studio = "einen Bereich auszuwählen und ihn im Studio-Modus aufzunehmen" picker_display_instant = "einen Bildschirm zu wählen und ihn im Instant-Modus aufzunehmen" -picker_display_screenshot = "einen Bildschirm zu wählen und ein Bildschirmfoto davon zu machen" picker_display_studio = "einen Bildschirm zu wählen und ihn im Studio-Modus aufzunehmen" picker_window_instant = "ein Fenster zu wählen und es im Instant-Modus aufzunehmen" -picker_window_screenshot = "ein Fenster zu wählen und ein Bildschirmfoto davon zu machen" picker_window_studio = "ein Fenster zu wählen und es im Studio-Modus aufzunehmen" restart = "die aktuelle Aufnahme zu verwerfen und neu zu beginnen" screenshot_area_copy = "einen Bereich auszuwählen und das Bildschirmfoto in die Zwischenablage zu kopieren" @@ -500,9 +507,11 @@ screenshot_window_copy = "das Fenster unter Ihrem Zeiger aufzunehmen und das Bil screenshot_window_copy_and_open_editor = "das Fenster unter Ihrem Zeiger aufzunehmen, das Bildschirmfoto zu kopieren und den Editor zu öffnen" screenshot_window_open_editor = "das Fenster unter Ihrem Zeiger aufzunehmen und das Bildschirmfoto im Editor zu öffnen" screenshot_window_save = "das Fenster unter Ihrem Zeiger aufzunehmen und das Bildschirmfoto in Ihrer Bibliothek zu speichern, ohne etwas zu öffnen" +start_selected = "eine Aufnahme oder ein Bildschirmfoto im in Cap ausgewählten Modus zu starten" stop = "die laufende Aufnahme zu stoppen" studio = "den ausgewählten Bildschirm oder das ausgewählte Fenster im Studio-Modus aufzunehmen" studio_open_editor = "den ausgewählten Bildschirm oder das ausgewählte Fenster im Studio-Modus aufzunehmen und beim Stoppen den Editor zu öffnen" +toggle_drawing = "während der Aufnahme das Zeichnen auf dem Bildschirm starten oder beenden" [settings.shortcuts.sentence] add_marker = "Diesen Moment in einer Studio-Aufnahme markieren." @@ -512,13 +521,10 @@ instant_copy_and_open = "Ausgewählten Bildschirm oder ausgewähltes Fenster im open_picker = "Cap öffnen und auswählen, was Sie aufnehmen möchten." pause = "Die laufende Aufnahme pausieren oder fortsetzen." picker_area_instant = "Bereich auswählen und im Instant-Modus aufnehmen." -picker_area_screenshot = "Bereich auswählen und ein Bildschirmfoto davon machen." picker_area_studio = "Bereich auswählen und im Studio-Modus aufnehmen." picker_display_instant = "Bildschirm wählen und im Instant-Modus aufnehmen." -picker_display_screenshot = "Bildschirm wählen und ein Bildschirmfoto davon machen." picker_display_studio = "Bildschirm wählen und im Studio-Modus aufnehmen." picker_window_instant = "Fenster wählen und im Instant-Modus aufnehmen." -picker_window_screenshot = "Fenster wählen und ein Bildschirmfoto davon machen." picker_window_studio = "Fenster wählen und im Studio-Modus aufnehmen." restart = "Die aktuelle Aufnahme verwerfen und neu beginnen." screenshot_area_copy = "Bereich auswählen und das Bildschirmfoto in die Zwischenablage kopieren." @@ -533,9 +539,11 @@ screenshot_window_copy = "Fenster unter dem Zeiger aufnehmen und das Bildschirmf screenshot_window_copy_and_open_editor = "Fenster unter dem Zeiger aufnehmen, das Bildschirmfoto kopieren und den Editor öffnen." screenshot_window_open_editor = "Fenster unter dem Zeiger aufnehmen und das Bildschirmfoto im Editor öffnen." screenshot_window_save = "Fenster unter dem Zeiger aufnehmen und das Bildschirmfoto in Ihrer Bibliothek speichern, ohne etwas zu öffnen." +start_selected = "Aufnahme oder Bildschirmfoto im in Cap ausgewählten Modus starten." stop = "Die laufende Aufnahme stoppen." studio = "Ausgewählten Bildschirm oder ausgewähltes Fenster im Studio-Modus aufnehmen." studio_open_editor = "Ausgewählten Bildschirm oder ausgewähltes Fenster im Studio-Modus aufnehmen und beim Stoppen den Editor öffnen." +toggle_drawing = "Während der Aufnahme das Zeichnen auf dem Bildschirm starten oder beenden." [settings.cli] command = "Befehl" @@ -604,6 +612,9 @@ uploading = "Wird hochgeladen..." confirm_body = "Cap belegt Ihren Bildschirm mit einem blinkenden Muster und spielt pro Durchlauf etwa {seconds} Sekunden lang laute Pieptöne ab. Nehmen Sie die Kopfhörer ab, lassen Sie die Lautstärke hörbar und benutzen Sie den Computer erst wieder, wenn der Test fertig ist." confirm_title = "Diagnose starten?" description = "Nimmt ein kurzes blinkendes und piepsendes Testmuster auf, misst, wie weit Bild und Ton auseinanderdriften, und erfasst Ihre Bildschirme, Kameras, Mikrofone, den Speicherplatz und die Aufnahmeeinstellungen. Es wird nichts gesendet, bis Sie sich dafür entscheiden." +duration_description = "Längere Tests erkennen langsame Abweichungen besser." +duration_label = "Testdauer" +duration_option = "{seconds} Sekunden" mic_description = "Nimmt auch Ihr Mikrofon auf und prüft, ob es die Pieptöne rechtzeitig hört. Benötigt Lautsprecher, die das Mikrofon tatsächlich hören kann." mic_label = "Mikrofon testen" mode_description = "Welcher Ablauf getestet wird. „Beide“ testet zuerst Studio und dann Instant." @@ -644,6 +655,8 @@ activating = "Wird aktiviert..." active_title = "Desktop-Lizenz" checking = "Wird geprüft…" deactivate = "Lizenz deaktivieren" +deactivate_failed = "Ihre Lizenz konnte nicht deaktiviert werden. Prüfen Sie Ihre Verbindung und versuchen Sie es erneut." +deactivating = "Wird deaktiviert..." description = "Ihr Cap-Tarif und Ihre Desktop-Lizenz an einem Ort." desktop_description = "Ihre Desktop-Lizenz deckt kommerzielles Aufnehmen und Bearbeiten ab. Cap Pro bietet zusätzlich Teilen über die Cloud und Funktionen für die Zusammenarbeit." desktop_name = "Desktop-Lizenz" @@ -740,17 +753,22 @@ working_for = "Die Google-Drive-Verbindung funktioniert für {email}" [settings.automations] action_no_effect = "Diese Aktion hat beim gewählten Auslöser keine Wirkung." +action_unsupported = "Cap führt diese Aktion noch nicht aus, daher wird sie übersprungen." add_action = "Aktion hinzufügen" add_condition = "Bedingung hinzufügen" auto_name_empty = "Automatisierung: {trigger}" browse = "Durchsuchen" check_compatibility = "Kompatibilität prüfen" -compatibility_checked = "Kompatibilität geprüft: Diese Automatisierung läuft noch nicht in Cap. Gespeicherte Regeln bleiben für die Cap-CLI verfügbar. Es wurden keine Aktionen ausgeführt." +compatibility_checked = "Kompatibilität geprüft: Jede Aktion dieser Automatisierung läuft in Cap. Es wurden keine Aktionen ausgeführt." +compatibility_unsupported = "Kompatibilität geprüft: Texterkennung läuft noch nicht in Cap und wird übersprungen. Die übrigen Aktionen laufen. Es wurden keine Aktionen ausgeführt." condition_never_matches = "Diese Bedingung trifft beim gewählten Auslöser nie zu." copy_link = "Link in die Zwischenablage kopieren" -dangerous = "In der Cap-CLI führt diese Automatisierung Befehle aus oder sendet Netzwerkanfragen mit Ihren Berechtigungen. Verwenden Sie nur Werte, denen Sie vertrauen." +dangerous = "Diese Automatisierung führt Befehle aus oder sendet Netzwerkanfragen mit Ihren Berechtigungen. Verwenden Sie nur Werte, denen Sie vertrauen." delete = "Löschen" -description = "Regeln werden mit der Cap-CLI geteilt. Cap speichert diese Regeln, führt Automatisierungen aber noch nicht aus." +delete_guarded = "Löscht die Aufnahme erst, wenn der Schritt darüber gelingt und seine Datei geprüft ist, und lässt den Editor dafür geschlossen. Andernfalls bleibt alles erhalten." +delete_needs_copy = "Es wird nichts gelöscht. Setze direkt über diesen Schritt „Mit Profil exportieren“ in einen Ordner deiner Wahl oder „Am gewählten Ort speichern“." +notify_needs_setting = "Wird nur angezeigt, solange Systembenachrichtigungen in den allgemeinen Einstellungen aktiviert sind." +description = "Regeln werden mit der Cap-CLI geteilt. Cap führt aktivierte Regeln automatisch aus." empty_description = "Wählen Sie unten eine Vorlage, um mit einem Klick zu starten, oder erstellen Sie Ihre eigene von Grund auf." empty_title = "Noch keine Automatisierungen" enabled = "Aktiviert" @@ -1027,6 +1045,7 @@ off = "Aus" on = "Ein" [main.error] +audio_only_needs_audio = "Für reine Audioaufnahmen muss ein Mikrofon ausgewählt oder Systemaudio eingeschaltet sein." camera_only_needs_camera = "Für reine Kameraaufnahmen muss eine Kamera ausgewählt sein." copy = "Fehler kopieren" devices_not_ready = "Die Aufnahmegeräte sind nicht bereit. Öffnen Sie den Rekorder und versuchen Sie es erneut." @@ -1136,6 +1155,7 @@ title = "Wenig Speicherplatz" [main.target] area = "Bereich" +audio_only = "Nur Audio" camera_only = "Nur Kamera" choose_display = "Bildschirm wählen" choose_window = "Fenster wählen" @@ -1147,6 +1167,35 @@ no_matching_windows = "Keine passenden Fenster" no_windows = "Keine Fenster gefunden" window = "Fenster" +[recordings_overlay] +close = "Schließen" +copy = "In die Zwischenablage kopieren" +copy_link = "Link zum Teilen kopieren" +create_link = "Link zum Teilen erstellen" +edit = "Bearbeiten" +export = "Exportieren" +open = "Öffnen" +retry = "Erneut versuchen" + +[recordings_overlay.progress] +choose_image = "Wähle, wo das Bild gespeichert wird" +choose_video = "Wähle, wohin das Video exportiert wird" +copied = "In die Zwischenablage kopiert" +copy_failed = "Kopieren fehlgeschlagen" +copying = "Wird in die Zwischenablage kopiert" +creating_link = "Link zum Teilen wird erstellt" +failed_hint = "Etwas ist schiefgelaufen. Versuchen Sie es erneut." +link_copied = "Link zum Teilen kopiert" +preparing = "Wird vorbereitet" +rendering_video = "Video wird gerendert" +save_failed = "Speichern fehlgeschlagen" +saved_image = "Bild gespeichert" +saved_video = "Video gespeichert" +saving_image = "Bild wird gespeichert" +saving_video = "Video wird gespeichert" +share_failed = "Link konnte nicht erstellt werden" +share_failed_hint = "Prüfen Sie Ihre Verbindung und versuchen Sie es erneut." + [controls] disk_full_resume = "Nicht genug Speicherplatz zum Fortsetzen. Geben Sie Speicher frei und versuchen Sie es erneut, oder drücken Sie Stopp, um zu speichern." low_storage = "Wenig Speicherplatz. Cap beendet die Aufnahme bald, um sie zu sichern." @@ -1175,9 +1224,32 @@ resuming = "Weiter…" saving = "Sichert…" starting = "Startet" +[controls.disconnected] +camera = "Kamera getrennt. Die Aufnahme läuft ohne Kamera-Overlay weiter." +microphone = "Mikrofon getrennt. Bis zur Wiederverbindung wird Stille aufgenommen." + [controls.marker] add = "Marker hinzufügen" +[controls.draw] +arrow = "Pfeil, ⇧ rastet auf 45° ein" +clear = "Alles löschen" +highlighter = "Textmarker, ⇧ für eine gerade Linie" +pen = "Stift, ⇧ für eine gerade Linie" +rectangle = "Rechteck, ⇧ für ein Quadrat" +start = "Auf dem Bildschirm zeichnen" +stop = "Zeichnen beenden" +undo = "Rückgängig" +window_unavailable = "Zeichnen funktioniert bei Bildschirm- und Bereichsaufnahmen" + +[controls.settings] +locked = "In dieser Aufnahme nicht änderbar" +not_in_recording = "Nicht in dieser Aufnahme" +open = "Aufnahmeeinstellungen" +show_camera_preview = "Kameravorschau anzeigen" +switch_failed = "Wechsel zu {device} nicht möglich. Die Aufnahme läuft weiter." +switching = "Wird gewechselt…" + [camera] waiting_title = "Warten auf Kamerazugriff" @@ -1192,6 +1264,8 @@ mirror_title = "Spiegeln nicht verfügbar" [camera.issue] access_message = "Klicken Sie hier, um Cap in den Systemeinstellungen den Zugriff auf Ihre Kamera zu erlauben." access_title = "Kamerazugriff erforderlich" +disconnected_message = "Die ausgewählte Kamera sendet kein Video mehr." +disconnected_title = "Kamera getrennt" generic = "Die ausgewählte Kamera konnte nicht gestartet werden. Wählen Sie eine andere Kamera oder verbinden Sie diese erneut." invalid_format = "Diese Kamera hat kein nutzbares Aufnahmeformat gemeldet." not_found = "Diese Kamera ist nicht mehr verfügbar. Prüfen Sie, ob sie verbunden ist und in den Systemberechtigungen erlaubt ist." @@ -1405,6 +1479,8 @@ devices_changed_before_start = "Die ausgewählten Geräte haben sich vor Beginn shortcut_conflict = "Ctrl+Shift+F9 ist einer anderen Cap-Aktion zugewiesen. Ändern Sie dieses Kürzel vor der Aufnahme." shortcut_description = "Diese Cap-Aufnahme starten oder beenden" shortcut_hint = "Drücken Sie {shortcut} und lassen Sie los, um zu starten. Mit demselben Kürzel beenden Sie die Aufnahme. Dieses vorübergehende Kürzel ändert Ihre Einstellungen nicht." +source_lost = "Cap hat die Aufnahme beendet, weil das Aufnahmeziel nicht mehr verfügbar war, zum Beispiel weil der Bildschirm in den Ruhezustand gewechselt ist oder das Fenster geschlossen wurde. Alles bis dahin Aufgenommene wurde gespeichert." +source_lost_title = "Aufnahme beendet" tray_stop_hint = "Aktivieren Sie das Cap-Stopp-Symbol in der Taskleiste, um zu starten. Aktivieren Sie es erneut, um zu beenden. Die Aufnahme beginnt erst, wenn Sie dieses Steuerelement verwenden." window_unavailable = "Das ausgewählte Fenster ist nicht mehr verfügbar. Wählen Sie es erneut aus." @@ -1462,12 +1538,14 @@ placeholder = "Skript einfügen oder eingeben…" words_per_minute = "{wpm} Wörter/Min." [import] +audio_failed = "Audio konnte nicht importiert werden: {error}" error_title = "Importfehler" image_failed = "Bild konnte nicht importiert werden: {error}" unsupported = "Nicht unterstützte Mediendatei." video_failed = "Video konnte nicht importiert werden: {error}" [import.filter] +audio = "Audiodateien" image = "Bilddateien" media = "Mediendateien" video = "Videodateien" @@ -1510,6 +1588,13 @@ unlock_body = "Den Bereich wieder verschieben, in der Größe ändern oder neu a locked_title = "Bereich gesperrt" locked_body = "Klicken, um ihn zu entsperren, damit er wieder verschoben, in der Größe geändert oder neu aufgezogen werden kann." +[overlay.audio_only] +choose_source = "Wählen Sie ein Mikrofon oder schalten Sie Systemaudio ein" +description = "Nehmen Sie Ihr Mikrofon und den Ton Ihres Computers auf, ohne Bildschirm und Kamera" +meter_hint = "Sagen Sie etwas, um den Pegel zu prüfen" +system_audio = "Systemaudio" +system_audio_only = "Nur Systemaudio wird aufgenommen" + [overlay.camera_only] description = "Nur mit Kamera und Mikrofon aufnehmen" select_camera = "Bitte wählen Sie eine Kamera" @@ -1768,6 +1853,20 @@ change_title = "Audio ändern" done = "Fertig" import = "Datei importieren" +[editor.audio_only] +add_visuals = "Visuals hinzufügen" +body = "Diese Aufnahme hat kein Video. Exportieren Sie den Ton als MP3 oder WAV, oder fügen Sie Visuals hinzu, um daraus ein Video zu machen." +export_audio = "Audio exportieren" +show_visuals = "Visuals anzeigen" +size_large = "Groß" +size_medium = "Mittel" +size_small = "Klein" +style_bars = "Balken" +style_circle = "Kreis" +style_wave = "Welle" +title = "Nur Audio" +visuals = "Visuals" + [editor.color] apply_to_cursor = "Auf Cursor anwenden" fine_tune = "Farben feinabstimmen" @@ -2182,6 +2281,7 @@ manual_help = "Der manuelle Zoom bleibt auf der Stelle, die Sie unten wählen." mixed = "Gemischt" mode = "Zoom-Modus" positions_mixed = "Die Segmente zoomen auf unterschiedliche Stellen. Ziehen Sie, um alle auf dieselbe Stelle zu setzen." +start_early = "Zooms früher starten" title = "Zoom {number}" [editor.side_panel] @@ -2286,6 +2386,7 @@ background_blur = "Hintergrundunschärfe" custom_position = "Eigene Bildschirmposition (auf der Leinwand verschoben)" motion_blur = "Bewegungsunschärfe" padding = "Rand" +padding_style = "Randstil" rounded_corners = "Abgerundete Ecken" title = "Layout" @@ -2364,11 +2465,13 @@ mp4_filter = "MP4-Video" prepare_controls_failed = "Die Aufnahmesteuerung konnte nicht vorbereitet werden: {error}" record = "Aufnehmen" record_new = "Neuen Clip aufnehmen" +removed_media = "{name} (entfernte Clips)" save_before_recording_failed = "Das aktuelle Projekt konnte vor der Aufnahme nicht gespeichert werden: {error}" split = "Teil {number}" title = "Clips" [editor.clips.error] +audio_only_mix = "Reine Audioaufnahmen und Videoclips können nicht in einem Projekt kombiniert werden" cancelled = "Import abgebrochen" cannot_decode = "Video {path} kann nicht decodiert werden: {error}" in_use = "Import nicht möglich, solange diese Aufnahme verwendet wird: {error}" @@ -2409,6 +2512,15 @@ upgrade_message = "Diese Funktion erfordert einen höheren Tarif" upgrade_title = "Upgrade erforderlich" upload_failed = "Aufnahme konnte nicht hochgeladen werden" +[editor.export.audio] +cta = "Audio exportieren" +exported = "Audio exportiert" +exporting = "Audio wird exportiert" +file_type = "Dateityp" +format = "Audio" +mp3_description = "Klein und überall abspielbar. 192 kb/s Stereo." +wav_description = "Verlustfrei, 16 Bit, 48 kHz. Ideal zur Weiterbearbeitung." + [editor.export.advanced] bits_per_pixel = "Bits pro Pixel" cursor_only = "Nur Cursor exportieren" @@ -2442,6 +2554,10 @@ retry_copy = "Erneut kopieren" reuploaded = "Ihre neueste Bearbeitung ist unter demselben Link bereit" uploaded = "Ihr Cap wurde erfolgreich hochgeladen" +[editor.export.enhance] +description = "Schärft Text und feine Details, wenn Ihre Aufnahme vergrößert oder verkleinert ist. Exporte können länger dauern." +title = "Qualität verbessern" + [editor.export.estimate] gigabytes = "~{value} GB" gigabytes_range = "~{lower}–{upper} GB" @@ -2496,6 +2612,7 @@ format = "Format" frame_rate = "Bildrate" quality = "Qualität" resolution = "Auflösung" +tracks = "Spuren" [editor.export.stats] calculating = "Wird berechnet…" @@ -2508,6 +2625,25 @@ refining_size = "Größe wird präzisiert…" refining_time = "Dauer wird präzisiert…" unavailable = "Nicht verfügbar" +[editor.export.tracks] +aligned = "Spuren folgen Ihren Schnitten und Ihrer Geschwindigkeit und passen in jedem Videoeditor zusammen. Video wird ohne Hintergrund und Effekte exportiert." +audio_detail = "WAV · 48 kHz" +camera = "Kamera" +choose_one = "Wählen Sie mindestens eine Spur zum Exportieren." +cta = "Spuren exportieren" +exported = "Spuren exportiert" +exporting = "Spuren werden exportiert" +file_count = { one = "{count} Datei", other = "{count} Dateien" } +file_only = "Spuren werden als einzelne Dateien in einem Ordner gespeichert." +files = "Dateien" +format = "Spuren" +microphone = "Mikrofon" +open_folder = "Ordner öffnen" +screen = "Bildschirm" +studio_only = "Separate Spuren werden nur im Studio-Modus aufgenommen." +system_audio = "Systemaudio" +video_detail = "MP4 · {width}×{height}" + [editor.export.turbo] title = "Turbo-Export" description = "Exportiert deutlich schneller mit allen CPU-Kernen und der GPU" @@ -2633,6 +2769,7 @@ model_downloaded = "Modell {model} heruntergeladen" model_label = "Modell" model_updated = "Empfohlenes Modell aktualisiert" model_updated_description = "Wir empfehlen die neue Version. Sie ist genauer und erkennt auch kurze Aufnahmen, die der alten entgangen sind." +new_caption = "Neuer Untertitel" position = "Position" refining_word_timings = "Wort-Timings werden verfeinert…" regenerate = "Untertitel neu erstellen" @@ -2709,6 +2846,7 @@ rounded = "Abgerundet" squircle = "Squircle" [editor.tabs.cursor] +follow_hover = "Hover-Hervorhebungen folgen" friction = "Reibung" hide_when_idle = "Bei Inaktivität ausblenden" inactivity_delay = "Verzögerung bei Inaktivität" @@ -2763,6 +2901,10 @@ timeline_unreadable = "Die Projektzeitleiste konnte nicht gelesen werden." title = "Tastatur anzeigen" uppercase = "Großbuchstaben" +[editor.tabs.padding] +even = "Gleichmäßig" +proportional = "Proportional" + [editor.tabs.position] bottom_center = "Unten mittig" bottom_left = "Unten links" @@ -2908,13 +3050,20 @@ video = "Video" zoom = "Zoom" [editor.transcript] +add_caption = "Untertitel am Abspielkopf hinzufügen" +captions_save_failed = "Die Untertitel konnten nicht gespeichert werden: {error}" +captions_saved = "Untertitel gespeichert" cleanup = "Aufräumen" cleanup_tooltip = "Füllwörter entfernen und Pausen kürzen" delete_matches = "Alle löschen" delete_matches_tooltip = "Jeden Treffer aus dem Video schneiden" +download_captions = "Untertitel herunterladen" +download_srt = "SubRip (.srt)" +download_vtt = "WebVTT (.vtt)" +edit_hint = "Eingabetaste zum Speichern, Esc zum Abbrechen, Tab für das nächste Wort" empty_description = "Transkribieren Sie diese Aufnahme auf diesem Computer und bearbeiten Sie dann das Video über seinen Text." empty_title = "Noch kein Transkript" -hint = "Klicken Sie auf ein Wort, um dorthin zu springen. Wählen Sie Wörter aus und drücken Sie die Löschtaste, um sie aus dem Video zu schneiden." +hint = "Klicken Sie auf ein Wort, um dorthin zu springen, oder doppelklicken Sie, um es zu korrigieren. Wählen Sie Wörter aus und drücken Sie die Löschtaste, um sie aus dem Video zu schneiden." next_match = "Nächster Treffer" no_audio = "Diese Aufnahme hat keinen Ton zum Transkribieren." no_speech = "Keine Sprache in dieser Aufnahme gefunden" @@ -2967,6 +3116,7 @@ audio_segment_changed = "Dieses Audiosegment hat sich geändert. Wählen Sie es crop = "Zuschneiden" crop_tooltip = "Video zuschneiden" no_room_for_3d_shot = "Kein Platz für eine weitere 3D-Einstellung" +no_room_for_caption = "Hier ist kein Platz für einen weiteren Untertitel" redo = "Wiederholen" save_failed = "{path} konnte nicht gespeichert werden. Lassen Sie den Editor geöffnet und versuchen Sie es erneut: {error}" undo = "Rückgängig" @@ -3144,7 +3294,11 @@ wipe_down = "Wischen nach unten" zoom = "Zoom" [editor.window.transport] +compare = "Vergleichen" +compare_tooltip = "Gedrückt halten, um das Original zu sehen" done_splitting = "Teilen beenden" +enhance = "Verbessern" +enhance_tooltip = "Angehaltenes Bild verbessert anzeigen" play_pause = "Video abspielen/pausieren" speed = "Vorschaugeschwindigkeit" split = "Teilen" @@ -3204,6 +3358,13 @@ quit_anyway = "Trotzdem beenden" still_open = "Cap ist noch geöffnet" unconfirmed = "Beenden abgebrochen, weil nicht bestätigt werden konnte, dass die Aufnahme beendet wurde. Cap bleibt geöffnet. Verwenden Sie „Stoppen“ und beenden Sie Cap dann erneut." +[dialog.startup] +failed = "{error}\n\nDetails wurden in {folder} gespeichert." +failed_title = "Cap konnte nicht gestartet werden" +quit_and_reopen = "Beenden und neu öffnen" +unresponsive = "Cap läuft bereits, reagiert aber nicht. Diese Instanz beenden und Cap neu öffnen?" +unresponsive_title = "Cap reagiert nicht" + [dialog.update] already_getting = "Cap bereitet Version {version} bereits vor." available = "Version {version} von Cap ist verfügbar. Cap lädt sie im Hintergrund herunter und informiert Sie, sobald sie installiert werden kann." @@ -3278,6 +3439,7 @@ changed_after = "Die lokale Aufnahme hat sich nach dem Upload geändert; sie ble already_queued = "Diese Aufnahme ist bereits zum Hochladen eingereiht" paused = "Upload pausiert; die lokale Aufnahme bleibt erhalten" worker_failed = "Der Upload-Vorgang ist fehlgeschlagen; die lokale Aufnahme bleibt erhalten" +deleted_on_web = "Diese Aufnahme wurde im Web gelöscht; die lokale Aufnahme bleibt erhalten" empty = "Die gespeicherte Aufnahme ist leer" no_resumable_state = "Für diese Aufnahme gibt es keinen fortsetzbaren Upload" verification_failed = "Die Prüfung der Aufnahme ist fehlgeschlagen: {status}" diff --git a/apps/desktop-gpui/locales/en.toml b/apps/desktop-gpui/locales/en.toml index 29f268aa5c6..530c312d80c 100644 --- a/apps/desktop-gpui/locales/en.toml +++ b/apps/desktop-gpui/locales/en.toml @@ -208,6 +208,10 @@ fps_30 = { text = "30 FPS", max_px = 180, size = 12 } fps_60 = { text = "60 FPS (Recommended)", max_px = 180, size = 12 } label = "Max capture framerate" +[settings.general.recording.keep_drawings] +description = "Drawings stay until you clear them. When off, each one fades a few seconds after you draw it." +label = "Keep drawings on screen" + [settings.general.recording.marker_sound] description = "Plays a short sound when you add a marker during a Studio recording. Your microphone or system audio can pick it up." label = "Play a sound for markers" @@ -302,6 +306,7 @@ open_link = "Open link" retry_upload = "Retry upload" show_all = "Show all" title = "Recordings" +save_audio = "Save Audio" [settings.recordings.empty] all = "No recordings" @@ -369,7 +374,7 @@ screen_region = { text = "Screen region", max_px = 180, size = 12 } [settings.options.post_studio] do_nothing = "Do nothing" open_editor = "Open editor" -show_cap = "Show Cap" +show_overlay = "Show in overlay" [settings.options.post_screenshot] copy = "Copy to clipboard" @@ -392,16 +397,19 @@ cancelling_description = "For screenshots and recordings started from a shortcut cancelling_title = "Cancelling" closing_editor_description = "For the screenshot editor and the video editor." closing_editor_title = "Closing the editor" +conflict = { text = "Already used by {shortcut}.", context = "{shortcut} is the label of the shortcut that already uses the keys just pressed, such as Record an area. A Replace button sits next to it." } needs_modifier_macos = "Include ⌘, ⌃ or ⌥ so the shortcut doesn't get in the way of typing." needs_modifier_other = "Include Ctrl, Alt or Win so the shortcut doesn't get in the way of typing." -record_shortcut = "Record shortcut" +not_set = "Not set" recording_description = "Start a recording without opening Cap first." recording_hint = "Press the keys you want to use. Esc cancels, Delete removes it." recording_title = "Recording" +replace = { text = "Replace", context = "Button: moves the keys just pressed from the other shortcut to this one." } saved = { text = "Saved. Press {keys} in any app to {effect}.", context = "{keys} is the shortcut, such as ⌘⇧4. {effect} is one of the settings.shortcuts.effect messages and completes the sentence." } saved_moved = { text = "Saved. Press {keys} in any app to {effect}. Removed from {shortcut}.", context = "Like settings.shortcuts.saved; {shortcut} is the label of the shortcut that used these keys before, such as Record an area." } screenshots_description = "Shortcuts work from any app. Click one to change it." screenshots_title = "Screenshots" +shared = { text = "Same keys as {shortcut}, so both run.", context = "{shortcut} is the label of another shortcut bound to the same keys, such as Record an area." } type_shortcut = "Type shortcut…" unavailable = "Another app or the system already uses this shortcut. Click to choose a different one." unsupported_key = "That key can't be used in a shortcut. Try a letter, number or F-key." @@ -453,8 +461,8 @@ screenshot_open_editor_hint = "Annotate first" studio_do_nothing = "Do nothing" studio_open_editor = "Open editor" studio_open_editor_hint = "Edit right away" -studio_show_cap = "Show Cap" -studio_show_cap_hint = "Back to the recorder" +studio_show_overlay = "Show overlay" +studio_show_overlay_hint = "Copy, share or export" [settings.shortcuts.label] add_marker = "Add marker" @@ -470,8 +478,10 @@ screenshot_area = "Screenshot an area" screenshot_display = "Screenshot the display" screenshot_window = "Screenshot a window" start_instant = "Start Instant recording" +start_selected = "Start in selected mode" start_studio = "Start Studio recording" stop = "Stop recording" +toggle_drawing = "Draw on screen" [settings.shortcuts.effect] add_marker = "mark this moment in a Studio recording" @@ -481,13 +491,10 @@ instant_copy_and_open = "record your selected screen or window in Instant mode, open_picker = "open Cap so you can choose what to record" pause = "pause the current recording, or resume it" picker_area_instant = "select an area, then record it in Instant mode" -picker_area_screenshot = "select an area, then take a screenshot of it" picker_area_studio = "select an area, then record it in Studio mode" picker_display_instant = "choose a display, then record it in Instant mode" -picker_display_screenshot = "choose a display, then take a screenshot of it" picker_display_studio = "choose a display, then record it in Studio mode" picker_window_instant = "choose a window, then record it in Instant mode" -picker_window_screenshot = "choose a window, then take a screenshot of it" picker_window_studio = "choose a window, then record it in Studio mode" restart = "throw away the current take and start again" screenshot_area_copy = "select an area and copy it to your clipboard" @@ -502,9 +509,11 @@ screenshot_window_copy = "capture the window under your pointer and copy it to y screenshot_window_copy_and_open_editor = "capture the window under your pointer and copy it and open the editor" screenshot_window_open_editor = "capture the window under your pointer and open it in the editor" screenshot_window_save = "capture the window under your pointer and save it to your library without opening anything" +start_selected = "start a recording or screenshot in the mode selected in Cap" stop = "stop the current recording" studio = "record your selected screen or window in Studio mode" studio_open_editor = "record your selected screen or window in Studio mode, then open the editor when you stop" +toggle_drawing = "start or stop drawing on screen while recording" [settings.shortcuts.sentence] add_marker = "Mark this moment in a Studio recording." @@ -514,13 +523,10 @@ instant_copy_and_open = "Record your selected screen or window in Instant mode, open_picker = "Open Cap so you can choose what to record." pause = "Pause the current recording, or resume it." picker_area_instant = "Select an area, then record it in Instant mode." -picker_area_screenshot = "Select an area, then take a screenshot of it." picker_area_studio = "Select an area, then record it in Studio mode." picker_display_instant = "Choose a display, then record it in Instant mode." -picker_display_screenshot = "Choose a display, then take a screenshot of it." picker_display_studio = "Choose a display, then record it in Studio mode." picker_window_instant = "Choose a window, then record it in Instant mode." -picker_window_screenshot = "Choose a window, then take a screenshot of it." picker_window_studio = "Choose a window, then record it in Studio mode." restart = "Throw away the current take and start again." screenshot_area_copy = "Select an area and copy it to your clipboard." @@ -535,9 +541,11 @@ screenshot_window_copy = "Capture the window under your pointer and copy it to y screenshot_window_copy_and_open_editor = "Capture the window under your pointer and copy it and open the editor." screenshot_window_open_editor = "Capture the window under your pointer and open it in the editor." screenshot_window_save = "Capture the window under your pointer and save it to your library without opening anything." +start_selected = "Start a recording or screenshot in the mode selected in Cap." stop = "Stop the current recording." studio = "Record your selected screen or window in Studio mode." studio_open_editor = "Record your selected screen or window in Studio mode, then open the editor when you stop." +toggle_drawing = "Start or stop drawing on screen while recording." [settings.cli] command = "Command" @@ -606,6 +614,9 @@ uploading = "Uploading..." confirm_body = { text = "Cap will take over your screen with a flashing pattern and play loud beeps for about {seconds} seconds per pipeline. Take your headphones off, leave the volume audible, and leave the machine alone until it finishes.", context = "{seconds} is a whole number of seconds." } confirm_title = "Run diagnostic?" description = "Records a short flashing/beeping test pattern, measures how far the picture and sound drift apart, and snapshots your displays, cameras, microphones, disk space and recording settings. Nothing is sent anywhere until you choose to send it." +duration_description = "Longer runs are more sensitive to slow drift." +duration_label = "Test duration" +duration_option = { text = "{seconds} seconds", context = "Segment in a three-way control in the settings window; {seconds} is 20, 40 or 60." } mic_description = "Also record your microphone and check that it hears the beeps in time. Needs speakers the mic can actually hear." mic_label = "Test microphone" mode_description = "Which pipeline to test. Both runs the studio leg and then the instant one." @@ -646,6 +657,8 @@ activating = "Activating..." active_title = "Desktop license" checking = "Checking…" deactivate = "Deactivate License" +deactivate_failed = "Couldn't deactivate your license. Check your connection and try again." +deactivating = "Deactivating..." description = "Your Cap plan and desktop license, in one place." desktop_description = "Your desktop license covers commercial recording and editing. Cap Pro adds cloud sharing and collaboration features." desktop_name = "Desktop License" @@ -742,17 +755,22 @@ working_for = { text = "Google Drive connection is working for {email}", context [settings.automations] action_no_effect = "This action has no effect for the selected trigger." +action_unsupported = "Cap doesn't run this action yet, so it is skipped." add_action = "Add action" add_condition = "Add condition" auto_name_empty = { text = "{trigger} automation", context = "{trigger} is a settings.automations.trigger.*.noun." } browse = "Browse" check_compatibility = "Check compatibility" -compatibility_checked = "Compatibility checked: this automation doesn't run in Cap yet. Saved rules remain available to the Cap CLI. No actions were run." +compatibility_checked = "Compatibility checked: every action in this automation runs in Cap. No actions were run." +compatibility_unsupported = "Compatibility checked: text recognition doesn't run in Cap yet and will be skipped. The other actions run. No actions were run." condition_never_matches = "This condition never matches for the selected trigger." copy_link = "Copy link to clipboard" -dangerous = "In the Cap CLI, this automation runs commands or sends network requests with your permissions. Only use values you trust." +dangerous = "This automation runs commands or sends network requests with your permissions. Only use values you trust." delete = "Delete" -description = "Rules are shared with the Cap CLI. Cap saves these rules but does not run automations yet." +delete_guarded = "Deletes the recording only once the step above succeeds and its file is checked, and keeps the editor closed so it can. Otherwise everything is kept." +delete_needs_copy = "Nothing will be deleted. Put an Export with profile to a folder you choose, or a Save to location, right above this step." +notify_needs_setting = "Shows only while System notifications is on in General settings." +description = "Rules are shared with the Cap CLI. Cap runs enabled rules automatically." empty_description = "Pick a template below to get started in one click, or build your own from scratch." empty_title = "No automations yet" enabled = "Enabled" @@ -1029,6 +1047,7 @@ off = { text = "Off", max_px = 130, size = 11 } on = { text = "On", max_px = 130, size = 11 } [main.error] +audio_only_needs_audio = "Audio only recording needs a microphone or system audio." camera_only_needs_camera = "Camera-only recording requires a selected camera." copy = "Copy error" devices_not_ready = "Recording devices are not ready. Open the recorder and try again." @@ -1137,8 +1156,9 @@ record_anyway = "Record anyway" title = "Low storage" [main.target] -area = { text = "Area", max_px = 140, size = 12 } -camera_only = { text = "Camera Only", max_px = 140, size = 12 } +area = { text = "Area", max_px = 84, size = 12 } +audio_only = { text = "Audio Only", max_px = 84, size = 12 } +camera_only = { text = "Camera Only", max_px = 84, size = 12 } choose_display = "Choose a display" choose_window = "Choose a window" display = { text = "Display", max_px = 100, size = 12 } @@ -1149,6 +1169,35 @@ no_matching_windows = "No matching windows" no_windows = "No windows found" window = { text = "Window", max_px = 100, size = 12 } +[recordings_overlay] +close = "Close" +copy = "Copy to clipboard" +copy_link = "Copy shareable link" +create_link = "Create shareable link" +edit = "Edit" +export = "Export" +open = "Open" +retry = "Retry" + +[recordings_overlay.progress] +choose_image = "Choose where to save the image" +choose_video = "Choose where to export the video" +copied = "Copied to clipboard" +copy_failed = "Couldn't copy" +copying = "Copying to clipboard" +creating_link = "Creating shareable link" +failed_hint = "Something went wrong. Try again." +link_copied = "Shareable link copied" +preparing = "Preparing" +rendering_video = "Rendering video" +save_failed = "Couldn't save" +saved_image = "Image saved" +saved_video = "Video saved" +saving_image = "Saving image" +saving_video = "Saving video" +share_failed = "Couldn't create the link" +share_failed_hint = "Check your connection and try again." + [controls] disk_full_resume = "Not enough disk space to resume. Free up space and try again, or press Stop to save." low_storage = "Low storage. Cap will stop soon to save your recording." @@ -1177,9 +1226,32 @@ resuming = { text = "Resuming…", max_px = 73, size = 14 } saving = { text = "Saving…", max_px = 73, size = 14 } starting = { text = "Starting", max_px = 73, size = 14 } +[controls.disconnected] +camera = "Camera disconnected. Recording continues without camera overlay." +microphone = "Microphone disconnected. Silence will be used until it reconnects." + [controls.marker] add = "Add marker" +[controls.draw] +arrow = "Arrow, ⇧ snaps to 45°" +clear = "Clear all" +highlighter = "Highlighter, ⇧ for a straight line" +pen = "Pen, ⇧ for a straight line" +rectangle = "Rectangle, ⇧ for a square" +start = "Draw on screen" +stop = "Stop drawing" +undo = "Undo" +window_unavailable = "Drawing works in display and area recordings" + +[controls.settings] +locked = "Can't change in this recording" +not_in_recording = "Not in this recording" +open = "Recording settings" +show_camera_preview = "Show camera preview" +switch_failed = "Couldn't switch to {device}. The recording continues." +switching = "Switching…" + [camera] waiting_title = "Waiting for camera access" @@ -1194,6 +1266,8 @@ mirror_title = "Mirror unavailable" [camera.issue] access_message = "Click to allow Cap to use your camera in System Settings." access_title = "Camera access needed" +disconnected_message = "The selected camera stopped sending video." +disconnected_title = "Camera disconnected" generic = "The selected camera could not be started. Choose another camera or reconnect this one." invalid_format = "This camera did not report a usable capture format." not_found = "This camera is no longer available. Check that it is connected and allowed by system permissions." @@ -1407,6 +1481,8 @@ devices_changed_before_start = "Selected devices changed before recording starte shortcut_conflict = "Ctrl+Shift+F9 is assigned to another Cap action. Change that shortcut before recording." shortcut_description = { text = "Start or stop this Cap recording", context = "Shown by the Linux desktop when it asks the user to approve a global shortcut." } shortcut_hint = { text = "Press and release {shortcut} to start. Use the same shortcut to stop. This temporary shortcut does not change your settings.", context = "{shortcut} is a key combination such as Ctrl+Shift+F9." } +source_lost = "Cap stopped recording because what it was capturing went away, for example the display went to sleep or the window closed. Everything recorded up to then was saved." +source_lost_title = "Recording stopped" tray_stop_hint = "Activate the Cap Stop tray icon to start. Activate the same icon again to stop. Recording will not start until you use that control." window_unavailable = "The selected window is no longer available. Select it again." @@ -1464,12 +1540,14 @@ placeholder = "Paste or type your script…" words_per_minute = { text = "{wpm} wpm", context = "Teleprompter scroll speed in words per minute; {wpm} is a number such as 150." } [import] +audio_failed = { text = "Failed to import audio: {error}", context = "{error} is a technical error message, usually in English." } error_title = "Import Error" image_failed = { text = "Failed to import image: {error}", context = "{error} is a technical error message, usually in English." } unsupported = "Unsupported media file." video_failed = { text = "Failed to import video: {error}", context = "{error} is a technical error message, usually in English." } [import.filter] +audio = { text = "Audio Files", context = "File type name in the file picker's filter list." } image = { text = "Image Files", context = "File type name in the file picker's filter list." } media = { text = "Media Files", context = "File type name in the file picker's filter list." } video = { text = "Video Files", context = "File type name in the file picker's filter list." } @@ -1512,6 +1590,13 @@ unlock_body = "Let the area be moved, resized or drawn again." locked_title = "Area locked" locked_body = "Click to unlock it, so it can be moved, resized or drawn again." +[overlay.audio_only] +choose_source = "Choose a microphone or turn on system audio" +description = "Record your microphone and your computer's sound, without the screen or camera" +meter_hint = "Say something to check your level" +system_audio = "System audio" +system_audio_only = "Recording system audio only" + [overlay.camera_only] description = "Record using only your camera and microphone" select_camera = "Please select a camera" @@ -1770,6 +1855,20 @@ change_title = "Change audio" done = "Done" import = "Import file" +[editor.audio_only] +add_visuals = "Add Visuals" +body = "This recording has no video. Export the sound as MP3 or WAV, or add visuals to turn it into a video." +export_audio = "Export Audio" +show_visuals = "Show visuals" +size_large = "Large" +size_medium = "Medium" +size_small = "Small" +style_bars = "Bars" +style_circle = "Circle" +style_wave = "Wave" +title = "Audio only" +visuals = "Visuals" + [editor.color] apply_to_cursor = "Apply to cursor" fine_tune = "Fine-tune colors" @@ -2184,6 +2283,7 @@ manual_help = "Manual zoom stays on a fixed spot you pick below." mixed = "Mixed" mode = "Zoom Mode" positions_mixed = "Segments zoom into different spots. Drag to move them all to the same one." +start_early = "Start zooms early" title = { text = "Zoom {number}", context = "{number} is the segment's position on the track, starting at 1." } [editor.side_panel] @@ -2288,6 +2388,7 @@ background_blur = "Background Blur" custom_position = "Custom screen position (dragged on canvas)" motion_blur = "Motion Blur" padding = "Padding" +padding_style = "Padding Style" rounded_corners = "Rounded Corners" title = "Layout" @@ -2366,11 +2467,13 @@ mp4_filter = { text = "MP4 Video", context = "File type filter name in the file prepare_controls_failed = "Could not prepare the recording controls: {error}" record = { text = "Record", context = "Button that records a new clip into this project." } record_new = "Record a new clip" +removed_media = { text = "{name} (removed clips)", context = "Name of the folder moved to the system Trash that holds the media of clips deleted from a recording; {name} is the recording name." } save_before_recording_failed = "Could not save the current project before recording: {error}" split = { text = "Split {number}", context = "Default name of a later piece cut from the same clip; {number} starts at 1." } title = "Clips" [editor.clips.error] +audio_only_mix = "Audio only recordings and video clips cannot be combined in one project" cancelled = "Import cancelled" cannot_decode = "Cannot decode video {path}: {error}" in_use = "Cannot import while this recording is in use: {error}" @@ -2411,6 +2514,15 @@ upgrade_message = "This feature requires an upgraded plan" upgrade_title = "Upgrade required" upload_failed = "Failed to upload recording" +[editor.export.audio] +cta = "Export Audio" +exported = "Audio exported" +exporting = "Exporting audio" +file_type = "File type" +format = { text = "Audio", context = "Export format: the sound alone as one MP3 or WAV file." } +mp3_description = "Small and plays everywhere. 192 kb/s stereo." +wav_description = "Lossless 16-bit, 48 kHz. Best for further editing." + [editor.export.advanced] bits_per_pixel = "Bits per pixel" cursor_only = "Export cursor only" @@ -2444,6 +2556,10 @@ retry_copy = "Retry Copy" reuploaded = "Your latest edit is ready at the same link" uploaded = "Your Cap has been uploaded successfully" +[editor.export.enhance] +description = "Sharpens text and fine detail when your recording is zoomed in or scaled down. Exports can take longer." +title = "Enhance quality" + [editor.export.estimate] gigabytes = "~{value} GB" gigabytes_range = "~{lower}–{upper} GB" @@ -2498,6 +2614,7 @@ format = "Format" frame_rate = "Frame rate" quality = "Quality" resolution = "Resolution" +tracks = "Tracks" [editor.export.stats] calculating = "Calculating…" @@ -2510,6 +2627,25 @@ refining_size = "Refining size…" refining_time = "Refining time…" unavailable = "Unavailable" +[editor.export.tracks] +aligned = "Tracks follow your cuts and speed, so they line up in any video editor. Video comes out clean, without background or effects." +audio_detail = "WAV · 48 kHz" +camera = "Camera" +choose_one = "Choose at least one track to export." +cta = "Export Tracks" +exported = "Tracks exported" +exporting = "Exporting tracks" +file_count = { one = "{count} file", other = "{count} files", context = "How many files a tracks export writes." } +file_only = "Tracks are saved as separate files in a folder." +files = "Files" +format = { text = "Tracks", context = "Export format: separate screen, camera and audio files." } +microphone = "Microphone" +open_folder = "Open Folder" +screen = "Screen" +studio_only = "Separate tracks are only recorded in Studio Mode." +system_audio = "System audio" +video_detail = { text = "MP4 · {width}×{height}", context = "Video track file type and size, for example MP4 · 1920×1080." } + [editor.export.turbo] title = "Turbo export" description = "Exports much faster using every CPU core and the GPU" @@ -2635,6 +2771,7 @@ model_downloaded = "{model} model downloaded" model_label = "Model" model_updated = "Recommended model updated" model_updated_description = "We recommend the new version. It is more accurate and catches short recordings the old one missed." +new_caption = "New caption" position = "Position" refining_word_timings = "Refining word timings…" regenerate = "Regenerate Captions" @@ -2711,6 +2848,7 @@ rounded = "Rounded" squircle = "Squircle" [editor.tabs.cursor] +follow_hover = "Follow Hover Highlights" friction = "Friction" hide_when_idle = "Hide When Idle" inactivity_delay = "Inactivity Delay" @@ -2765,6 +2903,10 @@ timeline_unreadable = "The project timeline could not be read." title = "Show keyboard" uppercase = "Uppercase" +[editor.tabs.padding] +even = "Even" +proportional = "Proportional" + [editor.tabs.position] bottom_center = "Bottom Center" bottom_left = "Bottom Left" @@ -2910,13 +3052,20 @@ video = { text = "Video", context = "Timeline gutter label of the recording's vi zoom = "Zoom" [editor.transcript] +add_caption = "Add caption at playhead" +captions_save_failed = { text = "Could not save the captions: {error}", context = "{error} is a technical message that stays in English." } +captions_saved = "Captions saved" cleanup = "Clean up" cleanup_tooltip = "Remove filler words and shorten pauses" delete_matches = "Delete all" delete_matches_tooltip = "Cut every match from the video" +download_captions = "Download captions" +download_srt = { text = "SubRip (.srt)", context = "Menu item that saves captions as an SRT subtitle file. SubRip is a format name; keep it." } +download_vtt = { text = "WebVTT (.vtt)", context = "Menu item that saves captions as a WebVTT subtitle file. WebVTT is a format name; keep it." } +edit_hint = "Enter to save, Esc to cancel, Tab for the next word" empty_description = "Transcribe this recording on this computer, then edit the video by editing its text." empty_title = "No transcript yet" -hint = "Click a word to jump to it. Select words and press Delete to cut them from the video." +hint = "Click a word to jump to it, double-click to fix it. Select words and press Delete to cut them from the video." next_match = "Next match" no_audio = "This recording has no audio to transcribe." no_speech = "No speech found in this recording" @@ -2969,6 +3118,7 @@ audio_segment_changed = "This audio segment changed. Select it and choose a repl crop = "Crop" crop_tooltip = "Crop Video" no_room_for_3d_shot = "No room for another 3D shot" +no_room_for_caption = "No room for another caption here" redo = "Redo" save_failed = { text = "Could not save {path}. Keep the editor open and try again: {error}", context = "{path} is the recording's folder; {error} is a technical message that stays in English." } undo = "Undo" @@ -3146,7 +3296,11 @@ wipe_down = { text = "Wipe down", context = "Transition type: an edge sweeping d zoom = { text = "Zoom", context = "Transition type: the picture zooms through the cut into the next clip." } [editor.window.transport] +compare = "Compare" +compare_tooltip = "Hold to see the original" done_splitting = "Done splitting" +enhance = "Enhance" +enhance_tooltip = "Show the paused frame enhanced" play_pause = "Play/Pause video" speed = { text = "Preview speed", context = "Tooltip for the menu in the editor transport bar that sets how fast the preview plays. It never changes the exported video." } split = "Split" @@ -3206,6 +3360,13 @@ quit_anyway = "Quit Anyway" still_open = "Cap is still open" unconfirmed = "Quit canceled because recording shutdown could not be confirmed. Cap will stay open. Use Stop, then try Quit again." +[dialog.startup] +failed = { text = "{error}\n\nDetails were saved in {folder}.", context = "{error} is a technical reason, usually in English. {folder} is a folder path." } +failed_title = "Cap couldn't start" +quit_and_reopen = { text = "Quit and Reopen", context = "Button: quit the copy of Cap that is not responding and start a new one." } +unresponsive = "Cap is already running but isn't responding. Quit that copy and open Cap again?" +unresponsive_title = "Cap isn't responding" + [dialog.update] already_getting = { text = "Cap is already getting version {version} ready.", context = "{version} is a version number such as 0.6.2." } available = { text = "Version {version} of Cap is available. Cap will download it in the background and let you know when it's ready to install.", context = "{version} is a version number such as 0.6.2." } @@ -3280,6 +3441,7 @@ changed_after = "The local recording changed after upload; it has been preserved already_queued = "This recording is already queued for upload" paused = "Upload paused; the local recording is preserved" worker_failed = "The upload worker failed; the local recording is preserved" +deleted_on_web = "This recording was deleted on the web; the local recording is preserved" empty = "The saved recording is empty" no_resumable_state = "This recording has no resumable upload state" verification_failed = { text = "Recording verification failed: {status}", context = "{status} is a technical status, usually in English." } diff --git a/apps/desktop-gpui/locales/es.toml b/apps/desktop-gpui/locales/es.toml index 27fbf306d17..920cd1dd872 100644 --- a/apps/desktop-gpui/locales/es.toml +++ b/apps/desktop-gpui/locales/es.toml @@ -206,6 +206,10 @@ fps_30 = "30 FPS" fps_60 = "60 FPS (recomendado)" label = "Velocidad de fotogramas máxima" +[settings.general.recording.keep_drawings] +description = "Los dibujos se quedan hasta que los borras. Si está desactivado, cada uno se desvanece unos segundos después de dibujarlo." +label = "Mantener los dibujos en pantalla" + [settings.general.recording.marker_sound] description = "Reproduce un sonido corto cuando añades un marcador durante una grabación Studio. Tu micrófono o el audio del sistema pueden captarlo." label = "Reproducir un sonido con los marcadores" @@ -300,6 +304,7 @@ open_link = "Abrir enlace" retry_upload = "Reintentar la subida" show_all = "Mostrar todo" title = "Grabaciones" +save_audio = "Guardar audio" [settings.recordings.empty] all = "No hay grabaciones" @@ -367,7 +372,7 @@ screen_region = "Región de pantalla" [settings.options.post_studio] do_nothing = "No hacer nada" open_editor = "Abrir el editor" -show_cap = "Mostrar Cap" +show_overlay = "Mostrar en superposición" [settings.options.post_screenshot] copy = "Copiar al portapapeles" @@ -390,16 +395,19 @@ cancelling_description = "Para capturas y grabaciones iniciadas desde un atajo o cancelling_title = "Cancelación" closing_editor_description = "Para el editor de capturas y el editor de vídeo." closing_editor_title = "Cierre del editor" +conflict = "Ya lo usa «{shortcut}»." needs_modifier_macos = "Incluye ⌘, ⌃ o ⌥ para que el atajo no interfiera al escribir." needs_modifier_other = "Incluye Ctrl, Alt o Win para que el atajo no interfiera al escribir." -record_shortcut = "Asignar atajo" +not_set = "Sin asignar" recording_description = "Empieza a grabar sin abrir Cap primero." recording_hint = "Pulsa las teclas que quieras usar. Esc cancela y Supr lo quita." recording_title = "Grabación" +replace = "Reemplazar" saved = "Guardado. Pulsa {keys} en cualquier app para {effect}." saved_moved = "Guardado. Pulsa {keys} en cualquier app para {effect}. Se quitó de «{shortcut}»." screenshots_description = "Los atajos funcionan desde cualquier app. Haz clic en uno para cambiarlo." screenshots_title = "Capturas de pantalla" +shared = "Mismas teclas que «{shortcut}», así que se ejecutan los dos." type_shortcut = "Escribe el atajo…" unavailable = "Otra app o el sistema ya usa este atajo. Haz clic para elegir otro." unsupported_key = "Esa tecla no se puede usar en un atajo. Prueba con una letra, un número o una tecla F." @@ -451,8 +459,8 @@ screenshot_open_editor_hint = "Anotar primero" studio_do_nothing = "No hacer nada" studio_open_editor = "Abrir el editor" studio_open_editor_hint = "Editar enseguida" -studio_show_cap = "Mostrar Cap" -studio_show_cap_hint = "Volver a la grabadora" +studio_show_overlay = "Superposición" +studio_show_overlay_hint = "Copiar, compartir o exportar" [settings.shortcuts.label] add_marker = "Añadir marcador" @@ -468,8 +476,10 @@ screenshot_area = "Capturar un área" screenshot_display = "Capturar la pantalla" screenshot_window = "Capturar una ventana" start_instant = "Iniciar grabación Instant" +start_selected = "Iniciar en el modo seleccionado" start_studio = "Iniciar grabación Studio" stop = "Detener la grabación" +toggle_drawing = "Dibujar en pantalla" [settings.shortcuts.effect] add_marker = "marcar este momento en una grabación Studio" @@ -479,13 +489,10 @@ instant_copy_and_open = "grabar la pantalla o ventana seleccionada en modo Insta open_picker = "abrir Cap para elegir qué grabar" pause = "pausar la grabación actual o reanudarla" picker_area_instant = "seleccionar un área y luego grabarla en modo Instant" -picker_area_screenshot = "seleccionar un área y luego hacerle una captura de pantalla" picker_area_studio = "seleccionar un área y luego grabarla en modo Studio" picker_display_instant = "elegir una pantalla y luego grabarla en modo Instant" -picker_display_screenshot = "elegir una pantalla y luego hacerle una captura de pantalla" picker_display_studio = "elegir una pantalla y luego grabarla en modo Studio" picker_window_instant = "elegir una ventana y luego grabarla en modo Instant" -picker_window_screenshot = "elegir una ventana y luego hacerle una captura de pantalla" picker_window_studio = "elegir una ventana y luego grabarla en modo Studio" restart = "descartar la toma actual y empezar de nuevo" screenshot_area_copy = "seleccionar un área y copiar la captura al portapapeles" @@ -500,9 +507,11 @@ screenshot_window_copy = "capturar la ventana bajo tu puntero y copiar la captur screenshot_window_copy_and_open_editor = "capturar la ventana bajo tu puntero, copiar la captura y abrir el editor" screenshot_window_open_editor = "capturar la ventana bajo tu puntero y abrir la captura en el editor" screenshot_window_save = "capturar la ventana bajo tu puntero y guardar la captura en tu biblioteca sin abrir nada" +start_selected = "iniciar una grabación o captura en el modo seleccionado en Cap" stop = "detener la grabación actual" studio = "grabar la pantalla o ventana seleccionada en modo Studio" studio_open_editor = "grabar la pantalla o ventana seleccionada en modo Studio y abrir el editor al detenerla" +toggle_drawing = "empezar o dejar de dibujar en pantalla mientras grabas" [settings.shortcuts.sentence] add_marker = "Marcar este momento en una grabación Studio." @@ -512,13 +521,10 @@ instant_copy_and_open = "Grabar la pantalla o ventana seleccionada en modo Insta open_picker = "Abrir Cap para elegir qué grabar." pause = "Pausar la grabación actual o reanudarla." picker_area_instant = "Seleccionar un área y luego grabarla en modo Instant." -picker_area_screenshot = "Seleccionar un área y luego hacerle una captura de pantalla." picker_area_studio = "Seleccionar un área y luego grabarla en modo Studio." picker_display_instant = "Elegir una pantalla y luego grabarla en modo Instant." -picker_display_screenshot = "Elegir una pantalla y luego hacerle una captura de pantalla." picker_display_studio = "Elegir una pantalla y luego grabarla en modo Studio." picker_window_instant = "Elegir una ventana y luego grabarla en modo Instant." -picker_window_screenshot = "Elegir una ventana y luego hacerle una captura de pantalla." picker_window_studio = "Elegir una ventana y luego grabarla en modo Studio." restart = "Descartar la toma actual y empezar de nuevo." screenshot_area_copy = "Seleccionar un área y copiar la captura al portapapeles." @@ -533,9 +539,11 @@ screenshot_window_copy = "Capturar la ventana bajo tu puntero y copiar la captur screenshot_window_copy_and_open_editor = "Capturar la ventana bajo tu puntero, copiar la captura y abrir el editor." screenshot_window_open_editor = "Capturar la ventana bajo tu puntero y abrir la captura en el editor." screenshot_window_save = "Capturar la ventana bajo tu puntero y guardar la captura en tu biblioteca sin abrir nada." +start_selected = "Iniciar una grabación o captura en el modo seleccionado en Cap." stop = "Detener la grabación actual." studio = "Grabar la pantalla o ventana seleccionada en modo Studio." studio_open_editor = "Grabar la pantalla o ventana seleccionada en modo Studio y abrir el editor al detenerla." +toggle_drawing = "Empezar o dejar de dibujar en pantalla mientras grabas." [settings.cli] command = "Comando" @@ -604,6 +612,9 @@ uploading = "Subiendo..." confirm_body = "Cap ocupará tu pantalla con un patrón parpadeante y emitirá pitidos fuertes durante unos {seconds} segundos por cada proceso. Quítate los auriculares, deja el volumen audible y no toques el equipo hasta que termine." confirm_title = "¿Ejecutar el diagnóstico?" description = "Graba un breve patrón de prueba con destellos y pitidos, mide cuánto se desfasan la imagen y el sonido, y registra tus pantallas, cámaras, micrófonos, espacio en disco y ajustes de grabación. No se envía nada hasta que tú decidas enviarlo." +duration_description = "Las pruebas más largas detectan mejor las desviaciones lentas." +duration_label = "Duración de la prueba" +duration_option = "{seconds} segundos" mic_description = "También graba tu micrófono y comprueba que capta los pitidos a tiempo. Necesita altavoces que el micrófono pueda oír." mic_label = "Probar el micrófono" mode_description = "Qué proceso probar. «Ambos» ejecuta primero la parte Studio y luego la Instant." @@ -644,6 +655,8 @@ activating = "Activando..." active_title = "Licencia de escritorio" checking = "Comprobando…" deactivate = "Desactivar licencia" +deactivate_failed = "No se pudo desactivar tu licencia. Revisa tu conexión e inténtalo de nuevo." +deactivating = "Desactivando..." description = "Tu plan de Cap y tu licencia de escritorio, en un solo lugar." desktop_description = "Tu licencia de escritorio cubre la grabación y edición comercial. Cap Pro añade compartir en la nube y funciones de colaboración." desktop_name = "Licencia de escritorio" @@ -740,17 +753,22 @@ working_for = "La conexión de Google Drive funciona para {email}" [settings.automations] action_no_effect = "Esta acción no tiene efecto con el disparador seleccionado." +action_unsupported = "Cap todavía no ejecuta esta acción, así que se omite." add_action = "Añadir acción" add_condition = "Añadir condición" auto_name_empty = "Automatización: {trigger}" browse = "Examinar" check_compatibility = "Comprobar compatibilidad" -compatibility_checked = "Compatibilidad comprobada: esta automatización todavía no se ejecuta en Cap. Las reglas guardadas siguen disponibles para la CLI de Cap. No se ejecutó ninguna acción." +compatibility_checked = "Compatibilidad comprobada: todas las acciones de esta automatización se ejecutan en Cap. No se ejecutó ninguna acción." +compatibility_unsupported = "Compatibilidad comprobada: el reconocimiento de texto todavía no se ejecuta en Cap y se omitirá. Las demás acciones se ejecutan. No se ejecutó ninguna acción." condition_never_matches = "Esta condición nunca se cumple con el disparador seleccionado." copy_link = "Copiar el enlace al portapapeles" -dangerous = "En la CLI de Cap, esta automatización ejecuta comandos o envía solicitudes de red con tus permisos. Usa solo valores de confianza." +dangerous = "Esta automatización ejecuta comandos o envía solicitudes de red con tus permisos. Usa solo valores de confianza." delete = "Eliminar" -description = "Las reglas se comparten con la CLI de Cap. Cap guarda estas reglas, pero todavía no ejecuta automatizaciones." +delete_guarded = "Elimina la grabación solo cuando el paso anterior termina bien y se comprueba su archivo, y deja el editor cerrado para poder hacerlo. Si no, se conserva todo." +delete_needs_copy = "No se eliminará nada. Coloca justo encima de este paso «Exportar con un perfil» a una carpeta que elijas o «Guardar en una ubicación»." +notify_needs_setting = "Solo se muestra mientras las notificaciones del sistema estén activadas en los ajustes generales." +description = "Las reglas se comparten con la CLI de Cap. Cap ejecuta automáticamente las reglas activadas." empty_description = "Elige una plantilla de abajo para empezar con un clic o crea la tuya desde cero." empty_title = "Aún no hay automatizaciones" enabled = "Activada" @@ -1027,6 +1045,7 @@ off = "No" on = "Sí" [main.error] +audio_only_needs_audio = "Para grabar solo audio hay que seleccionar un micrófono o activar el audio del sistema." camera_only_needs_camera = "Para grabar solo con cámara hay que seleccionar una cámara." copy = "Copiar error" devices_not_ready = "Los dispositivos de grabación no están listos. Abre la grabadora e inténtalo de nuevo." @@ -1136,6 +1155,7 @@ title = "Poco almacenamiento" [main.target] area = "Área" +audio_only = "Solo audio" camera_only = "Solo cámara" choose_display = "Elegir una pantalla" choose_window = "Elegir una ventana" @@ -1147,6 +1167,35 @@ no_matching_windows = "No hay ventanas que coincidan" no_windows = "No se encontraron ventanas" window = "Ventana" +[recordings_overlay] +close = "Cerrar" +copy = "Copiar al portapapeles" +copy_link = "Copiar enlace para compartir" +create_link = "Crear enlace para compartir" +edit = "Editar" +export = "Exportar" +open = "Abrir" +retry = "Reintentar" + +[recordings_overlay.progress] +choose_image = "Elige dónde guardar la imagen" +choose_video = "Elige dónde exportar el vídeo" +copied = "Copiado al portapapeles" +copy_failed = "No se pudo copiar" +copying = "Copiando al portapapeles" +creating_link = "Creando enlace para compartir" +failed_hint = "Algo salió mal. Inténtalo de nuevo." +link_copied = "Enlace para compartir copiado" +preparing = "Preparando" +rendering_video = "Renderizando vídeo" +save_failed = "No se pudo guardar" +saved_image = "Imagen guardada" +saved_video = "Vídeo guardado" +saving_image = "Guardando imagen" +saving_video = "Guardando vídeo" +share_failed = "No se pudo crear el enlace" +share_failed_hint = "Comprueba tu conexión e inténtalo de nuevo." + [controls] disk_full_resume = "No hay espacio suficiente para reanudar. Libera espacio e inténtalo de nuevo, o pulsa Detener para guardar." low_storage = "Poco almacenamiento. Cap se detendrá pronto para guardar tu grabación." @@ -1175,9 +1224,32 @@ resuming = "Continúa…" saving = "Guardar…" starting = "Iniciando" +[controls.disconnected] +camera = "Cámara desconectada. La grabación continúa sin la cámara superpuesta." +microphone = "Micrófono desconectado. Se grabará silencio hasta que se vuelva a conectar." + [controls.marker] add = "Añadir marcador" +[controls.draw] +arrow = "Flecha, ⇧ ajusta a 45°" +clear = "Borrar todo" +highlighter = "Resaltador, ⇧ para una línea recta" +pen = "Lápiz, ⇧ para una línea recta" +rectangle = "Rectángulo, ⇧ para un cuadrado" +start = "Dibujar en pantalla" +stop = "Dejar de dibujar" +undo = "Deshacer" +window_unavailable = "Dibujar funciona en grabaciones de pantalla y de área" + +[controls.settings] +locked = "No se puede cambiar en esta grabación" +not_in_recording = "No está en esta grabación" +open = "Ajustes de grabación" +show_camera_preview = "Mostrar vista previa de la cámara" +switch_failed = "No se pudo cambiar a {device}. La grabación continúa." +switching = "Cambiando…" + [camera] waiting_title = "Esperando acceso a la cámara" @@ -1192,6 +1264,8 @@ mirror_title = "Espejo no disponible" [camera.issue] access_message = "Haz clic para permitir que Cap use tu cámara en Ajustes del Sistema." access_title = "Se necesita acceso a la cámara" +disconnected_message = "La cámara seleccionada dejó de enviar video." +disconnected_title = "Cámara desconectada" generic = "No se pudo iniciar la cámara seleccionada. Elige otra cámara o vuelve a conectar esta." invalid_format = "Esta cámara no indicó ningún formato de captura utilizable." not_found = "Esta cámara ya no está disponible. Comprueba que esté conectada y permitida en los permisos del sistema." @@ -1405,6 +1479,8 @@ devices_changed_before_start = "Los dispositivos seleccionados cambiaron antes d shortcut_conflict = "Ctrl+Shift+F9 está asignado a otra acción de Cap. Cambia ese atajo antes de grabar." shortcut_description = "Iniciar o detener esta grabación de Cap" shortcut_hint = "Pulsa y suelta {shortcut} para empezar. Usa el mismo atajo para detener. Este atajo temporal no cambia tus ajustes." +source_lost = "Cap detuvo la grabación porque lo que estaba grabando dejó de estar disponible, por ejemplo, la pantalla entró en reposo o se cerró la ventana. Todo lo grabado hasta ese momento se guardó." +source_lost_title = "Grabación detenida" tray_stop_hint = "Activa el icono de detener de Cap en la bandeja para empezar. Vuelve a activarlo para detener. La grabación no empezará hasta que uses ese control." window_unavailable = "La ventana seleccionada ya no está disponible. Vuelve a seleccionarla." @@ -1462,12 +1538,14 @@ placeholder = "Pega o escribe tu guion…" words_per_minute = "{wpm} ppm" [import] +audio_failed = "No se pudo importar el audio: {error}" error_title = "Error de importación" image_failed = "No se pudo importar la imagen: {error}" unsupported = "Archivo multimedia no compatible." video_failed = "No se pudo importar el vídeo: {error}" [import.filter] +audio = "Archivos de audio" image = "Archivos de imagen" media = "Archivos multimedia" video = "Archivos de vídeo" @@ -1510,6 +1588,13 @@ unlock_body = "Permite volver a mover, redimensionar o dibujar el área." locked_title = "Área bloqueada" locked_body = "Haz clic para desbloquearla y poder moverla, redimensionarla o dibujarla de nuevo." +[overlay.audio_only] +choose_source = "Elige un micrófono o activa el audio del sistema" +description = "Graba tu micrófono y el sonido de tu ordenador, sin pantalla ni cámara" +meter_hint = "Di algo para comprobar el nivel" +system_audio = "Audio del sistema" +system_audio_only = "Solo se grabará el audio del sistema" + [overlay.camera_only] description = "Graba solo con tu cámara y tu micrófono" select_camera = "Selecciona una cámara" @@ -1768,6 +1853,20 @@ change_title = "Cambiar audio" done = "Listo" import = "Importar archivo" +[editor.audio_only] +add_visuals = "Añadir visuales" +body = "Esta grabación no tiene vídeo. Exporta el sonido como MP3 o WAV, o añade elementos visuales para convertirla en un vídeo." +export_audio = "Exportar audio" +show_visuals = "Mostrar visuales" +size_large = "Grande" +size_medium = "Mediano" +size_small = "Pequeño" +style_bars = "Barras" +style_circle = "Círculo" +style_wave = "Onda" +title = "Solo audio" +visuals = "Visuales" + [editor.color] apply_to_cursor = "Aplicar al cursor" fine_tune = "Ajustar colores" @@ -2182,6 +2281,7 @@ manual_help = "El zoom manual se queda en el punto fijo que elijas abajo." mixed = "Mixto" mode = "Modo de zoom" positions_mixed = "Los segmentos hacen zoom en puntos distintos. Arrastra para moverlos todos al mismo." +start_early = "Iniciar zooms antes" title = "Zoom {number}" [editor.side_panel] @@ -2286,6 +2386,7 @@ background_blur = "Desenfoque del fondo" custom_position = "Posición de pantalla personalizada (arrastrada en el lienzo)" motion_blur = "Desenfoque de movimiento" padding = "Margen" +padding_style = "Estilo de margen" rounded_corners = "Esquinas redondeadas" title = "Diseño" @@ -2364,11 +2465,13 @@ mp4_filter = "Vídeo MP4" prepare_controls_failed = "No se pudieron preparar los controles de grabación: {error}" record = "Grabar" record_new = "Grabar un clip nuevo" +removed_media = "{name} (clips eliminados)" save_before_recording_failed = "No se pudo guardar el proyecto actual antes de grabar: {error}" split = "Parte {number}" title = "Clips" [editor.clips.error] +audio_only_mix = "Las grabaciones solo de audio y los clips de vídeo no se pueden combinar en un proyecto" cancelled = "Importación cancelada" cannot_decode = "No se puede decodificar el vídeo {path}: {error}" in_use = "No se puede importar mientras esta grabación está en uso: {error}" @@ -2409,6 +2512,15 @@ upgrade_message = "Esta función requiere un plan superior" upgrade_title = "Se requiere un plan superior" upload_failed = "No se pudo subir la grabación" +[editor.export.audio] +cta = "Exportar audio" +exported = "Audio exportado" +exporting = "Exportando audio" +file_type = "Tipo de archivo" +format = "Audio" +mp3_description = "Ligero y se reproduce en cualquier sitio. 192 kb/s en estéreo." +wav_description = "Sin pérdida, 16 bits y 48 kHz. Ideal para seguir editando." + [editor.export.advanced] bits_per_pixel = "Bits por píxel" cursor_only = "Exportar solo el cursor" @@ -2442,6 +2554,10 @@ retry_copy = "Reintentar copia" reuploaded = "Tu última edición está lista en el mismo enlace" uploaded = "Tu Cap se subió correctamente" +[editor.export.enhance] +description = "Mejora la nitidez del texto y los detalles finos cuando tu grabación está ampliada o reducida. Las exportaciones pueden tardar más." +title = "Mejorar calidad" + [editor.export.estimate] gigabytes = "~{value} GB" gigabytes_range = "~{lower}–{upper} GB" @@ -2496,6 +2612,7 @@ format = "Formato" frame_rate = "Velocidad de fotogramas" quality = "Calidad" resolution = "Resolución" +tracks = "Pistas" [editor.export.stats] calculating = "Calculando…" @@ -2508,6 +2625,25 @@ refining_size = "Ajustando tamaño…" refining_time = "Ajustando tiempo…" unavailable = "No disponible" +[editor.export.tracks] +aligned = "Las pistas siguen tus cortes y tu velocidad, así que encajan en cualquier editor de vídeo. El vídeo sale limpio, sin fondo ni efectos." +audio_detail = "WAV · 48 kHz" +camera = "Cámara" +choose_one = "Elige al menos una pista para exportar." +cta = "Exportar pistas" +exported = "Pistas exportadas" +exporting = "Exportando pistas" +file_count = { one = "{count} archivo", other = "{count} archivos" } +file_only = "Las pistas se guardan como archivos separados en una carpeta." +files = "Archivos" +format = "Pistas" +microphone = "Micrófono" +open_folder = "Abrir carpeta" +screen = "Pantalla" +studio_only = "Las pistas separadas solo se graban en el modo Studio." +system_audio = "Audio del sistema" +video_detail = "MP4 · {width}×{height}" + [editor.export.turbo] title = "Exportación turbo" description = "Exporta mucho más rápido usando todos los núcleos de la CPU y la GPU" @@ -2633,6 +2769,7 @@ model_downloaded = "Modelo {model} descargado" model_label = "Modelo" model_updated = "Modelo recomendado actualizado" model_updated_description = "Te recomendamos la nueva versión. Es más precisa y transcribe grabaciones cortas que la anterior pasaba por alto." +new_caption = "Subtítulo nuevo" position = "Posición" refining_word_timings = "Ajustando los tiempos de las palabras…" regenerate = "Regenerar subtítulos" @@ -2709,6 +2846,7 @@ rounded = "Redondeadas" squircle = "Squircle" [editor.tabs.cursor] +follow_hover = "Seguir resaltados al pasar" friction = "Fricción" hide_when_idle = "Ocultar en reposo" inactivity_delay = "Retraso de inactividad" @@ -2763,6 +2901,10 @@ timeline_unreadable = "No se pudo leer la línea de tiempo del proyecto." title = "Mostrar teclado" uppercase = "Mayúsculas" +[editor.tabs.padding] +even = "Uniforme" +proportional = "Proporcional" + [editor.tabs.position] bottom_center = "Abajo al centro" bottom_left = "Abajo a la izquierda" @@ -2908,13 +3050,20 @@ video = "Vídeo" zoom = "Zoom" [editor.transcript] +add_caption = "Añadir subtítulo en el cabezal" +captions_save_failed = "No se pudieron guardar los subtítulos: {error}" +captions_saved = "Subtítulos guardados" cleanup = "Limpiar" cleanup_tooltip = "Quitar muletillas y acortar pausas" delete_matches = "Eliminar todo" delete_matches_tooltip = "Cortar del vídeo cada coincidencia" +download_captions = "Descargar subtítulos" +download_srt = "SubRip (.srt)" +download_vtt = "WebVTT (.vtt)" +edit_hint = "Intro para guardar, Esc para cancelar, Tab para la siguiente palabra" empty_description = "Transcribe esta grabación en este ordenador y luego edita el vídeo editando su texto." empty_title = "Aún no hay transcripción" -hint = "Haz clic en una palabra para ir a ella. Selecciona palabras y pulsa la tecla de borrar para cortarlas del vídeo." +hint = "Haz clic en una palabra para ir a ella o doble clic para corregirla. Selecciona palabras y pulsa la tecla de borrar para cortarlas del vídeo." next_match = "Siguiente coincidencia" no_audio = "Esta grabación no tiene audio que transcribir." no_speech = "No se encontró voz en esta grabación" @@ -2967,6 +3116,7 @@ audio_segment_changed = "Este segmento de audio cambió. Selecciónalo y vuelve crop = "Recortar" crop_tooltip = "Recortar vídeo" no_room_for_3d_shot = "No hay espacio para otra toma 3D" +no_room_for_caption = "No hay espacio para otro subtítulo aquí" redo = "Rehacer" save_failed = "No se pudo guardar {path}. Mantén el editor abierto e inténtalo de nuevo: {error}" undo = "Deshacer" @@ -3144,7 +3294,11 @@ wipe_down = "Barrido hacia abajo" zoom = "Zoom" [editor.window.transport] +compare = "Comparar" +compare_tooltip = "Mantén pulsado para ver el original" done_splitting = "Terminar de dividir" +enhance = "Mejorar" +enhance_tooltip = "Mostrar mejorado el fotograma en pausa" play_pause = "Reproducir/pausar vídeo" speed = "Velocidad de la vista previa" split = "Dividir" @@ -3204,6 +3358,13 @@ quit_anyway = "Salir de todos modos" still_open = "Cap sigue abierto" unconfirmed = "Se canceló la salida porque no se pudo confirmar que la grabación se detuviera. Cap seguirá abierto. Usa Detener y vuelve a intentar salir." +[dialog.startup] +failed = "{error}\n\nLos detalles se guardaron en {folder}." +failed_title = "Cap no pudo iniciarse" +quit_and_reopen = "Salir y volver a abrir" +unresponsive = "Cap ya se está ejecutando, pero no responde. ¿Quieres cerrar esa copia y volver a abrir Cap?" +unresponsive_title = "Cap no responde" + [dialog.update] already_getting = "Cap ya está preparando la versión {version}." available = "La versión {version} de Cap está disponible. Cap la descargará en segundo plano y te avisará cuando esté lista para instalarse." @@ -3278,6 +3439,7 @@ changed_after = "La grabación local cambió después de la subida; se ha conser already_queued = "Esta grabación ya está en la cola de subida" paused = "Subida en pausa; la grabación local se conserva" worker_failed = "El proceso de subida ha fallado; la grabación local se conserva" +deleted_on_web = "Esta grabación se eliminó en la web; la grabación local se conserva" empty = "La grabación guardada está vacía" no_resumable_state = "Esta grabación no tiene una subida que se pueda reanudar" verification_failed = "La verificación de la grabación ha fallado: {status}" diff --git a/apps/desktop-gpui/locales/fr.toml b/apps/desktop-gpui/locales/fr.toml index 87b46c59460..cab06798301 100644 --- a/apps/desktop-gpui/locales/fr.toml +++ b/apps/desktop-gpui/locales/fr.toml @@ -206,6 +206,10 @@ fps_30 = "30 i/s" fps_60 = "60 i/s (recommandé)" label = "Fréquence d'images maximale" +[settings.general.recording.keep_drawings] +description = "Les dessins restent jusqu'à ce que vous les effaciez. Sinon, chacun s'estompe quelques secondes après avoir été tracé." +label = "Garder les dessins à l'écran" + [settings.general.recording.marker_sound] description = "Émet un son bref lorsque vous ajoutez un repère pendant un enregistrement Studio. Votre micro ou le son du système peuvent l'enregistrer." label = "Émettre un son pour les repères" @@ -300,6 +304,7 @@ open_link = "Ouvrir le lien" retry_upload = "Relancer la mise en ligne" show_all = "Tout afficher" title = "Enregistrements" +save_audio = "Enregistrer l'audio" [settings.recordings.empty] all = "Aucun enregistrement" @@ -367,7 +372,7 @@ screen_region = "Zone de l'écran" [settings.options.post_studio] do_nothing = "Ne rien faire" open_editor = "Ouvrir l'éditeur" -show_cap = "Afficher Cap" +show_overlay = "Afficher en superposition" [settings.options.post_screenshot] copy = "Copier dans le presse-papiers" @@ -390,16 +395,19 @@ cancelling_description = "Pour les captures et les enregistrements lancés depui cancelling_title = "Annulation" closing_editor_description = "Pour l'éditeur de captures et l'éditeur vidéo." closing_editor_title = "Fermeture de l'éditeur" +conflict = "Déjà utilisé par « {shortcut} »." needs_modifier_macos = "Incluez ⌘, ⌃ ou ⌥ pour que le raccourci ne gêne pas la saisie." needs_modifier_other = "Incluez Ctrl, Alt ou Win pour que le raccourci ne gêne pas la saisie." -record_shortcut = "Définir un raccourci" +not_set = "Non défini" recording_description = "Lancez un enregistrement sans ouvrir Cap au préalable." recording_hint = "Appuyez sur les touches à utiliser. Échap annule, Suppr retire le raccourci." recording_title = "Enregistrement" +replace = "Remplacer" saved = "Enregistré. Appuyez sur {keys} dans n'importe quelle app pour {effect}." saved_moved = "Enregistré. Appuyez sur {keys} dans n'importe quelle app pour {effect}. Retiré de « {shortcut} »." screenshots_description = "Les raccourcis fonctionnent depuis n'importe quelle app. Cliquez sur un raccourci pour le modifier." screenshots_title = "Captures d'écran" +shared = "Mêmes touches que « {shortcut} », les deux s'exécutent donc." type_shortcut = "Saisissez un raccourci…" unavailable = "Une autre app ou le système utilise déjà ce raccourci. Cliquez pour en choisir un autre." unsupported_key = "Cette touche ne peut pas être utilisée dans un raccourci. Essayez une lettre, un chiffre ou une touche F." @@ -451,8 +459,8 @@ screenshot_open_editor_hint = "Annoter d'abord" studio_do_nothing = "Ne rien faire" studio_open_editor = "Ouvrir l'éditeur" studio_open_editor_hint = "Modifier tout de suite" -studio_show_cap = "Afficher Cap" -studio_show_cap_hint = "Retour à l'enregistreur" +studio_show_overlay = "Superposition" +studio_show_overlay_hint = "Copier, partager, exporter" [settings.shortcuts.label] add_marker = "Ajouter un repère" @@ -468,8 +476,10 @@ screenshot_area = "Capturer une zone" screenshot_display = "Capturer l'écran" screenshot_window = "Capturer une fenêtre" start_instant = "Démarrer un enregistrement Instant" +start_selected = "Démarrer dans le mode sélectionné" start_studio = "Démarrer un enregistrement Studio" stop = "Arrêter l'enregistrement" +toggle_drawing = "Dessiner à l'écran" [settings.shortcuts.effect] add_marker = "marquer ce moment dans un enregistrement Studio" @@ -479,13 +489,10 @@ instant_copy_and_open = "enregistrer l'écran ou la fenêtre sélectionnés en m open_picker = "ouvrir Cap pour choisir ce que vous voulez enregistrer" pause = "mettre en pause l'enregistrement en cours, ou le reprendre" picker_area_instant = "sélectionner une zone, puis l'enregistrer en mode Instant" -picker_area_screenshot = "sélectionner une zone, puis en faire une capture d'écran" picker_area_studio = "sélectionner une zone, puis l'enregistrer en mode Studio" picker_display_instant = "choisir un écran, puis l'enregistrer en mode Instant" -picker_display_screenshot = "choisir un écran, puis en faire une capture d'écran" picker_display_studio = "choisir un écran, puis l'enregistrer en mode Studio" picker_window_instant = "choisir une fenêtre, puis l'enregistrer en mode Instant" -picker_window_screenshot = "choisir une fenêtre, puis en faire une capture d'écran" picker_window_studio = "choisir une fenêtre, puis l'enregistrer en mode Studio" restart = "abandonner la prise en cours et recommencer" screenshot_area_copy = "sélectionner une zone et copier la capture dans le presse-papiers" @@ -500,9 +507,11 @@ screenshot_window_copy = "capturer la fenêtre sous votre pointeur et copier la screenshot_window_copy_and_open_editor = "capturer la fenêtre sous votre pointeur, copier la capture et ouvrir l'éditeur" screenshot_window_open_editor = "capturer la fenêtre sous votre pointeur et ouvrir la capture dans l'éditeur" screenshot_window_save = "capturer la fenêtre sous votre pointeur et enregistrer la capture dans votre bibliothèque sans rien ouvrir" +start_selected = "lancer un enregistrement ou une capture dans le mode sélectionné dans Cap" stop = "arrêter l'enregistrement en cours" studio = "enregistrer l'écran ou la fenêtre sélectionnés en mode Studio" studio_open_editor = "enregistrer l'écran ou la fenêtre sélectionnés en mode Studio, puis ouvrir l'éditeur à l'arrêt" +toggle_drawing = "commencer ou arrêter de dessiner à l'écran pendant l'enregistrement" [settings.shortcuts.sentence] add_marker = "Marquer ce moment dans un enregistrement Studio." @@ -512,13 +521,10 @@ instant_copy_and_open = "Enregistrer l'écran ou la fenêtre sélectionnés en m open_picker = "Ouvrir Cap pour choisir ce que vous voulez enregistrer." pause = "Mettre en pause l'enregistrement en cours, ou le reprendre." picker_area_instant = "Sélectionner une zone, puis l'enregistrer en mode Instant." -picker_area_screenshot = "Sélectionner une zone, puis en faire une capture d'écran." picker_area_studio = "Sélectionner une zone, puis l'enregistrer en mode Studio." picker_display_instant = "Choisir un écran, puis l'enregistrer en mode Instant." -picker_display_screenshot = "Choisir un écran, puis en faire une capture d'écran." picker_display_studio = "Choisir un écran, puis l'enregistrer en mode Studio." picker_window_instant = "Choisir une fenêtre, puis l'enregistrer en mode Instant." -picker_window_screenshot = "Choisir une fenêtre, puis en faire une capture d'écran." picker_window_studio = "Choisir une fenêtre, puis l'enregistrer en mode Studio." restart = "Abandonner la prise en cours et recommencer." screenshot_area_copy = "Sélectionner une zone et copier la capture dans le presse-papiers." @@ -533,9 +539,11 @@ screenshot_window_copy = "Capturer la fenêtre sous votre pointeur et copier la screenshot_window_copy_and_open_editor = "Capturer la fenêtre sous votre pointeur, copier la capture et ouvrir l'éditeur." screenshot_window_open_editor = "Capturer la fenêtre sous votre pointeur et ouvrir la capture dans l'éditeur." screenshot_window_save = "Capturer la fenêtre sous votre pointeur et enregistrer la capture dans votre bibliothèque sans rien ouvrir." +start_selected = "Lancer un enregistrement ou une capture dans le mode sélectionné dans Cap." stop = "Arrêter l'enregistrement en cours." studio = "Enregistrer l'écran ou la fenêtre sélectionnés en mode Studio." studio_open_editor = "Enregistrer l'écran ou la fenêtre sélectionnés en mode Studio, puis ouvrir l'éditeur à l'arrêt." +toggle_drawing = "Commencer ou arrêter de dessiner à l'écran pendant l'enregistrement." [settings.cli] command = "Commande" @@ -604,6 +612,9 @@ uploading = "Envoi..." confirm_body = "Cap va occuper votre écran avec un motif clignotant et émettre des bips forts pendant environ {seconds} secondes par chaîne de traitement. Retirez votre casque, laissez le volume audible et ne touchez pas à l'ordinateur jusqu'à la fin." confirm_title = "Lancer le diagnostic ?" description = "Enregistre une courte mire clignotante et sonore, mesure le décalage entre l'image et le son, et relève vos écrans, caméras, micros, espace disque et paramètres d'enregistrement. Rien n'est envoyé tant que vous ne le décidez pas." +duration_description = "Un test plus long détecte mieux les dérives lentes." +duration_label = "Durée du test" +duration_option = "{seconds} secondes" mic_description = "Enregistre aussi votre micro et vérifie qu'il capte les bips à temps. Nécessite des haut-parleurs que le micro peut réellement entendre." mic_label = "Tester le micro" mode_description = "La chaîne de traitement à tester. « Les deux » exécute d'abord la partie Studio, puis la partie Instant." @@ -644,6 +655,8 @@ activating = "Activation..." active_title = "Licence de bureau" checking = "Vérification…" deactivate = "Désactiver la licence" +deactivate_failed = "Impossible de désactiver votre licence. Vérifiez votre connexion et réessayez." +deactivating = "Désactivation..." description = "Votre offre Cap et votre licence de bureau, au même endroit." desktop_description = "Votre licence de bureau couvre l'enregistrement et le montage à usage commercial. Cap Pro ajoute le partage dans le cloud et les fonctionnalités collaboratives." desktop_name = "Licence de bureau" @@ -740,17 +753,22 @@ working_for = "La connexion Google Drive fonctionne pour {email}" [settings.automations] action_no_effect = "Cette action n'a aucun effet avec le déclencheur sélectionné." +action_unsupported = "Cap n'exécute pas encore cette action, elle est donc ignorée." add_action = "Ajouter une action" add_condition = "Ajouter une condition" auto_name_empty = "Automatisation {trigger}" browse = "Parcourir" check_compatibility = "Vérifier la compatibilité" -compatibility_checked = "Compatibilité vérifiée : cette automatisation ne s'exécute pas encore dans Cap. Les règles enregistrées restent disponibles pour la CLI Cap. Aucune action n'a été exécutée." +compatibility_checked = "Compatibilité vérifiée : toutes les actions de cette automatisation s'exécutent dans Cap. Aucune action n'a été exécutée." +compatibility_unsupported = "Compatibilité vérifiée : la reconnaissance de texte ne s'exécute pas encore dans Cap et sera ignorée. Les autres actions s'exécutent. Aucune action n'a été exécutée." condition_never_matches = "Cette condition ne correspond jamais au déclencheur sélectionné." copy_link = "Copier le lien dans le presse-papiers" -dangerous = "Dans la CLI Cap, cette automatisation exécute des commandes ou envoie des requêtes réseau avec vos autorisations. N'utilisez que des valeurs de confiance." +dangerous = "Cette automatisation exécute des commandes ou envoie des requêtes réseau avec vos autorisations. N'utilisez que des valeurs de confiance." delete = "Supprimer" -description = "Les règles sont partagées avec la CLI Cap. Cap enregistre ces règles mais n'exécute pas encore les automatisations." +delete_guarded = "Supprime l'enregistrement seulement si l'étape au-dessus réussit et que son fichier est vérifié, et garde l'éditeur fermé pour cela. Sinon, tout est conservé." +delete_needs_copy = "Rien ne sera supprimé. Placez juste au-dessus de cette étape « Exporter avec un profil » vers un dossier de votre choix ou « Enregistrer à un emplacement »." +notify_needs_setting = "S'affiche seulement si les notifications système sont activées dans les réglages généraux." +description = "Les règles sont partagées avec la CLI Cap. Cap exécute automatiquement les règles activées." empty_description = "Choisissez un modèle ci-dessous pour démarrer en un clic, ou créez la vôtre de zéro." empty_title = "Aucune automatisation pour l'instant" enabled = "Activée" @@ -1027,6 +1045,7 @@ off = "Non" on = "Oui" [main.error] +audio_only_needs_audio = "L'enregistrement audio seul nécessite un micro ou l'audio système." camera_only_needs_camera = "L'enregistrement caméra seule nécessite une caméra sélectionnée." copy = "Copier l'erreur" devices_not_ready = "Les appareils d'enregistrement ne sont pas prêts. Ouvrez l'enregistreur et réessayez." @@ -1136,6 +1155,7 @@ title = "Espace de stockage faible" [main.target] area = "Zone" +audio_only = "Audio seul" camera_only = "Caméra seule" choose_display = "Choisir un écran" choose_window = "Choisir une fenêtre" @@ -1147,6 +1167,35 @@ no_matching_windows = "Aucune fenêtre correspondante" no_windows = "Aucune fenêtre trouvée" window = "Fenêtre" +[recordings_overlay] +close = "Fermer" +copy = "Copier dans le presse-papiers" +copy_link = "Copier le lien de partage" +create_link = "Créer un lien de partage" +edit = "Modifier" +export = "Exporter" +open = "Ouvrir" +retry = "Réessayer" + +[recordings_overlay.progress] +choose_image = "Choisissez où enregistrer l'image" +choose_video = "Choisissez où exporter la vidéo" +copied = "Copié dans le presse-papiers" +copy_failed = "Copie impossible" +copying = "Copie dans le presse-papiers" +creating_link = "Création du lien de partage" +failed_hint = "Un problème est survenu. Réessayez." +link_copied = "Lien de partage copié" +preparing = "Préparation" +rendering_video = "Rendu de la vidéo" +save_failed = "Enregistrement impossible" +saved_image = "Image enregistrée" +saved_video = "Vidéo enregistrée" +saving_image = "Enregistrement de l'image" +saving_video = "Enregistrement de la vidéo" +share_failed = "Impossible de créer le lien" +share_failed_hint = "Vérifiez votre connexion et réessayez." + [controls] disk_full_resume = "Espace disque insuffisant pour reprendre. Libérez de l'espace et réessayez, ou appuyez sur Arrêter pour enregistrer." low_storage = "Espace de stockage faible. Cap va bientôt s'arrêter pour préserver votre enregistrement." @@ -1175,9 +1224,32 @@ resuming = "Reprise…" saving = "Arrêt…" starting = "Début" +[controls.disconnected] +camera = "Caméra déconnectée. L'enregistrement continue sans l'incrustation de la caméra." +microphone = "Micro déconnecté. Du silence sera enregistré jusqu'à sa reconnexion." + [controls.marker] add = "Ajouter un repère" +[controls.draw] +arrow = "Flèche, ⇧ aligne à 45°" +clear = "Tout effacer" +highlighter = "Surligneur, ⇧ pour une ligne droite" +pen = "Stylo, ⇧ pour une ligne droite" +rectangle = "Rectangle, ⇧ pour un carré" +start = "Dessiner à l'écran" +stop = "Arrêter de dessiner" +undo = "Annuler" +window_unavailable = "Le dessin fonctionne dans les enregistrements d'écran et de zone" + +[controls.settings] +locked = "Non modifiable dans cet enregistrement" +not_in_recording = "Absent de cet enregistrement" +open = "Réglages d'enregistrement" +show_camera_preview = "Afficher l'aperçu de la caméra" +switch_failed = "Impossible de passer à {device}. L'enregistrement continue." +switching = "Changement…" + [camera] waiting_title = "En attente de l'accès à la caméra" @@ -1192,6 +1264,8 @@ mirror_title = "Miroir indisponible" [camera.issue] access_message = "Cliquez pour autoriser Cap à utiliser votre caméra dans Réglages Système." access_title = "Accès à la caméra requis" +disconnected_message = "La caméra sélectionnée n'envoie plus de vidéo." +disconnected_title = "Caméra déconnectée" generic = "La caméra sélectionnée n'a pas pu démarrer. Choisissez une autre caméra ou reconnectez celle-ci." invalid_format = "Cette caméra n'a signalé aucun format de capture utilisable." not_found = "Cette caméra n'est plus disponible. Vérifiez qu'elle est connectée et autorisée dans les autorisations du système." @@ -1405,6 +1479,8 @@ devices_changed_before_start = "Les appareils sélectionnés ont changé avant l shortcut_conflict = "Ctrl+Shift+F9 est attribué à une autre action de Cap. Modifiez ce raccourci avant d'enregistrer." shortcut_description = "Lancer ou arrêter cet enregistrement Cap" shortcut_hint = "Appuyez sur {shortcut} puis relâchez pour démarrer. Utilisez le même raccourci pour arrêter. Ce raccourci temporaire ne modifie pas vos réglages." +source_lost = "Cap a arrêté l'enregistrement, car ce qu'il capturait n'est plus disponible, par exemple l'écran s'est mis en veille ou la fenêtre a été fermée. Tout ce qui a été enregistré jusque-là a été sauvegardé." +source_lost_title = "Enregistrement arrêté" tray_stop_hint = "Activez l'icône d'arrêt de Cap dans la zone de notification pour démarrer. Activez-la à nouveau pour arrêter. L'enregistrement ne commencera pas tant que vous n'aurez pas utilisé cette commande." window_unavailable = "La fenêtre sélectionnée n'est plus disponible. Sélectionnez-la à nouveau." @@ -1462,12 +1538,14 @@ placeholder = "Collez ou saisissez votre script…" words_per_minute = "{wpm} mots/min" [import] +audio_failed = "Impossible d'importer l'audio : {error}" error_title = "Erreur d'importation" image_failed = "Impossible d'importer l'image : {error}" unsupported = "Fichier multimédia non pris en charge." video_failed = "Impossible d'importer la vidéo : {error}" [import.filter] +audio = "Fichiers audio" image = "Fichiers image" media = "Fichiers multimédias" video = "Fichiers vidéo" @@ -1510,6 +1588,13 @@ unlock_body = "Permettre de déplacer, redimensionner ou redessiner la zone." locked_title = "Zone verrouillée" locked_body = "Cliquez pour la déverrouiller afin de pouvoir la déplacer, la redimensionner ou la redessiner." +[overlay.audio_only] +choose_source = "Choisissez un micro ou activez l'audio système" +description = "Enregistrez votre micro et le son de votre ordinateur, sans l'écran ni la caméra" +meter_hint = "Dites quelque chose pour vérifier le niveau" +system_audio = "Audio système" +system_audio_only = "Seul l'audio système sera enregistré" + [overlay.camera_only] description = "Enregistrez uniquement avec votre caméra et votre micro" select_camera = "Veuillez choisir une caméra" @@ -1768,6 +1853,20 @@ change_title = "Changer l'audio" done = "Terminé" import = "Importer un fichier" +[editor.audio_only] +add_visuals = "Ajouter des visuels" +body = "Cet enregistrement n'a pas de vidéo. Exportez le son en MP3 ou WAV, ou ajoutez des visuels pour en faire une vidéo." +export_audio = "Exporter l'audio" +show_visuals = "Afficher les visuels" +size_large = "Grand" +size_medium = "Moyen" +size_small = "Petit" +style_bars = "Barres" +style_circle = "Cercle" +style_wave = "Onde" +title = "Audio seul" +visuals = "Visuels" + [editor.color] apply_to_cursor = "Appliquer au curseur" fine_tune = "Ajuster les couleurs" @@ -2182,6 +2281,7 @@ manual_help = "Le zoom manuel reste sur le point fixe que vous choisissez ci-des mixed = "Mixte" mode = "Mode de zoom" positions_mixed = "Les segments zooment sur des points différents. Faites glisser pour tous les placer au même endroit." +start_early = "Lancer les zooms plus tôt" title = "Zoom {number}" [editor.side_panel] @@ -2286,6 +2386,7 @@ background_blur = "Flou de l'arrière-plan" custom_position = "Position d'écran personnalisée (déplacée sur le canevas)" motion_blur = "Flou de mouvement" padding = "Marge" +padding_style = "Style de marge" rounded_corners = "Coins arrondis" title = "Disposition" @@ -2364,11 +2465,13 @@ mp4_filter = "Vidéo MP4" prepare_controls_failed = "Impossible de préparer les commandes d'enregistrement : {error}" record = "Enregistrer" record_new = "Enregistrer un nouveau clip" +removed_media = "{name} (clips supprimés)" save_before_recording_failed = "Impossible de sauvegarder le projet actuel avant l'enregistrement : {error}" split = "Partie {number}" title = "Clips" [editor.clips.error] +audio_only_mix = "Les enregistrements audio seul et les clips vidéo ne peuvent pas être combinés dans un même projet" cancelled = "Importation annulée" cannot_decode = "Impossible de décoder la vidéo {path} : {error}" in_use = "Importation impossible tant que cet enregistrement est utilisé : {error}" @@ -2409,6 +2512,15 @@ upgrade_message = "Cette fonctionnalité nécessite une offre supérieure" upgrade_title = "Mise à niveau requise" upload_failed = "Impossible de mettre en ligne l'enregistrement" +[editor.export.audio] +cta = "Exporter l'audio" +exported = "Audio exporté" +exporting = "Export de l'audio" +file_type = "Type de fichier" +format = "Audio" +mp3_description = "Léger et lisible partout. 192 kb/s en stéréo." +wav_description = "Sans perte, 16 bits, 48 kHz. Idéal pour continuer le montage." + [editor.export.advanced] bits_per_pixel = "Bits par pixel" cursor_only = "Exporter le curseur seul" @@ -2442,6 +2554,10 @@ retry_copy = "Réessayer la copie" reuploaded = "Votre dernière modification est disponible sur le même lien" uploaded = "Votre Cap a bien été mis en ligne" +[editor.export.enhance] +description = "Rend le texte et les détails fins plus nets quand votre enregistrement est agrandi ou réduit. Les exports peuvent prendre plus de temps." +title = "Améliorer la qualité" + [editor.export.estimate] gigabytes = "~{value} Go" gigabytes_range = "~{lower}–{upper} Go" @@ -2496,6 +2612,7 @@ format = "Format" frame_rate = "Fréquence d'images" quality = "Qualité" resolution = "Résolution" +tracks = "Pistes" [editor.export.stats] calculating = "Calcul…" @@ -2508,6 +2625,25 @@ refining_size = "Affinage de la taille…" refining_time = "Affinage de la durée…" unavailable = "Indisponible" +[editor.export.tracks] +aligned = "Les pistes suivent vos coupes et votre vitesse, et s'alignent dans n'importe quel logiciel de montage. La vidéo sort propre, sans arrière-plan ni effets." +audio_detail = "WAV · 48 kHz" +camera = "Caméra" +choose_one = "Choisissez au moins une piste à exporter." +cta = "Exporter les pistes" +exported = "Pistes exportées" +exporting = "Exportation des pistes" +file_count = { one = "{count} fichier", other = "{count} fichiers" } +file_only = "Les pistes sont enregistrées dans un dossier, en fichiers séparés." +files = "Fichiers" +format = "Pistes" +microphone = "Micro" +open_folder = "Ouvrir le dossier" +screen = "Écran" +studio_only = "Les pistes séparées ne sont enregistrées qu'en mode Studio." +system_audio = "Audio système" +video_detail = "MP4 · {width}×{height}" + [editor.export.turbo] title = "Exportation turbo" description = "Exporte beaucoup plus vite en utilisant tous les cœurs du processeur et le GPU" @@ -2633,6 +2769,7 @@ model_downloaded = "Modèle {model} téléchargé" model_label = "Modèle" model_updated = "Modèle recommandé mis à jour" model_updated_description = "Nous recommandons la nouvelle version. Elle est plus précise et transcrit les enregistrements courts que l'ancienne ne captait pas." +new_caption = "Nouveau sous-titre" position = "Position" refining_word_timings = "Affinage du minutage des mots…" regenerate = "Régénérer les sous-titres" @@ -2709,6 +2846,7 @@ rounded = "Arrondi" squircle = "Squircle" [editor.tabs.cursor] +follow_hover = "Suivre les survols" friction = "Friction" hide_when_idle = "Masquer en cas d'inactivité" inactivity_delay = "Délai d'inactivité" @@ -2763,6 +2901,10 @@ timeline_unreadable = "Impossible de lire la timeline du projet." title = "Afficher le clavier" uppercase = "Majuscules" +[editor.tabs.padding] +even = "Uniforme" +proportional = "Proportionnelle" + [editor.tabs.position] bottom_center = "En bas au centre" bottom_left = "En bas à gauche" @@ -2908,13 +3050,20 @@ video = "Vidéo" zoom = "Zoom" [editor.transcript] +add_caption = "Ajouter un sous-titre à la tête de lecture" +captions_save_failed = "Impossible d'enregistrer les sous-titres : {error}" +captions_saved = "Sous-titres enregistrés" cleanup = "Nettoyer" cleanup_tooltip = "Supprimer les mots de remplissage et raccourcir les pauses" delete_matches = "Tout supprimer" delete_matches_tooltip = "Couper chaque résultat de la vidéo" +download_captions = "Télécharger les sous-titres" +download_srt = "SubRip (.srt)" +download_vtt = "WebVTT (.vtt)" +edit_hint = "Entrée pour enregistrer, Échap pour annuler, Tab pour le mot suivant" empty_description = "Transcrivez cet enregistrement sur cet ordinateur, puis modifiez la vidéo en modifiant son texte." empty_title = "Pas encore de transcription" -hint = "Cliquez sur un mot pour y aller. Sélectionnez des mots et appuyez sur la touche Supprimer pour les couper de la vidéo." +hint = "Cliquez sur un mot pour y aller, double-cliquez pour le corriger. Sélectionnez des mots et appuyez sur la touche Supprimer pour les couper de la vidéo." next_match = "Résultat suivant" no_audio = "Cet enregistrement n'a pas d'audio à transcrire." no_speech = "Aucune parole trouvée dans cet enregistrement" @@ -2967,6 +3116,7 @@ audio_segment_changed = "Ce segment audio a changé. Sélectionnez-le et choisis crop = "Recadrer" crop_tooltip = "Recadrer la vidéo" no_room_for_3d_shot = "Plus de place pour un autre plan 3D" +no_room_for_caption = "Pas de place pour un autre sous-titre ici" redo = "Rétablir" save_failed = "Impossible d'enregistrer {path}. Gardez l'éditeur ouvert et réessayez : {error}" undo = "Annuler" @@ -3144,7 +3294,11 @@ wipe_down = "Volet vers le bas" zoom = "Zoom" [editor.window.transport] +compare = "Comparer" +compare_tooltip = "Maintenez pour voir l'original" done_splitting = "Terminer la découpe" +enhance = "Améliorer" +enhance_tooltip = "Afficher l'image en pause améliorée" play_pause = "Lire/mettre en pause la vidéo" speed = "Vitesse de l'aperçu" split = "Couper" @@ -3204,6 +3358,13 @@ quit_anyway = "Quitter quand même" still_open = "Cap est toujours ouvert" unconfirmed = "Fermeture annulée, car l'arrêt de l'enregistrement n'a pas pu être confirmé. Cap reste ouvert. Utilisez Arrêter, puis quittez à nouveau." +[dialog.startup] +failed = "{error}\n\nLes détails ont été enregistrés dans {folder}." +failed_title = "Cap n'a pas pu démarrer" +quit_and_reopen = "Quitter et rouvrir" +unresponsive = "Cap est déjà ouvert mais ne répond pas. Quitter cette instance et rouvrir Cap ?" +unresponsive_title = "Cap ne répond pas" + [dialog.update] already_getting = "Cap prépare déjà la version {version}." available = "La version {version} de Cap est disponible. Cap la télécharge en arrière-plan et vous prévient quand elle est prête à être installée." @@ -3278,6 +3439,7 @@ changed_after = "L'enregistrement local a changé après l'envoi ; il a été co already_queued = "Cet enregistrement est déjà en attente d'envoi" paused = "Envoi en pause ; l'enregistrement local est conservé" worker_failed = "Le processus d'envoi a échoué ; l'enregistrement local est conservé" +deleted_on_web = "Cet enregistrement a été supprimé sur le web ; l'enregistrement local est conservé" empty = "L'enregistrement sauvegardé est vide" no_resumable_state = "Cet enregistrement n'a pas d'envoi pouvant reprendre" verification_failed = "La vérification de l'enregistrement a échoué : {status}" diff --git a/apps/desktop-gpui/locales/hi.toml b/apps/desktop-gpui/locales/hi.toml index 319ed6675bb..539cb62f991 100644 --- a/apps/desktop-gpui/locales/hi.toml +++ b/apps/desktop-gpui/locales/hi.toml @@ -206,6 +206,10 @@ fps_30 = "30 FPS" fps_60 = "60 FPS (सुझाया गया)" label = "अधिकतम कैप्चर फ़्रेम रेट" +[settings.general.recording.keep_drawings] +description = "ड्रॉइंग तब तक रहती हैं जब तक आप उन्हें मिटा न दें। बंद होने पर, हर ड्रॉइंग बनाने के कुछ सेकंड बाद धुंधली हो जाती है।" +label = "ड्रॉइंग स्क्रीन पर रखें" + [settings.general.recording.marker_sound] description = "Studio रिकॉर्डिंग के दौरान मार्कर जोड़ने पर एक छोटी आवाज़ चलाता है। आपका माइक्रोफ़ोन या सिस्टम ऑडियो इसे रिकॉर्ड कर सकता है।" label = "मार्कर के लिए आवाज़ चलाएँ" @@ -300,6 +304,7 @@ open_link = "लिंक खोलें" retry_upload = "फिर से अपलोड करें" show_all = "सभी दिखाएँ" title = "रिकॉर्डिंग" +save_audio = "ऑडियो सेव करें" [settings.recordings.empty] all = "कोई रिकॉर्डिंग नहीं" @@ -367,7 +372,7 @@ screen_region = "स्क्रीन क्षेत्र" [settings.options.post_studio] do_nothing = "कुछ न करें" open_editor = "एडिटर खोलें" -show_cap = "Cap दिखाएँ" +show_overlay = "ओवरले में दिखाएँ" [settings.options.post_screenshot] copy = "क्लिपबोर्ड पर कॉपी करें" @@ -390,16 +395,19 @@ cancelling_description = "शॉर्टकट या Cap आइकन से cancelling_title = "रद्द करना" closing_editor_description = "स्क्रीनशॉट एडिटर और वीडियो एडिटर के लिए।" closing_editor_title = "एडिटर बंद करना" +conflict = "“{shortcut}” पहले से इसे इस्तेमाल कर रहा है।" needs_modifier_macos = "⌘, ⌃ या ⌥ शामिल करें ताकि शॉर्टकट टाइपिंग में बाधा न बने।" needs_modifier_other = "Ctrl, Alt या Win शामिल करें ताकि शॉर्टकट टाइपिंग में बाधा न बने।" -record_shortcut = "शॉर्टकट सेट करें" +not_set = "सेट नहीं है" recording_description = "पहले Cap खोले बिना रिकॉर्डिंग शुरू करें।" recording_hint = "जिन कीज़ का इस्तेमाल करना है उन्हें दबाएँ। Esc रद्द करता है, Delete इसे हटाता है।" recording_title = "रिकॉर्डिंग" +replace = "बदलें" saved = "सेव हो गया। किसी भी ऐप में {keys} दबाएँ और {effect}।" saved_moved = "सेव हो गया। किसी भी ऐप में {keys} दबाएँ और {effect}। “{shortcut}” से हटा दिया गया।" screenshots_description = "शॉर्टकट किसी भी ऐप में काम करते हैं। बदलने के लिए किसी पर क्लिक करें।" screenshots_title = "स्क्रीनशॉट" +shared = "“{shortcut}” जैसी ही कुंजियाँ, इसलिए दोनों चलेंगे।" type_shortcut = "शॉर्टकट दबाएँ…" unavailable = "कोई दूसरा ऐप या सिस्टम पहले से यह शॉर्टकट इस्तेमाल कर रहा है। कोई दूसरा चुनने के लिए क्लिक करें।" unsupported_key = "यह कुंजी शॉर्टकट में इस्तेमाल नहीं हो सकती। कोई अक्षर, संख्या या F-कुंजी आज़माएँ।" @@ -451,8 +459,8 @@ screenshot_open_editor_hint = "पहले एनोटेट करें" studio_do_nothing = "कुछ न करें" studio_open_editor = "एडिटर खोलें" studio_open_editor_hint = "तुरंत एडिट करें" -studio_show_cap = "Cap दिखाएँ" -studio_show_cap_hint = "रिकॉर्डर पर वापस" +studio_show_overlay = "ओवरले दिखाएँ" +studio_show_overlay_hint = "कॉपी, शेयर या एक्सपोर्ट" [settings.shortcuts.label] add_marker = "मार्कर जोड़ें" @@ -468,8 +476,10 @@ screenshot_area = "क्षेत्र का स्क्रीनशॉट screenshot_display = "डिस्प्ले का स्क्रीनशॉट लें" screenshot_window = "विंडो का स्क्रीनशॉट लें" start_instant = "Instant रिकॉर्डिंग शुरू करें" +start_selected = "चुने गए मोड में शुरू करें" start_studio = "Studio रिकॉर्डिंग शुरू करें" stop = "रिकॉर्डिंग रोकें" +toggle_drawing = "स्क्रीन पर ड्रॉ करें" [settings.shortcuts.effect] add_marker = "Studio रिकॉर्डिंग में इस पल को मार्क करें" @@ -479,13 +489,10 @@ instant_copy_and_open = "चुनी गई स्क्रीन या वि open_picker = "Cap खोलकर चुनें कि क्या रिकॉर्ड करना है" pause = "मौजूदा रिकॉर्डिंग पॉज़ करें या फिर से शुरू करें" picker_area_instant = "क्षेत्र चुनकर उसे Instant मोड में रिकॉर्ड करें" -picker_area_screenshot = "क्षेत्र चुनकर उसका स्क्रीनशॉट लें" picker_area_studio = "क्षेत्र चुनकर उसे Studio मोड में रिकॉर्ड करें" picker_display_instant = "डिस्प्ले चुनकर उसे Instant मोड में रिकॉर्ड करें" -picker_display_screenshot = "डिस्प्ले चुनकर उसका स्क्रीनशॉट लें" picker_display_studio = "डिस्प्ले चुनकर उसे Studio मोड में रिकॉर्ड करें" picker_window_instant = "विंडो चुनकर उसे Instant मोड में रिकॉर्ड करें" -picker_window_screenshot = "विंडो चुनकर उसका स्क्रीनशॉट लें" picker_window_studio = "विंडो चुनकर उसे Studio मोड में रिकॉर्ड करें" restart = "मौजूदा टेक हटाकर फिर से शुरू करें" screenshot_area_copy = "क्षेत्र चुनकर स्क्रीनशॉट को क्लिपबोर्ड पर कॉपी करें" @@ -500,9 +507,11 @@ screenshot_window_copy = "पॉइंटर के नीचे की वि screenshot_window_copy_and_open_editor = "पॉइंटर के नीचे की विंडो कैप्चर करके स्क्रीनशॉट कॉपी करें और एडिटर खोलें" screenshot_window_open_editor = "पॉइंटर के नीचे की विंडो कैप्चर करके स्क्रीनशॉट को एडिटर में खोलें" screenshot_window_save = "पॉइंटर के नीचे की विंडो कैप्चर करके कुछ खोले बिना स्क्रीनशॉट को अपनी लाइब्रेरी में सेव करें" +start_selected = "Cap में चुने गए मोड में रिकॉर्डिंग या स्क्रीनशॉट शुरू करें" stop = "मौजूदा रिकॉर्डिंग रोकें" studio = "चुनी गई स्क्रीन या विंडो को Studio मोड में रिकॉर्ड करें" studio_open_editor = "चुनी गई स्क्रीन या विंडो को Studio मोड में रिकॉर्ड करें, फिर रोकने पर एडिटर खोलें" +toggle_drawing = "रिकॉर्डिंग के दौरान स्क्रीन पर ड्रॉ करना शुरू या बंद करें" [settings.shortcuts.sentence] add_marker = "Studio रिकॉर्डिंग में इस पल को मार्क करें।" @@ -512,13 +521,10 @@ instant_copy_and_open = "चुनी गई स्क्रीन या वि open_picker = "Cap खोलकर चुनें कि क्या रिकॉर्ड करना है।" pause = "मौजूदा रिकॉर्डिंग पॉज़ करें या फिर से शुरू करें।" picker_area_instant = "क्षेत्र चुनकर उसे Instant मोड में रिकॉर्ड करें।" -picker_area_screenshot = "क्षेत्र चुनकर उसका स्क्रीनशॉट लें।" picker_area_studio = "क्षेत्र चुनकर उसे Studio मोड में रिकॉर्ड करें।" picker_display_instant = "डिस्प्ले चुनकर उसे Instant मोड में रिकॉर्ड करें।" -picker_display_screenshot = "डिस्प्ले चुनकर उसका स्क्रीनशॉट लें।" picker_display_studio = "डिस्प्ले चुनकर उसे Studio मोड में रिकॉर्ड करें।" picker_window_instant = "विंडो चुनकर उसे Instant मोड में रिकॉर्ड करें।" -picker_window_screenshot = "विंडो चुनकर उसका स्क्रीनशॉट लें।" picker_window_studio = "विंडो चुनकर उसे Studio मोड में रिकॉर्ड करें।" restart = "मौजूदा टेक हटाकर फिर से शुरू करें।" screenshot_area_copy = "क्षेत्र चुनकर स्क्रीनशॉट को क्लिपबोर्ड पर कॉपी करें।" @@ -533,9 +539,11 @@ screenshot_window_copy = "पॉइंटर के नीचे की वि screenshot_window_copy_and_open_editor = "पॉइंटर के नीचे की विंडो कैप्चर करके स्क्रीनशॉट कॉपी करें और एडिटर खोलें।" screenshot_window_open_editor = "पॉइंटर के नीचे की विंडो कैप्चर करके स्क्रीनशॉट को एडिटर में खोलें।" screenshot_window_save = "पॉइंटर के नीचे की विंडो कैप्चर करके कुछ खोले बिना स्क्रीनशॉट को अपनी लाइब्रेरी में सेव करें।" +start_selected = "Cap में चुने गए मोड में रिकॉर्डिंग या स्क्रीनशॉट शुरू करें।" stop = "मौजूदा रिकॉर्डिंग रोकें।" studio = "चुनी गई स्क्रीन या विंडो को Studio मोड में रिकॉर्ड करें।" studio_open_editor = "चुनी गई स्क्रीन या विंडो को Studio मोड में रिकॉर्ड करें, फिर रोकने पर एडिटर खोलें।" +toggle_drawing = "रिकॉर्डिंग के दौरान स्क्रीन पर ड्रॉ करना शुरू या बंद करें।" [settings.cli] command = "कमांड" @@ -604,6 +612,9 @@ uploading = "अपलोड हो रहा है..." confirm_body = "Cap आपकी स्क्रीन पर चमकता पैटर्न दिखाएगा और हर पाइपलाइन के लिए लगभग {seconds} सेकंड तक तेज़ बीप बजाएगा। हेडफ़ोन उतार दें, आवाज़ सुनाई देने लायक रखें, और पूरा होने तक कंप्यूटर को न छुएँ।" confirm_title = "डायग्नोस्टिक चलाएँ?" description = "एक छोटा चमकता/बीप करता टेस्ट पैटर्न रिकॉर्ड करता है, मापता है कि तस्वीर और आवाज़ कितनी अलग हो जाती हैं, और आपके डिस्प्ले, कैमरा, माइक्रोफ़ोन, डिस्क स्पेस और रिकॉर्डिंग सेटिंग्स का स्नैपशॉट लेता है। जब तक आप भेजना न चुनें, कुछ भी कहीं नहीं भेजा जाता।" +duration_description = "लंबा टेस्ट धीरे-धीरे बढ़ने वाले अंतर को बेहतर पकड़ता है।" +duration_label = "टेस्ट की अवधि" +duration_option = "{seconds} सेकंड" mic_description = "आपका माइक्रोफ़ोन भी रिकॉर्ड करता है और जाँचता है कि वह बीप को सही समय पर सुनता है या नहीं। ऐसे स्पीकर चाहिए जिन्हें माइक सच में सुन सके।" mic_label = "माइक्रोफ़ोन टेस्ट करें" mode_description = "कौन-सी पाइपलाइन टेस्ट करनी है। दोनों चुनने पर पहले Studio और फिर Instant हिस्सा चलता है।" @@ -644,6 +655,8 @@ activating = "सक्रिय हो रहा है..." active_title = "डेस्कटॉप लाइसेंस" checking = "जाँच हो रही है…" deactivate = "लाइसेंस निष्क्रिय करें" +deactivate_failed = "आपका लाइसेंस निष्क्रिय नहीं हो सका। अपना कनेक्शन जाँचें और फिर से कोशिश करें।" +deactivating = "निष्क्रिय हो रहा है..." description = "आपका Cap प्लान और डेस्कटॉप लाइसेंस, एक ही जगह।" desktop_description = "आपका डेस्कटॉप लाइसेंस कमर्शियल रिकॉर्डिंग और एडिटिंग को कवर करता है। Cap Pro इसमें क्लाउड शेयरिंग और कोलैबोरेशन फ़ीचर जोड़ता है।" desktop_name = "डेस्कटॉप लाइसेंस" @@ -740,17 +753,22 @@ working_for = "{email} के लिए Google Drive कनेक्शन क [settings.automations] action_no_effect = "चुने गए ट्रिगर के लिए इस कार्रवाई का कोई असर नहीं होता।" +action_unsupported = "Cap अभी यह कार्रवाई नहीं चलाता, इसलिए इसे छोड़ दिया जाता है।" add_action = "कार्रवाई जोड़ें" add_condition = "शर्त जोड़ें" auto_name_empty = "{trigger} ऑटोमेशन" browse = "ब्राउज़ करें" check_compatibility = "कम्पैटिबिलिटी जाँचें" -compatibility_checked = "कम्पैटिबिलिटी जाँची गई: यह ऑटोमेशन अभी Cap में नहीं चलता। सेव किए गए नियम Cap CLI के लिए उपलब्ध रहते हैं। कोई कार्रवाई नहीं चलाई गई।" +compatibility_checked = "कम्पैटिबिलिटी जाँची गई: इस ऑटोमेशन की हर कार्रवाई Cap में चलती है। कोई कार्रवाई नहीं चलाई गई।" +compatibility_unsupported = "कम्पैटिबिलिटी जाँची गई: टेक्स्ट पहचान अभी Cap में नहीं चलती और छोड़ दी जाएगी। बाकी कार्रवाइयाँ चलती हैं। कोई कार्रवाई नहीं चलाई गई।" condition_never_matches = "चुने गए ट्रिगर के लिए यह शर्त कभी पूरी नहीं होती।" copy_link = "लिंक क्लिपबोर्ड पर कॉपी करें" -dangerous = "Cap CLI में यह ऑटोमेशन आपकी अनुमतियों से कमांड चलाता है या नेटवर्क अनुरोध भेजता है। सिर्फ़ भरोसेमंद वैल्यू इस्तेमाल करें।" +dangerous = "यह ऑटोमेशन आपकी अनुमतियों से कमांड चलाता है या नेटवर्क अनुरोध भेजता है। सिर्फ़ भरोसेमंद वैल्यू इस्तेमाल करें।" delete = "हटाएँ" -description = "नियम Cap CLI के साथ साझा होते हैं। Cap इन नियमों को सेव करता है, लेकिन अभी ऑटोमेशन नहीं चलाता।" +delete_guarded = "ऊपर वाला चरण सफल होने और उसकी फ़ाइल जाँचे जाने के बाद ही रिकॉर्डिंग हटाई जाती है, और इसके लिए एडिटर बंद रहता है। वरना सब कुछ रखा जाता है।" +delete_needs_copy = "कुछ भी नहीं हटाया जाएगा। इस चरण के ठीक ऊपर अपने चुने फ़ोल्डर में \"प्रोफ़ाइल के साथ एक्सपोर्ट करें\" या \"किसी जगह पर सेव करें\" रखें।" +notify_needs_setting = "यह तभी दिखता है जब सामान्य सेटिंग्स में सिस्टम नोटिफ़िकेशन चालू हों।" +description = "नियम Cap CLI के साथ साझा होते हैं। Cap चालू नियमों को अपने-आप चलाता है।" empty_description = "एक क्लिक में शुरू करने के लिए नीचे कोई टेम्पलेट चुनें, या शुरुआत से अपना बनाएँ।" empty_title = "अभी कोई ऑटोमेशन नहीं" enabled = "चालू" @@ -1027,6 +1045,7 @@ off = "बंद" on = "चालू" [main.error] +audio_only_needs_audio = "सिर्फ़ ऑडियो रिकॉर्डिंग के लिए कोई माइक्रोफ़ोन चुनें या सिस्टम ऑडियो चालू करें।" camera_only_needs_camera = "सिर्फ़ कैमरा रिकॉर्डिंग के लिए कोई कैमरा चुना होना ज़रूरी है।" copy = "त्रुटि कॉपी करें" devices_not_ready = "रिकॉर्डिंग डिवाइस तैयार नहीं हैं। रिकॉर्डर खोलें और फिर से कोशिश करें।" @@ -1136,6 +1155,7 @@ title = "स्टोरेज कम है" [main.target] area = "क्षेत्र" +audio_only = "सिर्फ़ ऑडियो" camera_only = "सिर्फ़ कैमरा" choose_display = "डिस्प्ले चुनें" choose_window = "विंडो चुनें" @@ -1147,6 +1167,35 @@ no_matching_windows = "कोई मिलती-जुलती विंडो no_windows = "कोई विंडो नहीं मिली" window = "विंडो" +[recordings_overlay] +close = "बंद करें" +copy = "क्लिपबोर्ड पर कॉपी करें" +copy_link = "शेयर करने लायक लिंक कॉपी करें" +create_link = "शेयर करने लायक लिंक बनाएँ" +edit = "एडिट करें" +export = "एक्सपोर्ट करें" +open = "खोलें" +retry = "फिर से कोशिश करें" + +[recordings_overlay.progress] +choose_image = "चुनें कि इमेज कहाँ सेव करनी है" +choose_video = "चुनें कि वीडियो कहाँ एक्सपोर्ट करना है" +copied = "क्लिपबोर्ड पर कॉपी हो गया" +copy_failed = "कॉपी नहीं हो सका" +copying = "क्लिपबोर्ड पर कॉपी हो रहा है" +creating_link = "शेयर करने लायक लिंक बन रहा है" +failed_hint = "कुछ गलत हो गया। फिर से कोशिश करें।" +link_copied = "शेयर करने लायक लिंक कॉपी हो गया" +preparing = "तैयारी हो रही है" +rendering_video = "वीडियो रेंडर हो रहा है" +save_failed = "सेव नहीं हो सका" +saved_image = "इमेज सेव हो गई" +saved_video = "वीडियो सेव हो गया" +saving_image = "इमेज सेव हो रही है" +saving_video = "वीडियो सेव हो रहा है" +share_failed = "लिंक नहीं बन सका" +share_failed_hint = "अपना कनेक्शन जाँचें और फिर से कोशिश करें।" + [controls] disk_full_resume = "फिर से शुरू करने के लिए डिस्क में जगह कम है। जगह खाली करके फिर कोशिश करें, या सहेजने के लिए रोकें दबाएँ।" low_storage = "स्टोरेज कम है। आपकी रिकॉर्डिंग सहेजने के लिए Cap जल्द ही रुक जाएगा।" @@ -1175,9 +1224,32 @@ resuming = "फिर शुरू…" saving = "सहेज रहा…" starting = "शुरू हो रहा" +[controls.disconnected] +camera = "कैमरा डिस्कनेक्ट हो गया। रिकॉर्डिंग कैमरा ओवरले के बिना जारी है।" +microphone = "माइक्रोफ़ोन डिस्कनेक्ट हो गया। दोबारा कनेक्ट होने तक साइलेंस रिकॉर्ड होगा।" + [controls.marker] add = "मार्कर जोड़ें" +[controls.draw] +arrow = "तीर, ⇧ से 45° पर सीधा" +clear = "सब मिटाएँ" +highlighter = "हाइलाइटर, सीधी रेखा के लिए ⇧" +pen = "पेन, सीधी रेखा के लिए ⇧" +rectangle = "आयत, वर्ग के लिए ⇧" +start = "स्क्रीन पर ड्रॉ करें" +stop = "ड्रॉ करना बंद करें" +undo = "पूर्ववत करें" +window_unavailable = "ड्रॉइंग डिस्प्ले और एरिया रिकॉर्डिंग में काम करती है" + +[controls.settings] +locked = "इस रिकॉर्डिंग में बदला नहीं जा सकता" +not_in_recording = "इस रिकॉर्डिंग में नहीं" +open = "रिकॉर्डिंग सेटिंग्स" +show_camera_preview = "कैमरा प्रीव्यू दिखाएँ" +switch_failed = "{device} पर स्विच नहीं हो सका। रिकॉर्डिंग जारी है।" +switching = "बदला जा रहा है…" + [camera] waiting_title = "कैमरा एक्सेस का इंतज़ार है" @@ -1192,6 +1264,8 @@ mirror_title = "मिरर उपलब्ध नहीं" [camera.issue] access_message = "सिस्टम सेटिंग्स में Cap को अपना कैमरा इस्तेमाल करने देने के लिए क्लिक करें।" access_title = "कैमरा एक्सेस ज़रूरी है" +disconnected_message = "चुने गए कैमरे से वीडियो आना बंद हो गया।" +disconnected_title = "कैमरा डिस्कनेक्ट हो गया" generic = "चुना गया कैमरा शुरू नहीं हो सका। कोई दूसरा कैमरा चुनें या इसे फिर से कनेक्ट करें।" invalid_format = "इस कैमरे ने कोई इस्तेमाल लायक कैप्चर फ़ॉर्मैट नहीं बताया।" not_found = "यह कैमरा अब उपलब्ध नहीं है। जाँचें कि यह कनेक्ट है और सिस्टम की अनुमतियों में इसकी अनुमति है।" @@ -1405,6 +1479,8 @@ devices_changed_before_start = "रिकॉर्डिंग शुरू ह shortcut_conflict = "Ctrl+Shift+F9 किसी दूसरे Cap एक्शन को दिया गया है। रिकॉर्ड करने से पहले वह शॉर्टकट बदलें।" shortcut_description = "यह Cap रिकॉर्डिंग शुरू करें या रोकें" shortcut_hint = "शुरू करने के लिए {shortcut} दबाकर छोड़ें। रोकने के लिए वही शॉर्टकट इस्तेमाल करें। यह अस्थायी शॉर्टकट आपकी सेटिंग्स नहीं बदलता।" +source_lost = "Cap ने रिकॉर्डिंग रोक दी, क्योंकि जो कैप्चर हो रहा था वह अब उपलब्ध नहीं है, जैसे डिस्प्ले स्लीप में चला गया या विंडो बंद हो गई। तब तक की पूरी रिकॉर्डिंग सेव कर ली गई है।" +source_lost_title = "रिकॉर्डिंग रुक गई" tray_stop_hint = "शुरू करने के लिए Cap Stop ट्रे आइकन सक्रिय करें। रोकने के लिए वही आइकन फिर से सक्रिय करें। जब तक आप उस कंट्रोल का इस्तेमाल नहीं करते, रिकॉर्डिंग शुरू नहीं होगी।" window_unavailable = "चुनी गई विंडो अब उपलब्ध नहीं है। इसे फिर से चुनें।" @@ -1462,12 +1538,14 @@ placeholder = "अपनी स्क्रिप्ट पेस्ट कर words_per_minute = "{wpm} शब्द/मिनट" [import] +audio_failed = "ऑडियो इंपोर्ट नहीं हो सका: {error}" error_title = "इम्पोर्ट त्रुटि" image_failed = "इमेज इम्पोर्ट नहीं हो सकी: {error}" unsupported = "यह मीडिया फ़ाइल समर्थित नहीं है।" video_failed = "वीडियो इम्पोर्ट नहीं हो सका: {error}" [import.filter] +audio = "ऑडियो फ़ाइलें" image = "इमेज फ़ाइलें" media = "मीडिया फ़ाइलें" video = "वीडियो फ़ाइलें" @@ -1510,6 +1588,13 @@ unlock_body = "क्षेत्र को फिर से खिसकान locked_title = "क्षेत्र लॉक है" locked_body = "अनलॉक करने के लिए क्लिक करें, ताकि इसे खिसकाया, इसका साइज़ बदला या फिर से बनाया जा सके।" +[overlay.audio_only] +choose_source = "कोई माइक्रोफ़ोन चुनें या सिस्टम ऑडियो चालू करें" +description = "स्क्रीन या कैमरा के बिना अपना माइक्रोफ़ोन और कंप्यूटर की आवाज़ रिकॉर्ड करें" +meter_hint = "लेवल जांचने के लिए कुछ बोलें" +system_audio = "सिस्टम ऑडियो" +system_audio_only = "सिर्फ़ सिस्टम ऑडियो रिकॉर्ड होगा" + [overlay.camera_only] description = "सिर्फ़ अपने कैमरा और माइक्रोफ़ोन से रिकॉर्ड करें" select_camera = "कृपया एक कैमरा चुनें" @@ -1768,6 +1853,20 @@ change_title = "ऑडियो बदलें" done = "हो गया" import = "फ़ाइल इम्पोर्ट करें" +[editor.audio_only] +add_visuals = "विज़ुअल जोड़ें" +body = "इस रिकॉर्डिंग में वीडियो नहीं है। आवाज़ को MP3 या WAV के रूप में एक्सपोर्ट करें, या इसे वीडियो बनाने के लिए विज़ुअल जोड़ें।" +export_audio = "ऑडियो एक्सपोर्ट करें" +show_visuals = "विज़ुअल दिखाएं" +size_large = "बड़ा" +size_medium = "मध्यम" +size_small = "छोटा" +style_bars = "बार" +style_circle = "गोला" +style_wave = "वेव" +title = "सिर्फ़ ऑडियो" +visuals = "विज़ुअल" + [editor.color] apply_to_cursor = "कर्सर पर लागू करें" fine_tune = "रंग बारीकी से सेट करें" @@ -2182,6 +2281,7 @@ manual_help = "मैनुअल ज़ूम नीचे चुनी गई mixed = "मिश्रित" mode = "ज़ूम मोड" positions_mixed = "सेगमेंट अलग-अलग जगहों पर ज़ूम करते हैं। सभी को एक ही जगह ले जाने के लिए ड्रैग करें।" +start_early = "ज़ूम पहले शुरू करें" title = "ज़ूम {number}" [editor.side_panel] @@ -2286,6 +2386,7 @@ background_blur = "बैकग्राउंड ब्लर" custom_position = "कस्टम स्क्रीन पोज़िशन (कैनवास पर ड्रैग की गई)" motion_blur = "मोशन ब्लर" padding = "पैडिंग" +padding_style = "पैडिंग शैली" rounded_corners = "गोल कोने" title = "लेआउट" @@ -2364,11 +2465,13 @@ mp4_filter = "MP4 वीडियो" prepare_controls_failed = "रिकॉर्डिंग कंट्रोल तैयार नहीं हो सके: {error}" record = "रिकॉर्ड करें" record_new = "नई क्लिप रिकॉर्ड करें" +removed_media = "{name} (हटाई गई क्लिप)" save_before_recording_failed = "रिकॉर्डिंग से पहले मौजूदा प्रोजेक्ट सेव नहीं हो सका: {error}" split = "हिस्सा {number}" title = "क्लिप" [editor.clips.error] +audio_only_mix = "सिर्फ़ ऑडियो रिकॉर्डिंग और वीडियो क्लिप एक प्रोजेक्ट में नहीं जोड़ी जा सकतीं" cancelled = "इम्पोर्ट रद्द किया गया" cannot_decode = "वीडियो {path} डिकोड नहीं हो सका: {error}" in_use = "यह रिकॉर्डिंग उपयोग में होने पर इम्पोर्ट नहीं हो सकता: {error}" @@ -2409,6 +2512,15 @@ upgrade_message = "इस फ़ीचर के लिए अपग्रेड upgrade_title = "अपग्रेड ज़रूरी है" upload_failed = "रिकॉर्डिंग अपलोड नहीं हो सकी" +[editor.export.audio] +cta = "ऑडियो एक्सपोर्ट करें" +exported = "ऑडियो एक्सपोर्ट हो गया" +exporting = "ऑडियो एक्सपोर्ट हो रहा है" +file_type = "फ़ाइल का प्रकार" +format = "ऑडियो" +mp3_description = "छोटी फ़ाइल, हर जगह चलती है। 192 kb/s स्टीरियो।" +wav_description = "लॉसलेस 16-बिट, 48 kHz। आगे एडिट करने के लिए सबसे अच्छा।" + [editor.export.advanced] bits_per_pixel = "बिट्स प्रति पिक्सल" cursor_only = "केवल कर्सर एक्सपोर्ट करें" @@ -2442,6 +2554,10 @@ retry_copy = "फिर से कॉपी करें" reuploaded = "आपका नया संपादन उसी लिंक पर तैयार है" uploaded = "आपका Cap सफलतापूर्वक अपलोड हो गया" +[editor.export.enhance] +description = "रिकॉर्डिंग ज़ूम इन या छोटी होने पर टेक्स्ट और बारीक विवरण को शार्प करता है। एक्सपोर्ट में अधिक समय लग सकता है।" +title = "क्वालिटी बेहतर करें" + [editor.export.estimate] gigabytes = "~{value} GB" gigabytes_range = "~{lower}–{upper} GB" @@ -2496,6 +2612,7 @@ format = "फ़ॉर्मैट" frame_rate = "फ़्रेम रेट" quality = "क्वालिटी" resolution = "रेज़ोल्यूशन" +tracks = "ट्रैक" [editor.export.stats] calculating = "गणना हो रही है…" @@ -2508,6 +2625,25 @@ refining_size = "साइज़ सटीक किया जा रहा ह refining_time = "समय सटीक किया जा रहा है…" unavailable = "उपलब्ध नहीं" +[editor.export.tracks] +aligned = "ट्रैक आपके कट और स्पीड के हिसाब से चलते हैं, इसलिए किसी भी वीडियो एडिटर में एक साथ मेल खाते हैं। वीडियो बिना बैकग्राउंड या इफ़ेक्ट के साफ़ निकलता है।" +audio_detail = "WAV · 48 kHz" +camera = "कैमरा" +choose_one = "एक्सपोर्ट करने के लिए कम से कम एक ट्रैक चुनें।" +cta = "ट्रैक एक्सपोर्ट करें" +exported = "ट्रैक एक्सपोर्ट हो गए" +exporting = "ट्रैक एक्सपोर्ट हो रहे हैं" +file_count = { one = "{count} फ़ाइल", other = "{count} फ़ाइलें" } +file_only = "ट्रैक एक फ़ोल्डर में अलग-अलग फ़ाइलों के रूप में सेव होते हैं।" +files = "फ़ाइलें" +format = "ट्रैक" +microphone = "माइक्रोफ़ोन" +open_folder = "फ़ोल्डर खोलें" +screen = "स्क्रीन" +studio_only = "अलग-अलग ट्रैक सिर्फ़ Studio मोड में रिकॉर्ड होते हैं।" +system_audio = "सिस्टम ऑडियो" +video_detail = "MP4 · {width}×{height}" + [editor.export.turbo] title = "टर्बो एक्सपोर्ट" description = "हर CPU कोर और GPU का इस्तेमाल करके कहीं तेज़ी से एक्सपोर्ट करता है" @@ -2633,6 +2769,7 @@ model_downloaded = "{model} मॉडल डाउनलोड हो गया" model_label = "मॉडल" model_updated = "सुझाया गया मॉडल अपडेट हुआ" model_updated_description = "हम नया वर्ज़न इस्तेमाल करने की सलाह देते हैं। यह ज़्यादा सटीक है और उन छोटी रिकॉर्डिंग को भी पकड़ता है जो पुराने वर्ज़न से छूट जाती थीं।" +new_caption = "नया कैप्शन" position = "पोज़िशन" refining_word_timings = "शब्दों का समय सुधारा जा रहा है…" regenerate = "कैप्शन दोबारा बनाएँ" @@ -2709,6 +2846,7 @@ rounded = "गोल" squircle = "स्क्वर्कल" [editor.tabs.cursor] +follow_hover = "होवर हाइलाइट का अनुसरण करें" friction = "घर्षण" hide_when_idle = "निष्क्रिय होने पर छिपाएँ" inactivity_delay = "निष्क्रियता देरी" @@ -2763,6 +2901,10 @@ timeline_unreadable = "प्रोजेक्ट टाइमलाइन प title = "कीबोर्ड दिखाएँ" uppercase = "बड़े अक्षर" +[editor.tabs.padding] +even = "समान" +proportional = "आनुपातिक" + [editor.tabs.position] bottom_center = "नीचे बीच में" bottom_left = "नीचे बाएँ" @@ -2908,13 +3050,20 @@ video = "वीडियो" zoom = "ज़ूम" [editor.transcript] +add_caption = "प्लेहेड पर कैप्शन जोड़ें" +captions_save_failed = "कैप्शन सेव नहीं हो सके: {error}" +captions_saved = "कैप्शन सेव हो गए" cleanup = "साफ़ करें" cleanup_tooltip = "फ़िलर शब्द हटाएँ और ठहराव छोटे करें" delete_matches = "सभी हटाएँ" delete_matches_tooltip = "हर मिलान को वीडियो से काटें" +download_captions = "कैप्शन डाउनलोड करें" +download_srt = "SubRip (.srt)" +download_vtt = "WebVTT (.vtt)" +edit_hint = "सेव करने के लिए Enter, रद्द करने के लिए Esc, अगले शब्द के लिए Tab" empty_description = "इस कंप्यूटर पर इस रिकॉर्डिंग को ट्रांसक्राइब करें, फिर उसका टेक्स्ट बदलकर वीडियो एडिट करें।" empty_title = "अभी कोई ट्रांसक्रिप्ट नहीं" -hint = "किसी शब्द पर जाने के लिए उस पर क्लिक करें। शब्द चुनें और डिलीट कुंजी दबाएँ, वे वीडियो से कट जाएँगे।" +hint = "किसी शब्द पर जाने के लिए उस पर क्लिक करें, उसे ठीक करने के लिए डबल-क्लिक करें। शब्द चुनें और डिलीट कुंजी दबाएँ, वे वीडियो से कट जाएँगे।" next_match = "अगला मिलान" no_audio = "इस रिकॉर्डिंग में ट्रांसक्राइब करने के लिए कोई ऑडियो नहीं है।" no_speech = "इस रिकॉर्डिंग में कोई बोली नहीं मिली" @@ -2967,6 +3116,7 @@ audio_segment_changed = "यह ऑडियो सेगमेंट बदल crop = "क्रॉप" crop_tooltip = "वीडियो क्रॉप करें" no_room_for_3d_shot = "एक और 3D शॉट के लिए जगह नहीं है" +no_room_for_caption = "यहाँ एक और कैप्शन के लिए जगह नहीं है" redo = "फिर करें" save_failed = "{path} सेव नहीं हो सका। एडिटर खुला रखें और फिर से कोशिश करें: {error}" undo = "पहले जैसा करें" @@ -3144,7 +3294,11 @@ wipe_down = "नीचे वाइप" zoom = "ज़ूम" [editor.window.transport] +compare = "तुलना करें" +compare_tooltip = "मूल देखने के लिए दबाकर रखें" done_splitting = "विभाजन पूरा" +enhance = "बेहतर करें" +enhance_tooltip = "रुके हुए फ़्रेम को बेहतर रूप में दिखाएँ" play_pause = "वीडियो चलाएँ/रोकें" speed = "प्रीव्यू की स्पीड" split = "विभाजित करें" @@ -3204,6 +3358,13 @@ quit_anyway = "फिर भी बंद करें" still_open = "Cap अभी भी खुला है" unconfirmed = "रिकॉर्डिंग बंद होने की पुष्टि नहीं हो सकी, इसलिए बाहर निकलना रद्द किया गया। Cap खुला रहेगा। रोकें का इस्तेमाल करें, फिर दोबारा बाहर निकलने की कोशिश करें।" +[dialog.startup] +failed = "{error}\n\nविवरण {folder} में सहेजे गए हैं।" +failed_title = "Cap शुरू नहीं हो सका" +quit_and_reopen = "बंद करें और फिर से खोलें" +unresponsive = "Cap पहले से चल रहा है लेकिन जवाब नहीं दे रहा है। उसे बंद करके Cap फिर से खोलें?" +unresponsive_title = "Cap जवाब नहीं दे रहा है" + [dialog.update] already_getting = "Cap पहले से ही वर्ज़न {version} तैयार कर रहा है।" available = "Cap का वर्ज़न {version} उपलब्ध है। Cap इसे बैकग्राउंड में डाउनलोड करेगा और इंस्टॉल के लिए तैयार होने पर आपको बताएगा।" @@ -3278,6 +3439,7 @@ changed_after = "अपलोड के बाद लोकल रिकॉर already_queued = "यह रिकॉर्डिंग पहले से अपलोड की कतार में है" paused = "अपलोड रुका हुआ है; लोकल रिकॉर्डिंग सुरक्षित है" worker_failed = "अपलोड प्रक्रिया विफल हुई; लोकल रिकॉर्डिंग सुरक्षित है" +deleted_on_web = "यह रिकॉर्डिंग वेब पर हटा दी गई; लोकल रिकॉर्डिंग सुरक्षित है" empty = "सेव की गई रिकॉर्डिंग खाली है" no_resumable_state = "इस रिकॉर्डिंग का कोई ऐसा अपलोड नहीं है जिसे फिर से शुरू किया जा सके" verification_failed = "रिकॉर्डिंग की जाँच विफल हुई: {status}" diff --git a/apps/desktop-gpui/locales/ja.toml b/apps/desktop-gpui/locales/ja.toml index d007debfd05..22a68894023 100644 --- a/apps/desktop-gpui/locales/ja.toml +++ b/apps/desktop-gpui/locales/ja.toml @@ -206,6 +206,10 @@ fps_30 = "30 FPS" fps_60 = "60 FPS(推奨)" label = "最大キャプチャフレームレート" +[settings.general.recording.keep_drawings] +description = "描画は消去するまで残ります。オフにすると、描いてから数秒で消えます。" +label = "描画を画面に残す" + [settings.general.recording.marker_sound] description = "Studio録画中にマーカーを追加すると短い音を鳴らします。マイクやシステムオーディオに録音される場合があります。" label = "マーカー追加時に音を鳴らす" @@ -300,6 +304,7 @@ open_link = "リンクを開く" retry_upload = "アップロードを再試行" show_all = "すべて表示" title = "録画" +save_audio = "音声を保存" [settings.recordings.empty] all = "録画はありません" @@ -367,7 +372,7 @@ screen_region = "画面の範囲" [settings.options.post_studio] do_nothing = "何もしない" open_editor = "エディタを開く" -show_cap = "Capを表示" +show_overlay = "オーバーレイで表示" [settings.options.post_screenshot] copy = "クリップボードにコピー" @@ -390,16 +395,19 @@ cancelling_description = "ショートカットまたはCapのアイコンから cancelling_title = "キャンセル" closing_editor_description = "スクリーンショットエディタと動画エディタに適用されます。" closing_editor_title = "エディタを閉じる" +conflict = "「{shortcut}」ですでに使用されています。" needs_modifier_macos = "入力の邪魔にならないよう、⌘、⌃、⌥のいずれかを含めてください。" needs_modifier_other = "入力の邪魔にならないよう、Ctrl、Alt、Winのいずれかを含めてください。" -record_shortcut = "ショートカットを記録" +not_set = "未設定" recording_description = "Capを開かずに録画を開始できます。" recording_hint = "使いたいキーを押してください。Escでキャンセル、Deleteで削除します。" recording_title = "録画" +replace = "置き換える" saved = "保存しました。どのアプリでも{keys}を押すと{effect}。" saved_moved = "保存しました。どのアプリでも{keys}を押すと{effect}。「{shortcut}」からは削除しました。" screenshots_description = "ショートカットはどのアプリからでも使えます。クリックすると変更できます。" screenshots_title = "スクリーンショット" +shared = "「{shortcut}」と同じキーのため、両方が実行されます。" type_shortcut = "ショートカットを入力…" unavailable = "このショートカットは別のアプリまたはシステムがすでに使用しています。クリックして別のものを選んでください。" unsupported_key = "このキーはショートカットに使えません。文字、数字、ファンクションキーを試してください。" @@ -451,8 +459,8 @@ screenshot_open_editor_hint = "先に注釈を付ける" studio_do_nothing = "何もしない" studio_open_editor = "エディタを開く" studio_open_editor_hint = "すぐに編集" -studio_show_cap = "Capを表示" -studio_show_cap_hint = "レコーダーに戻る" +studio_show_overlay = "オーバーレイを表示" +studio_show_overlay_hint = "コピー、共有、書き出し" [settings.shortcuts.label] add_marker = "マーカーを追加" @@ -468,8 +476,10 @@ screenshot_area = "範囲のスクリーンショット" screenshot_display = "ディスプレイのスクリーンショット" screenshot_window = "ウィンドウのスクリーンショット" start_instant = "Instant録画を開始" +start_selected = "選択中のモードで開始" start_studio = "Studio録画を開始" stop = "録画を停止" +toggle_drawing = "画面に描く" [settings.shortcuts.effect] add_marker = "Studio録画のこの瞬間にマーカーを付けます" @@ -479,13 +489,10 @@ instant_copy_and_open = "選択した画面またはウィンドウをInstantモ open_picker = "Capを開いて録画する対象を選びます" pause = "現在の録画を一時停止または再開します" picker_area_instant = "範囲を選択してInstantモードで録画します" -picker_area_screenshot = "範囲を選択してスクリーンショットを撮ります" picker_area_studio = "範囲を選択してStudioモードで録画します" picker_display_instant = "ディスプレイを選んでInstantモードで録画します" -picker_display_screenshot = "ディスプレイを選んでスクリーンショットを撮ります" picker_display_studio = "ディスプレイを選んでStudioモードで録画します" picker_window_instant = "ウィンドウを選んでInstantモードで録画します" -picker_window_screenshot = "ウィンドウを選んでスクリーンショットを撮ります" picker_window_studio = "ウィンドウを選んでStudioモードで録画します" restart = "現在のテイクを破棄してやり直します" screenshot_area_copy = "範囲を選択してクリップボードにコピーします" @@ -500,9 +507,11 @@ screenshot_window_copy = "ポインタの下のウィンドウをキャプチャ screenshot_window_copy_and_open_editor = "ポインタの下のウィンドウをキャプチャしてコピーし、エディタを開きます" screenshot_window_open_editor = "ポインタの下のウィンドウをキャプチャしてエディタで開きます" screenshot_window_save = "ポインタの下のウィンドウをキャプチャし、何も開かずにライブラリに保存します" +start_selected = "Capで選択中のモードで録画またはスクリーンショットを開始します" stop = "現在の録画を停止します" studio = "選択した画面またはウィンドウをStudioモードで録画します" studio_open_editor = "選択した画面またはウィンドウをStudioモードで録画し、停止するとエディタを開きます" +toggle_drawing = "録画中に画面への描画を開始または終了します" [settings.shortcuts.sentence] add_marker = "Studio録画のこの瞬間にマーカーを付けます。" @@ -512,13 +521,10 @@ instant_copy_and_open = "選択した画面またはウィンドウをInstantモ open_picker = "Capを開いて録画する対象を選びます。" pause = "現在の録画を一時停止または再開します。" picker_area_instant = "範囲を選択してInstantモードで録画します。" -picker_area_screenshot = "範囲を選択してスクリーンショットを撮ります。" picker_area_studio = "範囲を選択してStudioモードで録画します。" picker_display_instant = "ディスプレイを選んでInstantモードで録画します。" -picker_display_screenshot = "ディスプレイを選んでスクリーンショットを撮ります。" picker_display_studio = "ディスプレイを選んでStudioモードで録画します。" picker_window_instant = "ウィンドウを選んでInstantモードで録画します。" -picker_window_screenshot = "ウィンドウを選んでスクリーンショットを撮ります。" picker_window_studio = "ウィンドウを選んでStudioモードで録画します。" restart = "現在のテイクを破棄してやり直します。" screenshot_area_copy = "範囲を選択してクリップボードにコピーします。" @@ -533,9 +539,11 @@ screenshot_window_copy = "ポインタの下のウィンドウをキャプチャ screenshot_window_copy_and_open_editor = "ポインタの下のウィンドウをキャプチャしてコピーし、エディタを開きます。" screenshot_window_open_editor = "ポインタの下のウィンドウをキャプチャしてエディタで開きます。" screenshot_window_save = "ポインタの下のウィンドウをキャプチャし、何も開かずにライブラリに保存します。" +start_selected = "Capで選択中のモードで録画またはスクリーンショットを開始します。" stop = "現在の録画を停止します。" studio = "選択した画面またはウィンドウをStudioモードで録画します。" studio_open_editor = "選択した画面またはウィンドウをStudioモードで録画し、停止するとエディタを開きます。" +toggle_drawing = "録画中に画面への描画を開始または終了します。" [settings.cli] command = "コマンド" @@ -604,6 +612,9 @@ uploading = "アップロード中..." confirm_body = "Capは画面全体に点滅パターンを表示し、処理ごとに約{seconds}秒間大きなビープ音を鳴らします。ヘッドフォンを外し、音が聞こえる音量にして、終わるまでコンピュータに触れないでください。" confirm_title = "診断を実行しますか?" description = "点滅とビープ音の短いテストパターンを録画し、映像と音声のずれを測定して、ディスプレイ、カメラ、マイク、ディスク容量、録画設定の状態を記録します。送信を選ぶまで、何も送信されません。" +duration_description = "長く実行するほど、ゆっくりしたずれを検出しやすくなります。" +duration_label = "テスト時間" +duration_option = "{seconds}秒" mic_description = "マイクも録音し、ビープ音を正しいタイミングで拾えているか確認します。マイクに実際に聞こえるスピーカーが必要です。" mic_label = "マイクをテスト" mode_description = "テストする処理を選びます。「両方」を選ぶと、Studioモードの後にInstantモードを実行します。" @@ -644,6 +655,8 @@ activating = "有効化中..." active_title = "デスクトップライセンス" checking = "確認中…" deactivate = "ライセンスを無効化" +deactivate_failed = "ライセンスを無効化できませんでした。接続を確認して、もう一度お試しください。" +deactivating = "無効化中..." description = "Capのプランとデスクトップライセンスをまとめて確認できます。" desktop_description = "デスクトップライセンスで商用の録画と編集ができます。Cap Proではさらにクラウド共有とコラボレーション機能が使えます。" desktop_name = "デスクトップライセンス" @@ -740,17 +753,22 @@ working_for = "{email}のGoogle Drive接続は正常です" [settings.automations] action_no_effect = "このアクションは選択したトリガーでは効果がありません。" +action_unsupported = "このアクションはまだ Cap で実行されないため、スキップされます。" add_action = "アクションを追加" add_condition = "条件を追加" auto_name_empty = "{trigger}のオートメーション" browse = "参照" check_compatibility = "互換性を確認" -compatibility_checked = "互換性を確認しました:このオートメーションはまだCapでは実行されません。保存したルールはCap CLIで引き続き使えます。アクションは実行されていません。" +compatibility_checked = "互換性を確認しました:このオートメーションのすべてのアクションはCapで実行されます。アクションは実行されていません。" +compatibility_unsupported = "互換性を確認しました:テキスト認識はまだCapでは実行されないため、スキップされます。そのほかのアクションは実行されます。アクションは実行されていません。" condition_never_matches = "この条件は選択したトリガーでは一致しません。" copy_link = "リンクをクリップボードにコピー" -dangerous = "Cap CLIでは、このオートメーションはあなたの権限でコマンドを実行したりネットワークリクエストを送信したりします。信頼できる値だけを使ってください。" +dangerous = "このオートメーションはあなたの権限でコマンドを実行したりネットワークリクエストを送信したりします。信頼できる値だけを使ってください。" delete = "削除" -description = "ルールはCap CLIと共有されます。Capはこれらのルールを保存しますが、オートメーションはまだ実行しません。" +delete_guarded = "上のステップが成功し、そのファイルを確認できた場合にのみ録画を削除します。そのためエディターは開きません。それ以外はすべて残します。" +delete_needs_copy = "何も削除されません。このステップのすぐ上に、選んだフォルダーへの「プロファイルで書き出し」か「指定の場所に保存」を置いてください。" +notify_needs_setting = "一般設定でシステム通知がオンのときだけ表示されます。" +description = "ルールはCap CLIと共有されます。有効なルールはCapが自動で実行します。" empty_description = "下のテンプレートを選べばワンクリックで始められます。一から自分で作ることもできます。" empty_title = "オートメーションはまだありません" enabled = "有効" @@ -1027,6 +1045,7 @@ off = "オフ" on = "オン" [main.error] +audio_only_needs_audio = "音声のみの録音には、マイクを選択するかシステム音声をオンにする必要があります。" camera_only_needs_camera = "カメラのみの録画にはカメラを選択する必要があります。" copy = "エラーをコピー" devices_not_ready = "録画デバイスの準備ができていません。レコーダーを開いてもう一度お試しください。" @@ -1136,6 +1155,7 @@ title = "空き容量が不足しています" [main.target] area = "範囲" +audio_only = "音声のみ" camera_only = "カメラのみ" choose_display = "ディスプレイを選択" choose_window = "ウィンドウを選択" @@ -1147,6 +1167,35 @@ no_matching_windows = "一致するウィンドウはありません" no_windows = "ウィンドウが見つかりません" window = "ウィンドウ" +[recordings_overlay] +close = "閉じる" +copy = "クリップボードにコピー" +copy_link = "共有リンクをコピー" +create_link = "共有リンクを作成" +edit = "編集" +export = "書き出し" +open = "開く" +retry = "再試行" + +[recordings_overlay.progress] +choose_image = "画像の保存先を選択" +choose_video = "動画の書き出し先を選択" +copied = "クリップボードにコピーしました" +copy_failed = "コピーできませんでした" +copying = "クリップボードにコピー中" +creating_link = "共有リンクを作成中" +failed_hint = "問題が発生しました。もう一度お試しください。" +link_copied = "共有リンクをコピーしました" +preparing = "準備中" +rendering_video = "動画をレンダリング中" +save_failed = "保存できませんでした" +saved_image = "画像を保存しました" +saved_video = "動画を保存しました" +saving_image = "画像を保存中" +saving_video = "動画を保存中" +share_failed = "リンクを作成できませんでした" +share_failed_hint = "接続を確認して、もう一度お試しください。" + [controls] disk_full_resume = "再開するための空き容量が足りません。空きを確保してもう一度試すか、停止を押して保存してください。" low_storage = "空き容量が不足しています。録画を保存するため、Capはまもなく停止します。" @@ -1175,9 +1224,32 @@ resuming = "再開中…" saving = "保存中…" starting = "開始中" +[controls.disconnected] +camera = "カメラが切断されました。カメラのオーバーレイなしで録画を続けます。" +microphone = "マイクが切断されました。再接続されるまで無音で録音します。" + [controls.marker] add = "マーカーを追加" +[controls.draw] +arrow = "矢印、⇧で45°にスナップ" +clear = "すべて消去" +highlighter = "蛍光ペン、⇧で直線" +pen = "ペン、⇧で直線" +rectangle = "四角形、⇧で正方形" +start = "画面に描く" +stop = "描画を終了" +undo = "取り消す" +window_unavailable = "描画は画面録画と範囲録画で使えます" + +[controls.settings] +locked = "この録画では変更できません" +not_in_recording = "この録画では未使用" +open = "録画設定" +show_camera_preview = "カメラプレビューを表示" +switch_failed = "{device} に切り替えられませんでした。録画は続行中です。" +switching = "切り替え中…" + [camera] waiting_title = "カメラへのアクセスを待っています" @@ -1192,6 +1264,8 @@ mirror_title = "反転を使用できません" [camera.issue] access_message = "クリックして、システム設定でCapにカメラの使用を許可してください。" access_title = "カメラへのアクセスが必要です" +disconnected_message = "選択したカメラから映像が届かなくなりました。" +disconnected_title = "カメラが切断されました" generic = "選択したカメラを起動できませんでした。別のカメラを選ぶか、このカメラを接続し直してください。" invalid_format = "このカメラから使用可能なキャプチャフォーマットを取得できませんでした。" not_found = "このカメラは使用できなくなりました。接続されていて、システムの権限で許可されているか確認してください。" @@ -1405,6 +1479,8 @@ devices_changed_before_start = "録画の開始前に選択したデバイスが shortcut_conflict = "Ctrl+Shift+F9はCapの別の操作に割り当てられています。録画の前にそのショートカットを変更してください。" shortcut_description = "このCap録画を開始または停止" shortcut_hint = "{shortcut}を押して離すと開始します。同じショートカットで停止できます。この一時的なショートカットは設定を変更しません。" +source_lost = "録画対象が使用できなくなったため、Capは録画を停止しました(ディスプレイのスリープ、ウィンドウを閉じた場合など)。それまでに録画した内容はすべて保存されています。" +source_lost_title = "録画を停止しました" tray_stop_hint = "Capの停止トレイアイコンをクリックすると開始します。同じアイコンをもう一度クリックすると停止します。このコントロールを使うまで録画は始まりません。" window_unavailable = "選択したウィンドウは使用できなくなりました。もう一度選択してください。" @@ -1462,12 +1538,14 @@ placeholder = "台本を貼り付けるか入力してください…" words_per_minute = "{wpm}語/分" [import] +audio_failed = "音声を読み込めませんでした: {error}" error_title = "読み込みエラー" image_failed = "画像を読み込めませんでした:{error}" unsupported = "サポートされていないメディアファイルです。" video_failed = "動画を読み込めませんでした:{error}" [import.filter] +audio = "音声ファイル" image = "画像ファイル" media = "メディアファイル" video = "動画ファイル" @@ -1510,6 +1588,13 @@ unlock_body = "範囲を再び移動、サイズ変更、描き直しできる locked_title = "範囲はロックされています" locked_body = "クリックしてロックを解除すると、移動、サイズ変更、描き直しができます。" +[overlay.audio_only] +choose_source = "マイクを選択するか、システム音声をオンにしてください" +description = "画面やカメラは使わず、マイクとコンピュータの音を録音します" +meter_hint = "何か話してレベルを確認してください" +system_audio = "システム音声" +system_audio_only = "システム音声のみを録音します" + [overlay.camera_only] description = "カメラとマイクだけで録画します" select_camera = "カメラを選択してください" @@ -1768,6 +1853,20 @@ change_title = "音声を変更" done = "完了" import = "ファイルを読み込む" +[editor.audio_only] +add_visuals = "ビジュアルを追加" +body = "この録音には映像がありません。音声をMP3またはWAVで書き出すか、ビジュアルを追加して動画にできます。" +export_audio = "音声を書き出す" +show_visuals = "ビジュアルを表示" +size_large = "大" +size_medium = "中" +size_small = "小" +style_bars = "バー" +style_circle = "円" +style_wave = "波形" +title = "音声のみ" +visuals = "ビジュアル" + [editor.color] apply_to_cursor = "カーソルにも適用" fine_tune = "色を微調整" @@ -2182,6 +2281,7 @@ manual_help = "手動ズームは下で選んだ位置に固定されます。" mixed = "混在" mode = "ズームモード" positions_mixed = "セグメントごとにズーム位置が異なります。ドラッグするとすべて同じ位置に移動します。" +start_early = "ズームを早めに開始" title = "ズーム{number}" [editor.side_panel] @@ -2286,6 +2386,7 @@ background_blur = "背景のぼかし" custom_position = "カスタムの画面位置(キャンバスでドラッグ)" motion_blur = "モーションブラー" padding = "余白" +padding_style = "余白のスタイル" rounded_corners = "角丸" title = "レイアウト" @@ -2364,11 +2465,13 @@ mp4_filter = "MP4動画" prepare_controls_failed = "録画コントロールを準備できませんでした:{error}" record = "録画" record_new = "新しいクリップを録画" +removed_media = "{name}(削除したクリップ)" save_before_recording_failed = "録画前に現在のプロジェクトを保存できませんでした:{error}" split = "分割{number}" title = "クリップ" [editor.clips.error] +audio_only_mix = "音声のみの録音と動画クリップは1つのプロジェクトにまとめられません" cancelled = "読み込みをキャンセルしました" cannot_decode = "動画{path}をデコードできません:{error}" in_use = "この録画の使用中は読み込めません:{error}" @@ -2409,6 +2512,15 @@ upgrade_message = "この機能を使うにはプランのアップグレード upgrade_title = "アップグレードが必要です" upload_failed = "録画をアップロードできませんでした" +[editor.export.audio] +cta = "音声を書き出す" +exported = "音声を書き出しました" +exporting = "音声を書き出しています" +file_type = "ファイル形式" +format = "音声" +mp3_description = "軽量で、どこでも再生できます。192 kb/s ステレオ。" +wav_description = "ロスレス 16ビット、48 kHz。さらに編集する場合に最適です。" + [editor.export.advanced] bits_per_pixel = "ピクセルあたりのビット数" cursor_only = "カーソルのみを書き出す" @@ -2442,6 +2554,10 @@ retry_copy = "コピーを再試行" reuploaded = "最新の編集内容が同じリンクで利用できます" uploaded = "録画のアップロードが完了しました" +[editor.export.enhance] +description = "録画を拡大または縮小したとき、文字や細部を鮮明にします。書き出しに時間がかかる場合があります。" +title = "画質を向上" + [editor.export.estimate] gigabytes = "約{value} GB" gigabytes_range = "約{lower}~{upper} GB" @@ -2496,6 +2612,7 @@ format = "形式" frame_rate = "フレームレート" quality = "品質" resolution = "解像度" +tracks = "トラック" [editor.export.stats] calculating = "計算中…" @@ -2508,6 +2625,25 @@ refining_size = "サイズを精査中…" refining_time = "時間を精査中…" unavailable = "利用不可" +[editor.export.tracks] +aligned = "各トラックはカットや速度の変更に沿うため、どの動画編集ソフトでも揃います。映像は背景やエフェクトなしで書き出されます。" +audio_detail = "WAV · 48 kHz" +camera = "カメラ" +choose_one = "書き出すトラックを1つ以上選んでください。" +cta = "トラックを書き出す" +exported = "トラックを書き出しました" +exporting = "トラックを書き出し中" +file_count = { other = "{count}ファイル" } +file_only = "トラックはフォルダ内に個別のファイルとして保存されます。" +files = "ファイル" +format = "トラック" +microphone = "マイク" +open_folder = "フォルダを開く" +screen = "画面" +studio_only = "個別のトラックはStudioモードでのみ録画されます。" +system_audio = "システム音声" +video_detail = "MP4 · {width}×{height}" + [editor.export.turbo] title = "ターボ書き出し" description = "すべてのCPUコアとGPUを使って、はるかに高速に書き出します" @@ -2633,6 +2769,7 @@ model_downloaded = "{model}モデルをダウンロード済み" model_label = "モデル" model_updated = "推奨モデルを更新しました" model_updated_description = "新しいバージョンをおすすめします。より正確になり、以前のバージョンでは聞き取れなかった短い録画も文字起こしできます。" +new_caption = "新しい字幕" position = "位置" refining_word_timings = "単語のタイミングを調整中…" regenerate = "字幕を再生成" @@ -2709,6 +2846,7 @@ rounded = "角丸" squircle = "スクワークル" [editor.tabs.cursor] +follow_hover = "ホバー表示に合わせる" friction = "摩擦" hide_when_idle = "操作がないときは非表示" inactivity_delay = "非表示までの時間" @@ -2763,6 +2901,10 @@ timeline_unreadable = "プロジェクトのタイムラインを読み込めま title = "キーボードを表示" uppercase = "大文字" +[editor.tabs.padding] +even = "均等" +proportional = "比例" + [editor.tabs.position] bottom_center = "下中央" bottom_left = "左下" @@ -2908,13 +3050,20 @@ video = "動画" zoom = "ズーム" [editor.transcript] +add_caption = "再生ヘッドに字幕を追加" +captions_save_failed = "字幕を保存できませんでした:{error}" +captions_saved = "字幕を保存しました" cleanup = "クリーンアップ" cleanup_tooltip = "フィラーを削除し、間を短くします" delete_matches = "すべて削除" delete_matches_tooltip = "一致した箇所をすべて動画からカットします" +download_captions = "字幕をダウンロード" +download_srt = "SubRip(.srt)" +download_vtt = "WebVTT(.vtt)" +edit_hint = "Enterで保存、Escでキャンセル、Tabで次の単語へ" empty_description = "このコンピュータで録画を文字起こしすると、テキストを編集して動画を編集できます。" empty_title = "文字起こしはまだありません" -hint = "単語をクリックするとその位置に移動します。単語を選択して削除キーを押すと、動画からカットされます。" +hint = "単語をクリックするとその位置に移動し、ダブルクリックすると修正できます。単語を選択して削除キーを押すと、動画からカットされます。" next_match = "次の一致" no_audio = "この録画には文字起こしできる音声がありません。" no_speech = "この録画に発話は見つかりませんでした" @@ -2967,6 +3116,7 @@ audio_segment_changed = "この音声セグメントは変更されました。 crop = "切り抜き" crop_tooltip = "動画を切り抜く" no_room_for_3d_shot = "別の3Dショットを入れる余地がありません" +no_room_for_caption = "ここには字幕を追加する余地がありません" redo = "やり直す" save_failed = "{path}を保存できませんでした。エディタを開いたまま、もう一度お試しください:{error}" undo = "取り消す" @@ -3144,7 +3294,11 @@ wipe_down = "下へワイプ" zoom = "ズーム" [editor.window.transport] +compare = "比較" +compare_tooltip = "長押しで元の映像を表示" done_splitting = "分割を終了" +enhance = "画質向上" +enhance_tooltip = "一時停止中のフレームを高画質で表示" play_pause = "動画を再生/一時停止" speed = "プレビューの再生速度" split = "分割" @@ -3204,6 +3358,13 @@ quit_anyway = "それでも終了" still_open = "Capはまだ開いています" unconfirmed = "録画の停止を確認できなかったため、終了をキャンセルしました。Capは開いたままになります。「停止」を使ってから、もう一度終了してください。" +[dialog.startup] +failed = "{error}\n\n詳細は{folder}に保存されました。" +failed_title = "Capを起動できませんでした" +quit_and_reopen = "終了して再度開く" +unresponsive = "Capはすでに起動していますが、応答していません。そのCapを終了して、もう一度開きますか?" +unresponsive_title = "Capが応答していません" + [dialog.update] already_getting = "Capはすでにバージョン{version}を準備しています。" available = "Capのバージョン{version}が利用可能です。バックグラウンドでダウンロードし、インストールの準備ができたらお知らせします。" @@ -3278,6 +3439,7 @@ changed_after = "アップロード後にローカルの録画が変更されま already_queued = "この録画はすでにアップロード待ちです" paused = "アップロードを一時停止しました。ローカルの録画は保持されています" worker_failed = "アップロード処理が失敗しました。ローカルの録画は保持されています" +deleted_on_web = "この録画はWebで削除されました。ローカルの録画は保持されています" empty = "保存された録画は空です" no_resumable_state = "この録画には再開できるアップロード状態がありません" verification_failed = "録画の確認に失敗しました:{status}" diff --git a/apps/desktop-gpui/locales/zh-CN.toml b/apps/desktop-gpui/locales/zh-CN.toml index 922d4ee4a5d..562853b82cb 100644 --- a/apps/desktop-gpui/locales/zh-CN.toml +++ b/apps/desktop-gpui/locales/zh-CN.toml @@ -206,6 +206,10 @@ fps_30 = "30 FPS" fps_60 = "60 FPS(推荐)" label = "最大捕获帧率" +[settings.general.recording.keep_drawings] +description = "绘制内容会一直保留,直到你清除。关闭后,每笔绘制会在几秒后淡出。" +label = "在屏幕上保留绘制内容" + [settings.general.recording.marker_sound] description = "在 Studio 录制中添加标记时播放一段简短提示音。麦克风或系统音频可能会录入这段声音。" label = "添加标记时播放提示音" @@ -300,6 +304,7 @@ open_link = "打开链接" retry_upload = "重新上传" show_all = "全部显示" title = "录制" +save_audio = "保存音频" [settings.recordings.empty] all = "没有录制" @@ -367,7 +372,7 @@ screen_region = "屏幕区域" [settings.options.post_studio] do_nothing = "不执行任何操作" open_editor = "打开编辑器" -show_cap = "显示 Cap" +show_overlay = "在浮层中显示" [settings.options.post_screenshot] copy = "复制到剪贴板" @@ -390,16 +395,19 @@ cancelling_description = "适用于通过快捷键或 Cap 图标开始的截图 cancelling_title = "取消" closing_editor_description = "适用于截图编辑器和视频编辑器。" closing_editor_title = "关闭编辑器" +conflict = "已被“{shortcut}”使用。" needs_modifier_macos = "请包含 ⌘、⌃ 或 ⌥,以免快捷键干扰输入。" needs_modifier_other = "请包含 Ctrl、Alt 或 Win,以免快捷键干扰输入。" -record_shortcut = "录制快捷键" +not_set = "未设置" recording_description = "无需先打开 Cap 即可开始录制。" recording_hint = "按下你想使用的按键。按 Esc 取消,按 Delete 移除。" recording_title = "录制" +replace = "替换" saved = "已保存。在任意应用中按 {keys} 即可{effect}。" saved_moved = "已保存。在任意应用中按 {keys} 即可{effect}。已从“{shortcut}”中移除。" screenshots_description = "快捷键在任何应用中都可用。点击即可更改。" screenshots_title = "截图" +shared = "与“{shortcut}”按键相同,两者都会运行。" type_shortcut = "输入快捷键…" unavailable = "其他应用或系统已在使用此快捷键。点击以选择其他快捷键。" unsupported_key = "该按键不能用于快捷键。请尝试字母、数字或功能键。" @@ -451,8 +459,8 @@ screenshot_open_editor_hint = "先添加标注" studio_do_nothing = "不执行任何操作" studio_open_editor = "打开编辑器" studio_open_editor_hint = "立即编辑" -studio_show_cap = "显示 Cap" -studio_show_cap_hint = "回到录制器" +studio_show_overlay = "显示浮层" +studio_show_overlay_hint = "复制、分享或导出" [settings.shortcuts.label] add_marker = "添加标记" @@ -468,8 +476,10 @@ screenshot_area = "截取区域" screenshot_display = "截取屏幕" screenshot_window = "截取窗口" start_instant = "开始 Instant 录制" +start_selected = "以所选模式开始" start_studio = "开始 Studio 录制" stop = "停止录制" +toggle_drawing = "在屏幕上绘制" [settings.shortcuts.effect] add_marker = "在 Studio 录制中标记此刻" @@ -479,13 +489,10 @@ instant_copy_and_open = "以 Instant 模式录制所选屏幕或窗口,停止 open_picker = "打开 Cap 以选择要录制的内容" pause = "暂停当前录制,或继续录制" picker_area_instant = "选择一个区域,然后以 Instant 模式录制" -picker_area_screenshot = "选择一个区域,然后截图" picker_area_studio = "选择一个区域,然后以 Studio 模式录制" picker_display_instant = "选择一个屏幕,然后以 Instant 模式录制" -picker_display_screenshot = "选择一个屏幕,然后截图" picker_display_studio = "选择一个屏幕,然后以 Studio 模式录制" picker_window_instant = "选择一个窗口,然后以 Instant 模式录制" -picker_window_screenshot = "选择一个窗口,然后截图" picker_window_studio = "选择一个窗口,然后以 Studio 模式录制" restart = "丢弃当前录制并重新开始" screenshot_area_copy = "选择一个区域并复制到剪贴板" @@ -500,9 +507,11 @@ screenshot_window_copy = "截取指针所在的窗口并复制到剪贴板" screenshot_window_copy_and_open_editor = "截取指针所在的窗口,复制后打开编辑器" screenshot_window_open_editor = "截取指针所在的窗口并在编辑器中打开" screenshot_window_save = "截取指针所在的窗口并保存到你的资料库,不打开任何内容" +start_selected = "以 Cap 中所选的模式开始录制或截图" stop = "停止当前录制" studio = "以 Studio 模式录制所选屏幕或窗口" studio_open_editor = "以 Studio 模式录制所选屏幕或窗口,停止后打开编辑器" +toggle_drawing = "在录制时开始或停止在屏幕上绘制" [settings.shortcuts.sentence] add_marker = "在 Studio 录制中标记此刻。" @@ -512,13 +521,10 @@ instant_copy_and_open = "以 Instant 模式录制所选屏幕或窗口,停止 open_picker = "打开 Cap 以选择要录制的内容。" pause = "暂停当前录制,或继续录制。" picker_area_instant = "选择一个区域,然后以 Instant 模式录制。" -picker_area_screenshot = "选择一个区域,然后截图。" picker_area_studio = "选择一个区域,然后以 Studio 模式录制。" picker_display_instant = "选择一个屏幕,然后以 Instant 模式录制。" -picker_display_screenshot = "选择一个屏幕,然后截图。" picker_display_studio = "选择一个屏幕,然后以 Studio 模式录制。" picker_window_instant = "选择一个窗口,然后以 Instant 模式录制。" -picker_window_screenshot = "选择一个窗口,然后截图。" picker_window_studio = "选择一个窗口,然后以 Studio 模式录制。" restart = "丢弃当前录制并重新开始。" screenshot_area_copy = "选择一个区域并复制到剪贴板。" @@ -533,9 +539,11 @@ screenshot_window_copy = "截取指针所在的窗口并复制到剪贴板。" screenshot_window_copy_and_open_editor = "截取指针所在的窗口,复制后打开编辑器。" screenshot_window_open_editor = "截取指针所在的窗口并在编辑器中打开。" screenshot_window_save = "截取指针所在的窗口并保存到你的资料库,不打开任何内容。" +start_selected = "以 Cap 中所选的模式开始录制或截图。" stop = "停止当前录制。" studio = "以 Studio 模式录制所选屏幕或窗口。" studio_open_editor = "以 Studio 模式录制所选屏幕或窗口,停止后打开编辑器。" +toggle_drawing = "在录制时开始或停止在屏幕上绘制。" [settings.cli] command = "命令" @@ -604,6 +612,9 @@ uploading = "正在上传..." confirm_body = "Cap 将以闪烁图案占据你的屏幕并播放响亮的提示音,每条处理流程约 {seconds} 秒。请摘下耳机,不要静音,并在完成前不要操作电脑。" confirm_title = "运行诊断?" description = "录制一段闪烁并发出提示音的简短测试图案,测量画面与声音的偏移程度,并记录你的显示器、摄像头、麦克风、磁盘空间和录制设置。在你选择发送之前,不会发送任何内容。" +duration_description = "运行时间越长,越容易发现缓慢的偏移。" +duration_label = "测试时长" +duration_option = "{seconds} 秒" mic_description = "同时录制你的麦克风,检查它是否及时听到提示音。扬声器的声音需要能被麦克风实际收到。" mic_label = "测试麦克风" mode_description = "要测试的处理流程。“两者”会先运行 Studio 部分,再运行 Instant 部分。" @@ -644,6 +655,8 @@ activating = "正在激活..." active_title = "桌面许可证" checking = "正在检查…" deactivate = "停用许可证" +deactivate_failed = "无法停用你的许可证,请检查网络连接后重试。" +deactivating = "正在停用..." description = "你的 Cap 套餐和桌面许可证,集中在一处。" desktop_description = "你的桌面许可证涵盖商用录制和编辑。Cap Pro 还提供云端分享和协作功能。" desktop_name = "桌面许可证" @@ -740,17 +753,22 @@ working_for = "{email} 的 Google Drive 连接正常" [settings.automations] action_no_effect = "对所选触发器而言,此操作没有效果。" +action_unsupported = "Cap 暂不运行此操作,因此会跳过。" add_action = "添加操作" add_condition = "添加条件" auto_name_empty = "{trigger}自动化" browse = "浏览" check_compatibility = "检查兼容性" -compatibility_checked = "已检查兼容性:此自动化暂时还不会在 Cap 中运行。已保存的规则仍可供 Cap CLI 使用。未执行任何操作。" +compatibility_checked = "已检查兼容性:此自动化中的每个操作都会在 Cap 中运行。未执行任何操作。" +compatibility_unsupported = "已检查兼容性:文字识别暂时还不会在 Cap 中运行,将被跳过。其他操作会运行。未执行任何操作。" condition_never_matches = "对所选触发器而言,此条件永远不会满足。" copy_link = "将链接复制到剪贴板" -dangerous = "在 Cap CLI 中,此自动化会以你的权限运行命令或发送网络请求。请只使用你信任的值。" +dangerous = "此自动化会以你的权限运行命令或发送网络请求。请只使用你信任的值。" delete = "删除" -description = "规则与 Cap CLI 共享。Cap 会保存这些规则,但暂时还不会运行自动化。" +delete_guarded = "只有在上一步成功且其文件通过检查后才会删除录制,为此编辑器不会打开,否则全部保留。" +delete_needs_copy = "不会删除任何内容。请在此步骤正上方放置导出到所选文件夹的“按配置导出”或“保存到指定位置”。" +notify_needs_setting = "仅在通用设置中开启系统通知时显示。" +description = "规则与 Cap CLI 共享。Cap 会自动运行已启用的规则。" empty_description = "选择下方的模板一键开始,或从头创建你自己的自动化。" empty_title = "还没有自动化" enabled = "已启用" @@ -1027,6 +1045,7 @@ off = "关" on = "开" [main.error] +audio_only_needs_audio = "仅音频录制需要先选择麦克风或开启系统音频。" camera_only_needs_camera = "仅摄像头录制需要先选择摄像头。" copy = "复制错误信息" devices_not_ready = "录制设备尚未就绪。请打开录制器后重试。" @@ -1136,6 +1155,7 @@ title = "存储空间不足" [main.target] area = "区域" +audio_only = "仅音频" camera_only = "仅摄像头" choose_display = "选择屏幕" choose_window = "选择窗口" @@ -1147,6 +1167,35 @@ no_matching_windows = "没有匹配的窗口" no_windows = "未找到窗口" window = "窗口" +[recordings_overlay] +close = "关闭" +copy = "复制到剪贴板" +copy_link = "复制分享链接" +create_link = "创建分享链接" +edit = "编辑" +export = "导出" +open = "打开" +retry = "重试" + +[recordings_overlay.progress] +choose_image = "选择图片的保存位置" +choose_video = "选择视频的导出位置" +copied = "已复制到剪贴板" +copy_failed = "无法复制" +copying = "正在复制到剪贴板" +creating_link = "正在创建分享链接" +failed_hint = "出了点问题。请重试。" +link_copied = "已复制分享链接" +preparing = "正在准备" +rendering_video = "正在渲染视频" +save_failed = "无法保存" +saved_image = "图片已保存" +saved_video = "视频已保存" +saving_image = "正在保存图片" +saving_video = "正在保存视频" +share_failed = "无法创建链接" +share_failed_hint = "请检查网络连接后重试。" + [controls] disk_full_resume = "磁盘空间不足,无法继续。请释放空间后重试,或按“停止”保存。" low_storage = "存储空间不足。Cap 即将停止以保存你的录制。" @@ -1175,9 +1224,32 @@ resuming = "恢复中…" saving = "保存中…" starting = "正在开始" +[controls.disconnected] +camera = "摄像头已断开。录制将在没有摄像头画面的情况下继续。" +microphone = "麦克风已断开。重新连接前将录制静音。" + [controls.marker] add = "添加标记" +[controls.draw] +arrow = "箭头,按住 ⇧ 对齐 45°" +clear = "全部清除" +highlighter = "荧光笔,按住 ⇧ 画直线" +pen = "画笔,按住 ⇧ 画直线" +rectangle = "矩形,按住 ⇧ 画正方形" +start = "在屏幕上绘制" +stop = "停止绘制" +undo = "撤销" +window_unavailable = "绘制适用于显示器和区域录制" + +[controls.settings] +locked = "本次录制中无法更改" +not_in_recording = "本次录制未使用" +open = "录制设置" +show_camera_preview = "显示摄像头预览" +switch_failed = "无法切换到 {device}。录制仍在继续。" +switching = "正在切换…" + [camera] waiting_title = "正在等待摄像头权限" @@ -1192,6 +1264,8 @@ mirror_title = "镜像不可用" [camera.issue] access_message = "点击以在系统设置中允许 Cap 使用你的摄像头。" access_title = "需要摄像头权限" +disconnected_message = "所选摄像头已停止发送视频。" +disconnected_title = "摄像头已断开" generic = "无法启动所选摄像头。请选择其他摄像头,或重新连接此摄像头。" invalid_format = "此摄像头未提供可用的捕获格式。" not_found = "此摄像头已不可用。请检查它是否已连接,并已在系统权限中允许。" @@ -1405,6 +1479,8 @@ devices_changed_before_start = "录制开始前所选设备已更改。请重新 shortcut_conflict = "Ctrl+Shift+F9 已分配给另一个 Cap 操作。请在录制前更改该快捷键。" shortcut_description = "开始或停止此 Cap 录制" shortcut_hint = "按下并松开 {shortcut} 开始录制。再次使用同一快捷键即可停止。此临时快捷键不会更改你的设置。" +source_lost = "Cap 已停止录制,因为录制的对象已不可用(例如显示器进入睡眠或窗口已关闭)。此前录制的内容已全部保存。" +source_lost_title = "录制已停止" tray_stop_hint = "点击 Cap 的“停止”托盘图标即可开始。再次点击同一图标即可停止。在你使用该控件之前,录制不会开始。" window_unavailable = "所选窗口已不可用。请重新选择。" @@ -1462,12 +1538,14 @@ placeholder = "粘贴或输入你的脚本…" words_per_minute = "{wpm} 字/分钟" [import] +audio_failed = "无法导入音频:{error}" error_title = "导入错误" image_failed = "无法导入图像:{error}" unsupported = "不支持的媒体文件。" video_failed = "无法导入视频:{error}" [import.filter] +audio = "音频文件" image = "图像文件" media = "媒体文件" video = "视频文件" @@ -1510,6 +1588,13 @@ unlock_body = "允许再次移动、调整大小或重新绘制该区域。" locked_title = "区域已锁定" locked_body = "点击即可解锁,以便移动、调整大小或重新绘制。" +[overlay.audio_only] +choose_source = "请选择麦克风或开启系统音频" +description = "只录制麦克风和电脑的声音,不录屏幕和摄像头" +meter_hint = "说句话来检查音量" +system_audio = "系统音频" +system_audio_only = "仅录制系统音频" + [overlay.camera_only] description = "仅使用摄像头和麦克风录制" select_camera = "请选择一个摄像头" @@ -1768,6 +1853,20 @@ change_title = "更换音频" done = "完成" import = "导入文件" +[editor.audio_only] +add_visuals = "添加视觉效果" +body = "此录制没有视频。可将声音导出为 MP3 或 WAV,或添加视觉效果把它变成视频。" +export_audio = "导出音频" +show_visuals = "显示视觉效果" +size_large = "大" +size_medium = "中" +size_small = "小" +style_bars = "条形" +style_circle = "圆形" +style_wave = "波形" +title = "仅音频" +visuals = "视觉效果" + [editor.color] apply_to_cursor = "应用到光标" fine_tune = "微调颜色" @@ -2182,6 +2281,7 @@ manual_help = "手动缩放会固定在你在下方选择的位置。" mixed = "不一致" mode = "缩放模式" positions_mixed = "这些片段缩放到不同位置。拖动可将它们全部移到同一位置。" +start_early = "提前开始缩放" title = "缩放 {number}" [editor.side_panel] @@ -2286,6 +2386,7 @@ background_blur = "背景模糊" custom_position = "自定义屏幕位置(在画布上拖动)" motion_blur = "运动模糊" padding = "边距" +padding_style = "边距样式" rounded_corners = "圆角" title = "布局" @@ -2364,11 +2465,13 @@ mp4_filter = "MP4 视频" prepare_controls_failed = "无法准备录制控件:{error}" record = "录制" record_new = "录制新片段" +removed_media = "{name}(已删除的片段)" save_before_recording_failed = "录制前无法保存当前项目:{error}" split = "拆分 {number}" title = "片段" [editor.clips.error] +audio_only_mix = "仅音频录制和视频片段不能合并到同一个项目中" cancelled = "已取消导入" cannot_decode = "无法解码视频 {path}:{error}" in_use = "此录制正在使用中,无法导入:{error}" @@ -2409,6 +2512,15 @@ upgrade_message = "此功能需要升级套餐" upgrade_title = "需要升级" upload_failed = "无法上传录制" +[editor.export.audio] +cta = "导出音频" +exported = "音频已导出" +exporting = "正在导出音频" +file_type = "文件类型" +format = "音频" +mp3_description = "体积小,随处可播放。192 kb/s 立体声。" +wav_description = "无损 16 位,48 kHz。最适合后续编辑。" + [editor.export.advanced] bits_per_pixel = "每像素比特数" cursor_only = "仅导出光标" @@ -2442,6 +2554,10 @@ retry_copy = "重新复制" reuploaded = "你最新的编辑已在同一链接上就绪" uploaded = "你的录制已成功上传" +[editor.export.enhance] +description = "录制内容放大或缩小时,让文字和细节更清晰。导出可能需要更长时间。" +title = "提升画质" + [editor.export.estimate] gigabytes = "约 {value} GB" gigabytes_range = "约 {lower}–{upper} GB" @@ -2496,6 +2612,7 @@ format = "格式" frame_rate = "帧率" quality = "画质" resolution = "分辨率" +tracks = "轨道" [editor.export.stats] calculating = "正在计算…" @@ -2508,6 +2625,25 @@ refining_size = "正在精确估算大小…" refining_time = "正在精确估算用时…" unavailable = "不可用" +[editor.export.tracks] +aligned = "各轨道会跟随你的剪辑和速度,在任何视频编辑软件中都能对齐。视频不含背景和效果。" +audio_detail = "WAV · 48 kHz" +camera = "摄像头" +choose_one = "请至少选择一个要导出的轨道。" +cta = "导出轨道" +exported = "轨道已导出" +exporting = "正在导出轨道" +file_count = { other = "{count} 个文件" } +file_only = "轨道会以单独文件的形式保存到一个文件夹中。" +files = "文件" +format = "轨道" +microphone = "麦克风" +open_folder = "打开文件夹" +screen = "屏幕" +studio_only = "只有 Studio 模式会录制单独的轨道。" +system_audio = "系统音频" +video_detail = "MP4 · {width}×{height}" + [editor.export.turbo] title = "极速导出" description = "使用所有 CPU 核心和 GPU,大幅加快导出" @@ -2633,6 +2769,7 @@ model_downloaded = "已下载“{model}”模型" model_label = "模型" model_updated = "推荐模型已更新" model_updated_description = "推荐使用新版本。它更准确,还能转写旧版本漏掉的短录制内容。" +new_caption = "新字幕" position = "位置" refining_word_timings = "正在优化单词时间…" regenerate = "重新生成字幕" @@ -2709,6 +2846,7 @@ rounded = "圆角" squircle = "超椭圆" [editor.tabs.cursor] +follow_hover = "跟随悬停高亮" friction = "摩擦" hide_when_idle = "空闲时隐藏" inactivity_delay = "空闲延迟" @@ -2763,6 +2901,10 @@ timeline_unreadable = "无法读取项目时间线。" title = "显示键盘" uppercase = "大写" +[editor.tabs.padding] +even = "均匀" +proportional = "按比例" + [editor.tabs.position] bottom_center = "底部居中" bottom_left = "左下" @@ -2908,13 +3050,20 @@ video = "视频" zoom = "缩放" [editor.transcript] +add_caption = "在播放头处添加字幕" +captions_save_failed = "无法保存字幕:{error}" +captions_saved = "字幕已保存" cleanup = "清理" cleanup_tooltip = "移除填充词并缩短停顿" delete_matches = "全部删除" delete_matches_tooltip = "从视频中剪掉所有匹配项" +download_captions = "下载字幕" +download_srt = "SubRip(.srt)" +download_vtt = "WebVTT(.vtt)" +edit_hint = "按 Enter 保存,按 Esc 取消,按 Tab 编辑下一个单词" empty_description = "在这台电脑上转写此录制内容,然后通过编辑文字来编辑视频。" empty_title = "还没有转写内容" -hint = "点击单词即可跳转。选中单词后按删除键,即可从视频中剪掉。" +hint = "点击单词即可跳转,双击即可修改。选中单词后按删除键,即可从视频中剪掉。" next_match = "下一个匹配项" no_audio = "此录制内容没有可转写的音频。" no_speech = "此录制内容中未发现语音" @@ -2967,6 +3116,7 @@ audio_segment_changed = "此音频分段已更改。请选中它并重新选择 crop = "裁剪" crop_tooltip = "裁剪视频" no_room_for_3d_shot = "没有空间再添加 3D 镜头" +no_room_for_caption = "这里没有空间再添加字幕" redo = "重做" save_failed = "无法保存 {path}。请保持编辑器打开并重试:{error}" undo = "撤销" @@ -3144,7 +3294,11 @@ wipe_down = "向下擦除" zoom = "缩放" [editor.window.transport] +compare = "对比" +compare_tooltip = "按住查看原始画面" done_splitting = "完成拆分" +enhance = "增强" +enhance_tooltip = "以增强效果显示暂停的画面" play_pause = "播放/暂停视频" speed = "预览播放速度" split = "拆分" @@ -3204,6 +3358,13 @@ quit_anyway = "仍然退出" still_open = "Cap 仍在运行" unconfirmed = "无法确认录制已停止,已取消退出。Cap 将保持打开。请点击“停止”,然后再次尝试退出。" +[dialog.startup] +failed = "{error}\n\n详细信息已保存在 {folder}。" +failed_title = "Cap 无法启动" +quit_and_reopen = "退出并重新打开" +unresponsive = "Cap 已在运行,但没有响应。要退出它并重新打开 Cap 吗?" +unresponsive_title = "Cap 没有响应" + [dialog.update] already_getting = "Cap 已在准备版本 {version}。" available = "Cap {version} 版本现已推出。Cap 会在后台下载,并在可以安装时通知你。" @@ -3278,6 +3439,7 @@ changed_after = "本地录制在上传后发生了变化;已将其保留" already_queued = "此录制已在上传队列中" paused = "上传已暂停;本地录制已保留" worker_failed = "上传进程失败;本地录制已保留" +deleted_on_web = "此录制已在网页端删除;本地录制已保留" empty = "已保存的录制为空" no_resumable_state = "此录制没有可继续的上传状态" verification_failed = "录制验证失败:{status}" diff --git a/apps/desktop-gpui/packaging/windows/installer-hooks.nsh b/apps/desktop-gpui/packaging/windows/installer-hooks.nsh index f696c1c5ffe..06c93ec885d 100644 --- a/apps/desktop-gpui/packaging/windows/installer-hooks.nsh +++ b/apps/desktop-gpui/packaging/windows/installer-hooks.nsh @@ -18,12 +18,48 @@ SetCompressorDictSize 128 Pop $0 !macroend +; Any other cap-cli.exe or cap-muxer.exe running from this install holds the +; FFmpeg DLLs open. Copying over them failed with an Abort, Retry, Ignore +; prompt after Cap.exe was already replaced, so Abort or Ignore left a mix of +; versions on disk (and a silent install skipped the files). Nothing is copied +; until they have exited: the check waits up to 10 seconds, then asks the user +; to stop them, and a silent install or Cancel stops before any file changes. +; Starting PowerShell costs seconds, so it only runs when a process with either +; name exists. Exit code 2 means one from this install is still running; any +; other failure of the check keeps the previous behaviour of going ahead. +!macro WaitForCapCommandLineTools ABORT_TEXT + !define CapToolsCheck cap_tools_check_${__LINE__} + Push $0 + Push $1 + System::Call 'kernel32::SetEnvironmentVariable(t "CAP_INSTALL_DIR", t "$INSTDIR")i' + ${CapToolsCheck}: + nsis_tauri_utils::FindProcessCurrentUser "cap-cli.exe" + Pop $0 + ${If} $0 != 0 + nsis_tauri_utils::FindProcessCurrentUser "cap-muxer.exe" + Pop $0 + ${EndIf} + ${If} $0 = 0 + nsExec::ExecToStack `"$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -NonInteractive -ExecutionPolicy Bypass -Command "try { $$dir = [IO.Path]::GetFullPath($$env:CAP_INSTALL_DIR).TrimEnd('\'); $$deadline = (Get-Date).AddSeconds(10); do { $$running = @(Get-CimInstance Win32_Process -ErrorAction Stop | Where-Object { ($$_.Name -eq 'cap-cli.exe' -or $$_.Name -eq 'cap-muxer.exe') -and $$_.ExecutablePath -and ([IO.Path]::GetDirectoryName($$_.ExecutablePath) -eq $$dir) }); if ($$running.Count -eq 0) { exit 0 }; Start-Sleep -Milliseconds 500 } while ((Get-Date) -lt $$deadline); exit 2 } catch { exit 0 }"` + Pop $0 + Pop $1 + ${If} $0 == 2 + MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "Cap's command line tool is still running, for example a recording started with cap record or an export. Stop it, then click Retry." /SD IDCANCEL IDRETRY ${CapToolsCheck} + Abort "${ABORT_TEXT}" + ${EndIf} + ${EndIf} + Pop $1 + Pop $0 + !undef CapToolsCheck +!macroend + ; Cap 0.6.0 ran its GPUI app as cap-gpui.exe next to Cap.exe. The template ; only closes Cap.exe before copying files, so a running cap-gpui.exe would keep ; the shared FFmpeg DLLs locked and stop the update with a file-in-use error. !macro NSIS_HOOK_PREINSTALL !insertmacro CheckIfAppIsRunning "cap-gpui.exe" "${PRODUCTNAME}" !insertmacro EndCapMcpServers + !insertmacro WaitForCapCommandLineTools "Cap was not updated because its command line tool is still running." !macroend !macro NSIS_HOOK_POSTINSTALL @@ -34,4 +70,5 @@ SetCompressorDictSize 128 !macro NSIS_HOOK_PREUNINSTALL !insertmacro EndCapMcpServers + !insertmacro WaitForCapCommandLineTools "Cap was not uninstalled because its command line tool is still running." !macroend diff --git a/apps/desktop-gpui/src/app_windows.rs b/apps/desktop-gpui/src/app_windows.rs index b09231375a2..7006bc21267 100644 --- a/apps/desktop-gpui/src/app_windows.rs +++ b/apps/desktop-gpui/src/app_windows.rs @@ -40,14 +40,19 @@ use crate::{ /// Matches the Tauri `InProgressRecording` window and /// `fake_window.rs` position math. -pub const CONTROLS_WIDTH: f32 = 320.; +/// One button wider where the bar carries the draw button. +pub const CONTROLS_WIDTH: f32 = if crate::live_draw::SUPPORTED { + 384. +} else { + 352. +}; pub const CONTROLS_HEIGHT: f32 = 150.; /// The bar alone, with its padding. A transparent window takes every click /// inside its frame, so without an issue to show the window is only this /// tall and the app under the empty space above the bar stays clickable. pub const CONTROLS_BAR_HEIGHT: f32 = 64.; const CONTROLS_FIT_TO_ISSUE: bool = cfg!(any(target_os = "macos", windows)); -const CONTROLS_BOTTOM_OFFSET: f64 = 120.; +pub(crate) const CONTROLS_BOTTOM_OFFSET: f64 = 120.; const TARGET_CONTROLS_OFFSET_Y: f64 = 48.; #[cfg(any(target_os = "macos", test))] @@ -150,7 +155,10 @@ fn platform_display_for_capture( found } -fn gpui_display_id(target: Option<&scap_targets::Display>, cx: &App) -> Option { +pub(crate) fn gpui_display_id( + target: Option<&scap_targets::Display>, + cx: &App, +) -> Option { #[cfg(target_os = "windows")] { target @@ -306,6 +314,10 @@ pub struct AppWindows { /// Where the camera bubble sat before a window picker parked it inside the /// highlighted window -- see [`CameraPark`]. pub camera_park: CameraPark, + /// The recording bar's "Show camera preview" turned the bubble off. It + /// is hidden, not closed, so a Studio capture keeps excluding the same + /// window when it comes back. + camera_preview_hidden: bool, #[cfg(target_os = "linux")] clean_capture: Option, #[cfg(target_os = "linux")] @@ -498,7 +510,7 @@ impl CameraPark { impl Global for AppWindows {} -fn remove_popup_window_chrome(native: Option, cx: &mut App) { +pub(crate) fn remove_popup_window_chrome(native: Option, cx: &mut App) { let Some(native) = native else { return; }; @@ -575,6 +587,7 @@ pub fn init(main: WindowHandle, session: Entity, c main_closed_by_user: false, editor_hidden_for_picker: None, camera_park: CameraPark::default(), + camera_preview_hidden: false, #[cfg(target_os = "linux")] clean_capture: None, #[cfg(target_os = "linux")] @@ -589,6 +602,9 @@ pub fn init(main: WindowHandle, session: Entity, c cx.spawn(async move |cx| { while escape.recv_async().await.is_ok() { cx.update(|cx| { + if crate::live_draw::escape(cx) { + return; + } if TargetSelect::global(cx).read(cx).mode.is_some() && !cancel_area_drags(cx) { dismiss_target_overlays(cx); } @@ -602,6 +618,7 @@ pub fn init(main: WindowHandle, session: Entity, c while thumbnails.recv_async().await.is_ok() { cx.update(|cx| { crate::tray::refresh_previous(cx); + crate::recordings_overlay::thumbnails_written(cx); refresh_library_after_delete(cx); crate::menus::recheck_pending_quit(cx); }); @@ -618,11 +635,20 @@ pub fn init(main: WindowHandle, session: Entity, c // status item becomes a stop button while a capture runs. crate::tray::set_recording(recording, cx); } - let markers = session.read(cx).markers_available(); - crate::hotkeys::set_recording_scope(markers, cx); + let scopes = crate::hotkeys::RecordingScopes { + markers: session.read(cx).markers_available(), + drawing: crate::live_draw::availability(session.read(cx)).is_ok(), + }; + crate::hotkeys::set_recording_scopes(scopes, cx); + if !recording { + crate::live_draw::end(cx); + } if phase == Phase::Stopping { open_preparing_studio_editor(&session, cx); } + if phase != Phase::Idle && last_phase == Phase::Idle { + crate::recordings_overlay::hide_for(crate::recordings_overlay::Capture::Recording, cx); + } if phase == Phase::Idle && last_phase != Phase::Idle { #[cfg(target_os = "linux")] if !session.read(cx).instant_cleanup_safe() { @@ -630,14 +656,20 @@ pub fn init(main: WindowHandle, session: Entity, c } close_controls(&session, cx); close_target_overlays(cx); + // The clean-capture lease keeps the bubble closed until it is + // released, so the hidden preview reopens only after it. #[cfg(target_os = "linux")] if !restore_clean_capture_ui(cx) { return; } - let (finished_studio, preparing_editor, finished_instant, deleted) = + if cx.global::().camera_preview_hidden { + set_camera_preview_shown(true, cx); + } + let (finished_studio, studio_behaviour, preparing_editor, finished_instant, deleted) = session.update(cx, |session, _| { ( session.finished_studio.take(), + session.studio_behaviour.take(), session.take_preparing_studio_editor(), std::mem::take(&mut session.finished_instant), std::mem::take(&mut session.deleted_recording), @@ -679,15 +711,18 @@ pub fn init(main: WindowHandle, session: Entity, c // to the editor, main window staying hidden -- // `editor_closed` brings it back once the last editor goes // away. `doNothing` leaves it in the library with Cap out of - // the way. Every other path (instant, failures, `showOverlay` - // until an overlay exists) reshows the main window as before. + // the way, and `showOverlay` puts the recording in the + // floating overlay with Cap kept out of the way the same. + // Every other path (instant, failures) reshows the main window + // as before. // A clean instant recording reshows it only for "Show Cap"; // otherwise the browser tab, or the copied link alone, is // the completion and Cap stays out of the way. A recording // deleted from the bar reshows it only for "Reopen recording // window", as the Tauri `delete_recording` did. let settings = crate::store::GeneralSettings::load(); - let behaviour = settings.post_studio_recording_behaviour; + let behaviour = + studio_behaviour.unwrap_or(settings.post_studio_recording_behaviour); // Linux restores the main window through the clean-capture // lease before this runs, so it keeps reshowing as before. A // main window reopened mid-recording (even if minimized since) @@ -719,6 +754,11 @@ pub fn init(main: WindowHandle, session: Entity, c park_idle_camera_preview(cx); crate::menus::schedule_dock_sync(cx); } + (Some(project_dir), crate::store::PostStudioBehaviour::ShowOverlay) => { + crate::recordings_overlay::show_studio_recording(project_dir, cx); + park_idle_camera_preview(cx); + crate::menus::schedule_dock_sync(cx); + } (None, _) if keep_hidden_after_instant => { tracing::info!("main window kept hidden after the Instant recording"); park_idle_camera_preview(cx); @@ -748,6 +788,10 @@ pub fn init(main: WindowHandle, session: Entity, c // net effect too, where `restart_recording` clears it and the // immediately-following `start_recording` puts it straight back.) restore_content_protection(cx); + crate::recordings_overlay::show_after( + crate::recordings_overlay::Capture::Recording, + cx, + ); } last_phase = phase; }) @@ -767,8 +811,7 @@ fn open_preparing_studio_editor(session: &Entity, cx: &mut App if !pending.capture_stopped || pending.presentation != StudioEditorPresentation::Pending || !pending.finalization.is_finalizing() - || crate::store::GeneralSettings::load().post_studio_recording_behaviour - != crate::store::PostStudioBehaviour::OpenEditor + || session.read(cx).studio_behaviour != Some(crate::store::PostStudioBehaviour::OpenEditor) { return; } @@ -2352,6 +2395,7 @@ fn disarm_target_selection(cx: &mut App) { select.arm(None, recording_mode, None, cx); }); sync_camera_presentation(cx); + settle_camera_level(cx); } fn area_overlay_matches( @@ -2479,7 +2523,14 @@ fn make_recording_area_passive(handle: WindowHandle, cx: &mut App let Some(native) = native else { return; }; - if !native.is_some_and(|native| platform::set_window_click_through(&native, true)) { + let passive = native.is_some_and(|native| { + let passive = platform::set_window_click_through(&native, true); + if passive { + platform::set_panel_level(&native, platform::recording_area_level()); + } + passive + }); + if !passive { tracing::warn!("recording area click-through failed; removing the outline"); cx.update(|cx| { let display = cx @@ -2820,6 +2871,11 @@ fn open_overlay( show: false, is_resizable: false, is_minimizable: false, + // Above the menu bar the overlay's top strip is reachable, and + // AppKit would treat a drag there as a titlebar drag and move the + // whole overlay instead of drawing the selection. + #[cfg(target_os = "macos")] + app_owns_titlebar_drag: true, window_background: gpui::WindowBackgroundAppearance::Transparent, ..Default::default() }, @@ -3094,6 +3150,7 @@ fn own_windows(cx: &mut App) -> Vec { main_closed_by_user: _, editor_hidden_for_picker: _, camera_park: _, + camera_preview_hidden: _, #[cfg(target_os = "linux")] clean_capture: _, #[cfg(target_os = "linux")] @@ -4403,12 +4460,16 @@ pub fn open_camera_window(cx: &mut App) { sync_camera_presentation(cx); sync_opened_camera_with_picker(cx); refresh_target_overlays(cx); + #[cfg(target_os = "macos")] + cx.spawn(async move |cx| raise_camera_above_overlays(cx)) + .detach(); } Err(error) => tracing::error!("camera window failed to open: {error:#}"), } } pub fn close_camera_window(cx: &mut App) { + cx.global_mut::().camera_preview_hidden = false; if let Some(handle) = cx.global_mut::().camera.take() { #[cfg(not(target_os = "macos"))] if let Some(previous) = handle @@ -4430,8 +4491,13 @@ pub fn close_camera_window(cx: &mut App) { } } +/// Camera Only shows the preview inside its overlay; Audio Only records no +/// camera, so the floating preview steps aside for both. fn camera_preview_is_inline(cx: &App) -> bool { - TargetSelect::global(cx).read(cx).mode == Some(TargetType::CameraOnly) + matches!( + TargetSelect::global(cx).read(cx).mode, + Some(TargetType::CameraOnly | TargetType::AudioOnly) + ) } pub fn camera_preview_entity(cx: &mut App) -> Option> { @@ -4627,14 +4693,58 @@ pub(crate) fn studio_camera_snapshot( /// outside any gpui update: ordering a window front calls straight back into /// gpui, which drops those callbacks while the app is borrowed. pub(crate) fn raise_camera_above_overlays(cx: &mut gpui::AsyncApp) { - let Some(camera) = cx.update(camera_to_raise) else { + let Some((camera, level)) = cx.update(|cx| Some((camera_to_raise(cx)?, camera_level(cx)))) + else { return; }; - if let Err(error) = camera.raise() { + if let Err(error) = camera.raise(level) { tracing::warn!(%error, "could not raise the camera above the target picker"); } } +/// While a picker is up the overlays sit above the menu bar, so the camera +/// bubble goes one level above them; otherwise it keeps the recording +/// controls' level. +fn camera_level(cx: &App) -> isize { + let picking = TargetSelect::global(cx).read(cx).mode.is_some() + && !cx.global::().overlays.is_empty(); + if picking { + platform::target_overlay_level() + 1 + } else { + platform::recording_controls_level() + } +} + +/// Picking ended: drop the camera bubble from above the picker back to the +/// level it has everywhere else, so it never stays over the menu bar. +fn settle_camera_level(cx: &mut App) { + #[cfg(target_os = "macos")] + { + let Some(handle) = cx.global::().camera else { + return; + }; + cx.spawn(async move |cx| { + let native = cx.update(|cx| { + if cx.global::().camera != Some(handle) { + return None; + } + let level = camera_level(cx); + handle + .update(cx, |_, window, _| platform::native_window(window)) + .ok() + .flatten() + .map(|native| (native, level)) + }); + if let Some((native, level)) = native { + platform::set_panel_level(&native, level); + } + }) + .detach(); + } + #[cfg(not(target_os = "macos"))] + let _ = cx; +} + fn camera_to_raise(cx: &mut App) -> Option { if camera_preview_is_inline(cx) { return None; @@ -4665,16 +4775,14 @@ fn camera_snapshot(cx: &mut App) -> Option { } impl CameraFrame { - fn raise(&self) -> anyhow::Result<()> { + fn raise(&self, level: isize) -> anyhow::Result<()> { + #[cfg(target_os = "linux")] + let _ = level; match &self.native { #[cfg(target_os = "macos")] - CameraNativeFrame::Mac { native, .. } => { - platform::raise_panel_native(native, platform::recording_controls_level()) - } + CameraNativeFrame::Mac { native, .. } => platform::raise_panel_native(native, level), #[cfg(target_os = "windows")] - CameraNativeFrame::Windows(native) => { - platform::raise_panel_native(native, platform::recording_controls_level()) - } + CameraNativeFrame::Windows(native) => platform::raise_panel_native(native, level), #[cfg(target_os = "linux")] CameraNativeFrame::X11 { window_id, .. } => { use x11rb::connection::Connection as _; @@ -5428,12 +5536,14 @@ pub(crate) async fn shared_wgpu_device() -> Option { tracing::warn!(%error, "could not precreate shared wgpu device"); + crate::store::EditorPreviewQuality::note_rendering_adapter(true); None } } @@ -5771,6 +5881,7 @@ fn load_editor_project_candidate( crate::library::recover_interrupted_for_editing( &recover_path, active.as_deref(), + |path| editor_window::preflight(path).is_ok(), ) }) .await; @@ -5914,6 +6025,7 @@ fn load_editor_project_candidate( view.set_summary(summary, window, cx); view.set_project(config, window, cx); view.set_instance(instance.clone()); + view.apply_pending_auto_zoom(window, cx); view.refine_caption_timings(window, cx); }) .is_err() @@ -6057,6 +6169,7 @@ fn load_editor_project_candidate( crate::transcript::automation::run(handle, cx).await; drive_auto_export(handle, cx).await; crate::editor_hover_bench::run(handle, cx).await; + crate::editor_latency_bench::run(handle, cx).await; }) .detach(); } @@ -6074,6 +6187,9 @@ async fn drive_auto_export(handle: WindowHandle, cx: &mut gpui::As if flags.contains(&"link") { export.destination = crate::editor_export::ExportDestination::Link; } + if flags.contains(&"tracks") { + export.use_tracks(None); + } } cx.notify(); }); @@ -6086,9 +6202,31 @@ async fn drive_auto_export(handle: WindowHandle, cx: &mut gpui::As cx.background_executor() .timer(std::time::Duration::from_millis(300)) .await; + if let Ok(style) = std::env::var("CAP_GPUI_AUTO_AUDIO_VISUALS") { + let _ = handle.update(cx, |view, window, cx| { + view.enable_audio_visuals_for_automation(&style, window, cx) + }); + cx.background_executor() + .timer(std::time::Duration::from_secs(2)) + .await; + } let _ = handle.update(cx, |view, window, cx| { view.open_export(window, cx); - if let Some(export) = view.export.as_mut() { + let tracks = std::env::var("CAP_GPUI_AUTO_EXPORT_TRACKS").ok(); + if let Some(export) = view.export.as_mut() + && let Some(tracks) = tracks.as_deref() + { + export.use_tracks(Some(tracks)); + } else if let Some(export) = view.export.as_mut() + && let Some(format) = path + .extension() + .and_then(|extension| extension.to_str()) + .and_then(cap_export::audio::AudioExportFormat::from_extension) + { + export.destination = crate::editor_export::ExportDestination::File; + export.format = crate::editor_export::ExportFormatKind::Audio; + export.audio_format = format; + } else if let Some(export) = view.export.as_mut() { export.destination = crate::editor_export::ExportDestination::File; export.format = if path.extension().is_some_and(|extension| extension == "gif") { crate::editor_export::ExportFormatKind::Gif @@ -6668,6 +6806,10 @@ pub fn editor_closed(project_path: &Path, window_id: gpui::WindowId, cx: &mut Ap if let Ok(pending) = handle.update(cx, |view, _window, _cx| view.pending_save()) { pending.borrow_mut().flush(); } + let unused_media = handle + .update(cx, |view, _window, _cx| view.unused_media_request()) + .ok() + .flatten(); let instance = handle .update(cx, |view, _window, _cx| view.take_instance()) .ok() @@ -6675,15 +6817,18 @@ pub fn editor_closed(project_path: &Path, window_id: gpui::WindowId, cx: &mut Ap if let Some(instance) = instance { let refresh = gpui_tokio::Tokio::spawn(cx, async move { instance.dispose_with_thumbnail().await }); + let closed = key.clone(); cx.spawn(async move |cx| { - if refresh.await.unwrap_or(false) { - cx.update(|cx| { + let refreshed = refresh.await.unwrap_or(false); + cx.update(|cx| { + if refreshed { refresh_library_after_delete(cx); let main = cx.global::().main; main.update(cx, |view, window, cx| view.refresh_open_library(window, cx)) .ok(); - }); - } + } + clean_unused_media(closed, unused_media, cx); + }); }) .detach(); } @@ -6691,6 +6836,123 @@ pub fn editor_closed(project_path: &Path, window_id: gpui::WindowId, cx: &mut Ap restore_after_editor_close(&key, cx); } +/// Runs once the closed editor's engine has let go of the media, off the UI +/// thread, on a thread of its own (see `unused_media::move_to_trash`). +fn clean_unused_media(key: PathBuf, request: Option, cx: &mut App) { + let Some(request) = request else { + cx.background_executor() + .spawn(async move { crate::unused_media::trash_leftovers(key) }) + .detach(); + return; + }; + if let Some(reason) = unused_media_busy(&key, cx) { + tracing::info!(path = %key.display(), reason, "Kept unused clip media"); + return; + } + let (ready_tx, ready_rx) = flume::bounded(1); + let project = key.clone(); + let spawned = std::thread::Builder::new() + .name("unused-media".into()) + .spawn(move || { + let free = crate::unused_media::wait_until_free(&project, &request); + ready_tx.send((free, request)).ok(); + }); + if let Err(error) = spawned { + tracing::warn!(%error, "Could not start the unused clip media cleanup"); + return; + } + cx.spawn(async move |cx| { + if let Ok((free, request)) = ready_rx.recv_async().await { + cx.update(|cx| start_unused_media_cleanup(key, request, free, cx)); + } + }) + .detach(); +} + +/// Everything that keeps a closed editor's project out of reach of the +/// cleanup, checked again once the media is free, since the project may have +/// been opened, exported or deleted while the cleanup waited. +fn unused_media_busy(key: &Path, cx: &App) -> Option<&'static str> { + let session = RecordingSession::global(cx); + let session = session.read(cx); + let windows = cx.global::(); + crate::unused_media::Busy { + open_in_editor: windows.editors.iter().any(|(path, _)| path == key) + || crate::library::ensure_not_open_in_editor(key).is_err(), + deleting: windows.deleting_editors.contains(key) || crate::library::is_being_deleted(key), + recording: crate::library::is_recording_in_progress(key) + || session + .active_project_dir() + .is_some_and(|path| editor_key(path) == key) + || session + .preparing_studio_editor() + .is_some_and(|pending| editor_key(&pending.project_path) == key), + exporting_or_uploading: crate::recordings_overlay::work_in_flight(cx), + automation: crate::automation::studio_rules_running(key), + } + .reason() +} + +fn start_unused_media_cleanup( + key: PathBuf, + request: crate::unused_media::Request, + free: bool, + cx: &mut App, +) { + if !free { + tracing::info!(path = %key.display(), reason = "media still in use", "Kept unused clip media"); + return; + } + if let Some(reason) = unused_media_busy(&key, cx) { + tracing::info!(path = %key.display(), reason, "Kept unused clip media"); + return; + } + let Some(claim) = crate::unused_media::Claim::take(&key) else { + return; + }; + let (done_tx, done_rx) = flume::bounded(1); + let project = key.clone(); + let spawned = std::thread::Builder::new() + .name("unused-media".into()) + .spawn(move || { + let started = std::time::Instant::now(); + let outcome = match cap_recording::upload_resume::UploadLock::acquire(&project) { + Ok(_lock) => crate::unused_media::run(&project, &request), + Err(error) => Err(format!("project in use: {error}")), + }; + drop(claim); + let elapsed_ms = started.elapsed().as_millis() as u64; + match &outcome { + Ok(outcome) => { + let trashed = crate::unused_media::trash_staged( + &project, + &crate::unused_media::move_to_trash, + ); + tracing::info!(path = %project.display(), ?outcome, ?trashed, elapsed_ms, "Unused clip media cleanup finished"); + } + Err(error) => { + tracing::warn!(path = %project.display(), %error, elapsed_ms, "Unused clip media cleanup failed"); + } + } + done_tx + .send(matches!( + outcome, + Ok(crate::unused_media::Outcome::Cleaned { .. }) + )) + .ok(); + }); + if let Err(error) = spawned { + tracing::warn!(%error, "Could not start the unused clip media cleanup"); + return; + } + cx.spawn(async move |cx| { + if done_rx.recv_async().await.unwrap_or(false) { + cx.update(|cx| crate::recordings_overlay::project_changed(&key, cx)); + } + }) + .detach(); +} + fn take_editor_window( editors: &mut Vec<(PathBuf, WindowHandle)>, key: &Path, @@ -7223,17 +7485,99 @@ pub fn abort_editor_recording_flow(cx: &mut App) { } } -/// The tray's Record Display / Record Window / Record Area. +/// The "Record …" shortcuts and the tray's Record Display / Record Window / +/// Record Area: the picker records, in the saved mode or Studio when that is +/// Screenshot, and the saved mode stays as it is. /// /// `crate::open_target_picker(&app, RecordingTargetMode::*)` over there, which /// sets the target mode on the main window and opens the overlays; here the -/// main window owns that state, so it is the same `arm_overlay` the tiles call. -pub fn arm_target_mode(kind: crate::main_window::TargetType, cx: &mut App) { +/// main window owns that state, so it is armed there, as its tiles arm it. +pub fn arm_record_picker(kind: TargetType, cx: &mut App) { let main = cx.global::().main; - main.update(cx, |view, _window, cx| view.arm_overlay(kind, cx)) + main.update(cx, |view, _window, cx| { + let mode = view.mode().for_recording(); + view.arm_overlay_for(kind, mode, cx) + }) + .ok(); +} + +pub fn arm_picker(kind: TargetType, mode: Mode, cx: &mut App) { + let main = cx.global::().main; + main.update(cx, |view, _window, cx| view.arm_overlay_for(kind, mode, cx)) .ok(); } +/// The "Screenshot …" shortcuts and tray items that need a picker: it takes +/// a screenshot, and the saved mode stays as it is. +pub fn arm_screenshot_picker(kind: TargetType, cx: &mut App) { + let main = cx.global::().main; + main.update(cx, |view, _window, cx| { + view.arm_overlay_for(kind, Mode::Screenshot, cx) + }) + .ok(); +} + +#[cfg(target_os = "macos")] +pub(crate) fn camera_window_id(cx: &mut App) -> Option { + camera_window_number(cx).and_then(|number| number.to_string().parse().ok()) +} + +pub(crate) fn camera_window_open(cx: &App) -> bool { + cx.global::().camera.is_some() +} + +pub(crate) fn camera_preview_shown(cx: &App) -> bool { + let windows = cx.global::(); + windows.camera.is_some() && !windows.camera_preview_hidden +} + +/// The bar's "Show camera preview". Hides and shows the bubble in place; +/// Linux has no native hide for it, so there it closes and reopens. +pub(crate) fn set_camera_preview_shown(shown: bool, cx: &mut App) { + let Some(handle) = cx.global::().camera else { + if shown { + open_camera_window(cx); + // A bubble that could not open yet (a clean capture still holds + // it) stays hidden, so the next reopen tries again. + if cx.global::().camera.is_some() { + cx.global_mut::().camera_preview_hidden = false; + } + } + return; + }; + #[cfg(target_os = "linux")] + { + let _ = handle; + if !shown { + close_camera_window(cx); + // Closing clears the flag; keep the choice so the end of the + // recording reopens the preview, as the other platforms do. + cx.global_mut::().camera_preview_hidden = true; + } + } + #[cfg(not(target_os = "linux"))] + { + if cx.global::().camera_preview_hidden != shown { + return; + } + cx.global_mut::().camera_preview_hidden = !shown; + let native = handle + .update(cx, |_, window, _| platform::native_window(window)) + .ok() + .flatten(); + if let Some(native) = native { + cx.spawn(async move |_| { + if shown { + platform::order_front_native(&native); + } else { + platform::hide_native(&native); + } + }) + .detach(); + } + } +} + fn camera_window_number(cx: &mut App) -> Option { let handle = cx.global::().camera?; handle @@ -7293,15 +7637,12 @@ fn controls_origin(config: &StartConfig) -> (f64, f64) { } } -/// Grow the bar's window upward to make room for an issue card above the -/// bar, or shrink it back to the bar alone, leaving the bar where it is. -/// `setFrame` re-enters gpui, so call this from a task. -pub(crate) fn fit_controls_to_issue(native: &platform::NativeWindow, issue: bool, scale: f32) { - let height = f64::from(if issue { - CONTROLS_HEIGHT - } else { - CONTROLS_BAR_HEIGHT - }); +/// Grow the bar's window upward to `height` to make room for what sits above +/// the bar (an issue, the drawing tools, the settings panel), or shrink it +/// back, leaving the bar where it is. `setFrame` re-enters gpui, so call this +/// from a task. +pub(crate) fn fit_controls(native: &platform::NativeWindow, height: f32, scale: f32) { + let height = f64::from(height); let (x, y, width, current) = platform::window_frame(native); if width <= 0. { return; @@ -7418,14 +7759,21 @@ fn open_controls( /// an overlay still on screen would be in the shot. Returns whether anything /// was up -- the caller's cue to wait the same 150ms the Tauri command waits. pub fn prepare_for_screenshot_capture(cx: &mut App) -> bool { + let overlay_was_visible = + crate::recordings_overlay::hide_for(crate::recordings_overlay::Capture::Screenshot, cx); if cx.global::().overlays.is_empty() { - return false; + return overlay_was_visible; } // The screenshot branch of `onRecordingStart` nulls the saved camera bounds // just like the recording branch does, so a parked bubble stays parked. release_camera_park(cx); keep_arranged_windows(cx); close_target_overlays(cx); + // The picker's capture is handed off, so its command's mode is spent. Not + // when the PNG lands: a picker opened while it is written keeps its own. + let main = cx.global::().main; + main.update(cx, |view, _window, cx| view.end_capture_mode(cx)) + .ok(); true } @@ -7446,10 +7794,11 @@ pub fn empty_overlays_for_screenshot(cx: &mut App) -> Option = recordings.into_iter().collect(); for handle in overlays { let (sender, receiver) = tokio::sync::oneshot::channel(); let scheduled = handle.update(cx, |view, window, cx| { @@ -7495,9 +7844,16 @@ pub fn empty_overlays_for_screenshot(cx: &mut App) -> Option