i18n(ja): restore English TiDB Cloud UI labels and remove stray quotes - #23554
i18n(ja): restore English TiDB Cloud UI labels and remove stray quotes#23554yahonda wants to merge 24 commits into
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Important Review skippedToo many files! This PR contains 255 files, which is 105 over the limit of 150. To get a review, reduce the PR to 150 files or fewer by splitting it into smaller PRs or changing its base branch. Upgrade to a paid plan to raise the limit. This review couldn't start because sufficient usage credits or metered capacity aren't available. Add credits or update usage-based reviews in the billing tab, then retry. ⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Pro Plus Run ID: 📒 Files selected for processing (255)
You can disable this status message by setting the 📝 WalkthroughWalkthroughThis PR updates Japanese TiDB Cloud documentation to use current English console labels. It covers backup, imports, integrations, monitoring, migrations, billing, security, and administration procedures. Documented workflows and configuration behavior remain unchanged. ChangesEnglish console terminology
Estimated code review effort: 2 (Simple) | ~15 minutes Merge Risk: 🟡 Moderate · up to This documentation-only change restores English console labels across many Japanese procedures, but the current head still includes incorrect labels and cloud/provider instructions plus malformed Markdown and emphasis in several workflows. These defects can misdirect users or make steps render ambiguously, so targeted corrections are needed before merge; the PR does not introduce runtime or availability risk. 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches 💡 1🛠️ Fix failing CI checks 💡
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Independent 6-way review of the 1-word UI-label restoration diff (PR pingcap#23554) found a systemic defect class: wherever the original Japanese bold span already had a trailing particle (を/の/に) or a straddling quote mark (「/」) bundled into its content, the mechanical word-swap replaced the whole bundle with just the bare English word, silently dropping the particle or leaving its quote partner orphaned. Fixed ~25 files worth of these regressions plus a few pre-existing straddling-bracket defects surfaced by the same corpus-wide scan (Destination/Pulsar, Bucket Overview, Description/Support Tickets patterns, Target Database/Target Table reconstruction in naming-conventions-for-data-import.md), a genuine wrong-word bug (Edit/Delete mixed up in data-service-custom-domain.md), and a compound-word-splitting error (一時+Pausing) that should not have been converted at all. Verified via a corpus-wide bracket-balance and duplicate-word scan against upstream: 0 remaining issues across the full diff.
6cc6d76 to
d37666a
Compare
d37666a to
d3a2b20
Compare
Corpus-wide sweep for the 1-word UI-label restoration campaign (the final and highest-false-positive-risk batch after the 4/3-word and 2-word batches). Regenerated the candidate list fresh (329 words, 2,039 occurrences) via EN/JA bold-span positional pairing, restricted to files where EN and JA bold-span counts match per file. Verification: each candidate word was checked against the actual TiDB Cloud console frontend source (dbaas-ui) for a genuine rendered UI string (label/title/name/placeholder/data-mp-event/tight JSX text), not a source comment or prose-embedded coincidental match. Only words with at least one such confirmation were restored, and only at occurrences where the specific sentence context is a genuine UI reference rather than generic descriptive prose (the same "category header vs UI reference" trap documented in earlier batches, e.g. a word can be a real dbaas-ui field name AND a common noun used to introduce a concept elsewhere). Fixed 1606 occurrences across 145 files via this method, plus several occurrences requiring manual reconstruction rather than a simple content swap: - Trapped particles/oversized spans where the original Japanese bold span included more than the bare term (a trailing particle, a wrapping quote plus particle, or a full verb phrase) - reconstructed to keep only the label bolded and the rest as plain text. - Several EN/JA clause-reordering mispairs (the same sentence bolds terms in a different order between EN and JA, causing positional extraction to pair the wrong span) - found via independent re-verification and targeted anomaly scans (duplicate-word-per-line, verb-ending-inside-bold, oversized-span-length checks), then fixed by hand against the EN source. - A few adjacent defects found while touching these lines: a false-friend mistranslation (Alpine misrendered as 高山), a missing menu-path fix (Settings > Networking rendered as Networking > 「ネットワーク」 in 3 files), and a couple of stray-quote/bracket cleanups on the same lines per the standing policy of removing decoration EN doesn't have. Verification: corpus-wide bracket/`**`-parity check across the full diff found 0 issues across 145 files; a same-line-duplicate-word scan and a verb-phrase-inside-bold scan (both used to catch the reordering/oversized-span defect classes) found 0 remaining issues after fixes were applied.
Reverted per feedback: unlike the adjacent Limitations/Permissions bullet headers being purely descriptive prose labels (not literal TiDB Cloud UI strings), keep this one in Japanese as a plain bold term rather than restoring the English word.
- Restore Pending (保留中) to English in 4 private-endpoint status lists, matching sibling statuses (Active/Deleting/Failed/Creating) already fixed in the same bullet lists in these files. - Resolve 3 occurrences of Enable that a verification pass had flagged as a positional-mismatch artifact and skipped without a manual follow-up: dual-layer-data-encryption-premium.md (2x, click Enable in the Dual-Layer Data Encryption section) and tidb-node-group-management.md (1x, click Enable in the Public Endpoint section, also restoring the Public Endpoint label).
Independent 6-way review of the 1-word UI-label restoration diff (PR bold span already had a trailing particle (を/の/に) or a straddling quote mark (「/」) bundled into its content, the mechanical word-swap replaced the whole bundle with just the bare English word, silently dropping the particle or leaving its quote partner orphaned. Fixed ~25 files worth of these regressions plus a few pre-existing straddling-bracket defects surfaced by the same corpus-wide scan (Destination/Pulsar, Bucket Overview, Description/Support Tickets patterns, Target Database/Target Table reconstruction in naming-conventions-for-data-import.md), a genuine wrong-word bug (Edit/Delete mixed up in data-service-custom-domain.md), and a compound-word-splitting error (一時+Pausing) that should not have been converted at all. Verified via a corpus-wide bracket-balance and duplicate-word scan against upstream: 0 remaining issues across the full diff.
d3a2b20 to
edecb6d
Compare
|
Caution CodeRabbit couldn't update its existing comment. The review summary may be out of date. Error details |
The English source never wraps a bold UI-label span (e.g. Click **Connect**) in quotes, but the ja translation had accumulated 「」 around many such spans (e.g. **「接続」**), across single-word button labels, symbols (**「+」**, **「...」**), and longer descriptive labels (**「クラウドストレージからデータをインポート」**). Verified this pattern holds against EN for a representative sample across short and long labels before doing a mechanical, corpus-wide strip: **「X」** -> **X**, applied only where the quote marks sit immediately inside the bold delimiters (1,577 occurrences across 233 files). This supersedes the narrower carve-outs used in PR pingcap#23551/pingcap#23552, which kept a handful of terms quoted for in-file convention (接続 タイプ, スキーマロード, 接続方法, 組織設定, etc.) - per the standing policy, in-file consistency is not a reason to keep quoting a term EN never quotes. Verified per-file: line count, ** count, [ count, and ] count are all unchanged (0 anomalies across all 233 changed files) - only the 「」 characters were removed. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…026-08-18 Resolved 118 file conflicts: took this branch's English-restoration fixes as the base, then re-applied the quote-stripping substitution (**「X」**->**X**) on top, so both fixes combine cleanly. Verified 0 remaining quote-wrapped bold spans and 0 bracket-count anomalies across all 118 files. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
|
test seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
|
The PR title mentions "restore 1-word TiDB Cloud UI labels to English", but these 1-word TiDB Cloud UI labels are still in Japanese in the current PR. |
Human reviewer feedback on PR pingcap#23554 (qiancai) noted that some 1-word TiDB Cloud UI labels claimed to be restored in that PR were still in Japanese. Investigation confirmed this: the original positional bold-span-pairing method restricted itself to "files where EN and JA bold-span counts match per file", silently skipping every file where counts didn't match - even though individual lines within those files still had clean, unambiguous EN/JA correspondences. Re-swept using a per-line EN/JA line-window match (each JA line checked against a +/-10 line window of the EN source for the literal English bold term, not file-level bold-count parity) across a curated list of ~30 common TiDB Cloud console button/label words. Every one of the 232 sites below was individually confirmed against the EN source at that exact position before fixing - no blind global find/replace. Biggest misses, all now fixed: - **接続** -> **Connect** (116 occurrences, 59 files) - the single biggest miss; "Connect" is one of the most common buttons across the entire TiDB Cloud console and appears in dozens of client integration guides. - **概要** -> **Overview** (31), **次へ** -> **Next** (14), **インポート** -> **Import** (11), **ダウンロード** -> **Download** (9), **作成** -> **Create** (6), **設定** -> **Settings** (6), **保存** -> **Save** (5), **追加** -> **Add** (4), **編集** -> **Edit** (4), **再起動** -> **Restart** (4), **続行** -> **Continue** (3), **エクスポート** -> **Export** (3), **検索** -> **Search** (2), **メンバー** -> **Members** (2), **招待** -> **Invite** (2), **接続する** -> **Connect** (2), and 6 single-occurrence terms (削除/Delete, 確認/Confirm, キャンセル/Cancel, 再試行/Retry, ダッシュボード/Dashboard, 開始/Start). - Bonus: develop/dev-guide-gui-navicat.md's "**接続**" (2 occurrences) actually corresponds to EN "**Connection**" (Navicat's own top-left button, not TiDB Cloud's "Connect" button) - fixed to the correct English word rather than "Connect". Explicitly NOT fixed (checked and excluded): a third-party-tool "**接続**" in the Airbyte integration guide corresponds to EN "**Connections**" (Airbyte's own sidebar tab name, not TiDB Cloud's dbaas-ui, and a different word besides), left as a separate, lower-priority candidate for a future pass if that vendor's UI is ever verified. This was itself found while double-checking the 接続->Connect sweep for false positives, not part of the original review comment. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
|
@qiancai Thank you for catching this — you were right, and investigating it turned up a real gap in the original sweep. What was actually wrong: the original method restricted itself to files where the EN and JA bold-span ( I re-swept using a per-line EN/JA match instead (checking each Japanese line against the English source around that exact position, not file-level bold-count parity), and found 232 additional genuine misses across 88 files, now fixed and pushed. The biggest one was One clarification, in case it helps when re-reviewing the diff: this branch also has an earlier quote-stripping commit merged in (removing stray |
Found via a corpus-wide scan for bold JA spans immediately followed by a UI-interaction verb (クリック/選択/オン/オフ/等), then checked against the EN source at each site. Covers both remaining 1-word terms (Public, Authorize, Publish, Previous, Resume/Resuming/Restart, default, Allow, Finish, Zone, Object, Container, Custom, Branching, Yes, Expand, Copy, Columns, Refresh, Database) and multi-word phrases (Reset Password, Generate Password, Test Connection, Connection test, Server and Port, SAVE CONNECTION, Add environment variable, Enable Feature, Open Settings, Successfully connected!) across 67 files.
|
Follow-up round: I ran a more systematic scan (every bold Japanese span immediately followed by a UI-interaction verb such as クリック/選択/オン/オフ, corpus-wide, not limited to a hand-picked word list) and checked each hit against the EN source at that exact line. This found 67 more files with residual Japanese where EN uses a literal UI string, pushed in 77bcb35's follow-up commit. Some are single words (e.g. パブリック→Public, 承認→Authorize, 再開→Resume/Resuming/Restart depending on context, 完了→Finish, データベース→Database), but a good number are multi-word phrases that the earlier 2/3/4-word restoration passes (#23535, #23541, #23519) also missed for the same underlying reason — e.g. パスワードをリセット→Reset Password, パスワードを生成→Generate Password, 接続テスト→Test Connection (or Connection test for the dialog name, verified per-line since the same JA word maps to two different EN strings depending on context), サーバーとポート→Server and Port, 環境変数の追加→Add environment variable, 機能の有効化→Enable Feature, 設定を開く→Open Settings. So to directly address the concern that prompted this thread: it wasn't only the 1-word pass that had gaps — the already-merged multi-word passes had the same class of miss, just not yet found because nobody had scanned for it systematically. This scan-by-UI-verb-suffix method doesn't depend on word count, so it should catch both going forward. I'll keep sweeping for any further misses. |
An earlier commit removed stray Japanese quote marks wrapping bold UI spans (e.g. **「接続」** -> **接続**) but left the underlying Japanese word untranslated even where it is genuine literal UI copy (button labels, dropdown values, dialog titles, field/tab names) that the TiDB Cloud console or third-party tool UIs only render in English. Verified every bold span touched by that commit against the EN source (matching by CustomContent plan block / surrounding context rather than raw line numbers, since JA and EN diverge), and restored the correct English string per site across 145 files. Also caught and fixed several orphaned quote marks and garbled bold-span boundaries uncovered along the way in the same shared GUI-connection-guide templates (MySQL Workbench / DBeaver / DataGrip / Navicat / VS Code SQLTools / sample-application guides), plus one pre-existing >-vs->-arrow inconsistency in tidb-troubleshooting-map.md.
|
Third round, directly addressing the earlier point about the quote-removal pass leaving residual Japanese behind: I took the exact commit that stripped stray 「」 quotes from bold UI spans, extracted all ~435 distinct bold spans it touched across 233 files, and checked every one of them against the EN source (matching by Result: 145 files fixed (commit 27228b1), covering both short (パブリック→Public, 承認→Authorize, 送信→SUBMIT) and long UI strings (データベース監査ログストレージ設定→Database Audit Log Storage Configuration, 「TiDB ファイル命名規則を使用して自動マッピングを行う」→Use TiDB File Naming Conventions for auto-mapping, etc.), plus several orphaned/garbled quote artifacts uncovered along the way in the same GUI-connection-guide templates (MySQL Workbench, DBeaver, DataGrip, Navicat, VS Code SQLTools). One thing worth flagging separately: while reviewing sibling files I found that the original quote-removal commit itself didn't cover the whole corpus — there's a further population of the same stray-「」-around-English-UI-label pattern in files that commit never touched at all (e.g. dashboard-key-visualizer.md, dm-webui-guide.md, several tidb-cloud/*.md files). That's out of scope for this PR's fix (which is bounded to what the earlier commit actually touched) but is a real follow-up worth its own pass. |
…ginal scan Follow-up fixes surfaced while spot-checking sibling files in the same GUI-connection-guide template family: Connect With / Generate Password boilerplate variants not caught by the first pass, a Metrics/Graph Tooltip Grafana panel label, and a garbled multi-bracket MySQL CLI connection sentence.
Extends the earlier quote-removal follow-up beyond the one commit's touched-file set: grepped the whole tree for bold spans still straddling stray 「」 quote marks, verified each against the EN source, and restored the literal English UI string (or, where the label is a legitimate JA gloss rather than a UI restore candidate, just removed the stray quote and kept the JA text). Covers dashboard/, develop/, dm/, and tidb-cloud/ guides; left two genuine non-UI quotations untouched (a benchmark table's own column headers, an already-Japanese field name used consistently elsewhere in its file).
|
Fourth round: went back to the broader gap flagged in my last comment (the stray-「」-around-untranslated-English-UI-label pattern existing outside the original quote-removal commit's touched files) and swept the whole corpus for it — `grep -rn '「**|**」|」**|**「'` across every .md file, then verified each hit against the EN source the same way as before. Fixed ~90 more sites across 50 files (commit ed26922), including several dev-guide-gui-.md / dev-guide-sample-application-.md boilerplate variants the earlier passes hadn't reached yet (Connect With, Generate Password, Test and Add KMS Key ARN, Register a new connector, Add Integration and Return to Vercel, etc.), some badly garbled bold-boundary cases (an A corpus-wide re-grep after this round now returns zero hits for this pattern, except two confirmed-legitimate cases (a benchmark report's own table column headers, and one field name that's consistently kept in Japanese elsewhere in its own file per that file's established convention). I'm reasonably confident this specific defect class is now closed corpus-wide. |
|
Addressing conflicts soon. |
# Conflicts: # ai/examples/auto-embedding-with-pytidb.md # ai/examples/basic-with-pytidb.md # ai/examples/fulltext-search-with-pytidb.md # ai/examples/hybrid-search-with-pytidb.md # ai/examples/image-search-with-pytidb.md # ai/examples/memory-with-pytidb.md # ai/examples/rag-with-pytidb.md # ai/examples/vector-search-with-pytidb.md # ai/guides/connect.md # ai/guides/vector-search-full-text-search-python.md # ai/guides/vector-search-hybrid-search.md # ai/integrations/tidb-mcp-claude-code.md # ai/integrations/tidb-mcp-claude-desktop.md # ai/integrations/tidb-mcp-cursor.md # ai/integrations/tidb-mcp-server.md # ai/integrations/tidb-mcp-vscode.md # ai/integrations/tidb-mcp-windsurf.md # ai/integrations/vector-search-integrate-with-amazon-bedrock.md # ai/integrations/vector-search-integrate-with-django-orm.md # ai/integrations/vector-search-integrate-with-jinaai-embedding.md # ai/integrations/vector-search-integrate-with-langchain.md # ai/integrations/vector-search-integrate-with-llamaindex.md # ai/integrations/vector-search-integrate-with-peewee.md # ai/integrations/vector-search-integrate-with-sqlalchemy.md # ai/quickstart-via-python.md # ai/quickstart-via-sql.md # ai/vector-search-get-started-using-python.md # best-practices/grafana-monitor-best-practices.md # best-practices/saas-best-practices.md # clinic/clinic-user-guide-for-tiup.md # clinic/quick-start-with-clinic.md # configure-store-limit.md # dashboard/continuous-profiling.md # dashboard/dashboard-access.md # dashboard/dashboard-diagnostics-access.md # dashboard/dashboard-diagnostics-report.md # dashboard/dashboard-diagnostics-usage.md # dashboard/dashboard-faq.md # dashboard/dashboard-key-visualizer.md # dashboard/dashboard-log-search.md # dashboard/dashboard-metrics-relation.md # dashboard/dashboard-monitoring.md # dashboard/dashboard-overview.md # dashboard/dashboard-profiling.md # dashboard/dashboard-session-sso.md # dashboard/dashboard-slow-query.md # dashboard/dashboard-statement-details.md # dashboard/dashboard-statement-list.md # dashboard/top-sql.md # deploy-monitoring-services.md # develop/dev-guide-aws-appflow-integration.md # develop/dev-guide-bookshop-schema-design.md # develop/dev-guide-build-cluster-in-cloud.md # develop/dev-guide-gui-datagrip.md # develop/dev-guide-gui-dbeaver.md # develop/dev-guide-gui-mysql-workbench.md # develop/dev-guide-gui-navicat.md # develop/dev-guide-gui-vscode-sqltools.md # develop/dev-guide-sample-application-aws-lambda.md # develop/dev-guide-sample-application-golang-gorm.md # develop/dev-guide-sample-application-golang-sql-driver.md # develop/dev-guide-sample-application-java-hibernate.md # develop/dev-guide-sample-application-java-jdbc.md # develop/dev-guide-sample-application-java-mybatis.md # develop/dev-guide-sample-application-java-spring-boot.md # develop/dev-guide-sample-application-nextjs.md # develop/dev-guide-sample-application-nodejs-mysql2.md # develop/dev-guide-sample-application-nodejs-mysqljs.md # develop/dev-guide-sample-application-nodejs-prisma.md # develop/dev-guide-sample-application-nodejs-sequelize.md # develop/dev-guide-sample-application-nodejs-typeorm.md # develop/dev-guide-sample-application-python-django.md # develop/dev-guide-sample-application-python-mysql-connector.md # develop/dev-guide-sample-application-python-mysqlclient.md # develop/dev-guide-sample-application-python-peewee.md # develop/dev-guide-sample-application-python-pymysql.md # develop/dev-guide-sample-application-python-sqlalchemy.md # develop/dev-guide-sample-application-ruby-mysql2.md # develop/dev-guide-sample-application-ruby-rails.md # develop/dev-guide-wordpress.md # develop/serverless-driver-drizzle-example.md # develop/serverless-driver-kysely-example.md # develop/serverless-driver-node-example.md # develop/serverless-driver-prisma-example.md # dm/dm-webui-guide.md # encryption-at-rest.md # external-storage-uri.md # pd-recover.md # resources/tidb-pdf-generation-tutorial.md # schema-cache.md # sql-non-prepared-plan-cache.md # sql-tuning-best-practice.md # ticdc/integrate-confluent-using-ticdc.md # tidb-cloud/backup-and-restore-serverless.md # tidb-cloud/backup-and-restore.md # tidb-cloud/branch-github-integration.md # tidb-cloud/branch-manage.md # tidb-cloud/changefeed-overview.md # tidb-cloud/changefeed-sink-to-apache-kafka.md # tidb-cloud/changefeed-sink-to-apache-pulsar.md # tidb-cloud/changefeed-sink-to-cloud-storage.md # tidb-cloud/changefeed-sink-to-mysql.md # tidb-cloud/changefeed-sink-to-tidb-cloud.md # tidb-cloud/configure-external-storage-access.md # tidb-cloud/configure-maintenance-window.md # tidb-cloud/configure-serverless-firewall-rules-for-public-endpoints.md # tidb-cloud/configure-sql-users.md # tidb-cloud/connect-via-sql-shell.md # tidb-cloud/connect-via-standard-connection-serverless.md # tidb-cloud/connect-via-standard-connection.md # tidb-cloud/connected-lark-ticket-creation.md # tidb-cloud/connected-slack-ticket-creation.md # tidb-cloud/connected-slack-ticket-interaction.md # tidb-cloud/cppo-customer.md # tidb-cloud/create-tidb-cluster-serverless.md # tidb-cloud/create-tidb-cluster.md # tidb-cloud/data-service-api-key.md # tidb-cloud/data-service-custom-domain.md # tidb-cloud/data-service-get-started.md # tidb-cloud/data-service-integrations.md # tidb-cloud/data-service-manage-data-app.md # tidb-cloud/data-service-manage-endpoint.md # tidb-cloud/data-service-manage-github-connection.md # tidb-cloud/data-service-oas-with-nextjs.md # tidb-cloud/data-service-postman-integration.md # tidb-cloud/dedicated-external-storage.md # tidb-cloud/delete-tidb-cluster.md # tidb-cloud/essential-changefeed-overview.md # tidb-cloud/essential-changefeed-sink-to-kafka.md # tidb-cloud/essential-changefeed-sink-to-mysql.md # tidb-cloud/essential-database-audit-logging.md # tidb-cloud/explore-data-with-chat2query.md # tidb-cloud/import-csv-files-serverless.md # tidb-cloud/import-csv-files.md # tidb-cloud/import-parquet-files-serverless.md # tidb-cloud/import-parquet-files.md # tidb-cloud/import-sample-data-serverless.md # tidb-cloud/import-sample-data.md # tidb-cloud/import-with-mysql-cli-serverless.md # tidb-cloud/import-with-mysql-cli.md # tidb-cloud/integrate-tidbcloud-with-airbyte.md # tidb-cloud/integrate-tidbcloud-with-n8n.md # tidb-cloud/integrate-tidbcloud-with-netlify.md # tidb-cloud/integrate-tidbcloud-with-vercel.md # tidb-cloud/integrate-tidbcloud-with-zapier.md # tidb-cloud/manage-projects-and-resources.md # tidb-cloud/manage-user-access.md # tidb-cloud/migrate-from-mysql-using-aws-dms.md # tidb-cloud/migrate-from-mysql-using-data-migration.md # tidb-cloud/migrate-from-op-tidb.md # tidb-cloud/migrate-from-oracle-using-aws-dms.md # tidb-cloud/migrate-incremental-data-from-mysql-using-data-migration.md # tidb-cloud/migrate-metrics-integrations.md # tidb-cloud/migrate-prometheus-metrics-integrations.md # tidb-cloud/migrate-sql-shards.md # tidb-cloud/monitor-alert-email.md # tidb-cloud/monitor-alert-flashduty.md # tidb-cloud/monitor-alert-pagerduty.md # tidb-cloud/monitor-alert-slack.md # tidb-cloud/monitor-alert-zoom.md # tidb-cloud/monitor-built-in-alerting.md # tidb-cloud/monitor-datadog-integration.md # tidb-cloud/monitor-new-relic-integration.md # tidb-cloud/monitor-prometheus-and-grafana-integration.md # tidb-cloud/monitor-tidb-cluster.md # tidb-cloud/notifications.md # tidb-cloud/oauth2.md # tidb-cloud/pause-or-resume-tidb-cluster.md # tidb-cloud/premium/backup-and-restore-premium.md # tidb-cloud/premium/configure-ip-access-list-premium.md # tidb-cloud/premium/connect-to-premium-via-alibaba-cloud-private-endpoint.md # tidb-cloud/premium/connect-to-premium-via-public-connection.md # tidb-cloud/premium/create-tidb-instance-premium.md # tidb-cloud/premium/dual-layer-data-encryption-premium.md # tidb-cloud/premium/import-csv-files-premium.md # tidb-cloud/premium/import-from-s3-premium.md # tidb-cloud/premium/import-with-mysql-cli-premium.md # tidb-cloud/premium/migrate-from-op-tidb-premium.md # tidb-cloud/premium/premium-export.md # tidb-cloud/premium/set-up-sink-private-endpoint-premium.md # tidb-cloud/premium/tidb-cloud-auditing-premium.md # tidb-cloud/premium/tidb-cloud-tls-connect-to-premium.md # tidb-cloud/recovery-group-delete.md # tidb-cloud/recovery-group-failover.md # tidb-cloud/recovery-group-get-started.md # tidb-cloud/releases/release-notes-2021.md # tidb-cloud/releases/release-notes-2022.md # tidb-cloud/releases/release-notes-2023.md # tidb-cloud/releases/release-notes-2024.md # tidb-cloud/releases/release-notes-2025.md # tidb-cloud/releases/tidb-cloud-release-notes.md # tidb-cloud/secure-connections-to-serverless-clusters.md # tidb-cloud/select-cluster-tier.md # tidb-cloud/serverless-export.md # tidb-cloud/serverless-private-link-connection-to-amazon-msk.md # tidb-cloud/serverless-private-link-connection-to-aws-rds.md # tidb-cloud/set-up-private-endpoint-connections-on-alibaba-cloud.md # tidb-cloud/set-up-private-endpoint-connections-on-azure.md # tidb-cloud/set-up-private-endpoint-connections-on-google-cloud.md # tidb-cloud/set-up-private-endpoint-connections-serverless.md # tidb-cloud/set-up-sink-private-endpoint.md # tidb-cloud/setup-aws-self-hosted-kafka-private-link-service.md # tidb-cloud/setup-azure-self-hosted-kafka-private-link-service.md # tidb-cloud/setup-self-hosted-kafka-private-service-connect.md # tidb-cloud/size-your-cluster.md # tidb-cloud/tidb-cloud-auditing.md # tidb-cloud/tidb-cloud-billing.md # tidb-cloud/tidb-cloud-budget.md # tidb-cloud/tidb-cloud-clinic.md # tidb-cloud/tidb-cloud-dm-precheck-and-troubleshooting.md # tidb-cloud/tidb-cloud-import-local-files.md # tidb-cloud/tidb-cloud-log-redaction.md # tidb-cloud/tidb-cloud-org-sso-authentication.md # tidb-cloud/tidb-cloud-password-authentication.md # tidb-cloud/tidb-cloud-poc.md # tidb-cloud/tidb-cloud-quickstart.md # tidb-cloud/tidb-cloud-tls-connect-to-dedicated.md # tidb-cloud/tidb-cloud-tune-performance-overview.md # tidb-cloud/tidb-node-group-management.md # tidb-cloud/tiproxy-management.md # tidb-cloud/top-ru.md # tidb-cloud/upgrade-tidb-cluster.md # tidb-cloud/use-chat2query-api.md # tidb-lightning/tidb-lightning-web-interface.md # tidb-monitoring-framework.md # tidb-troubleshooting-map.md # troubleshoot-high-disk-io.md # troubleshoot-tidb-oom.md
|
Resolved the merge conflict against `i18n-ja-release-8.5` (228 files / 865 hunks). Root cause: upstream sync commit b0387bb ("translate doc changes from pingcap/docs release-8.5 on 2026-08-20") re-ran machine translation across a large batch of files and blindly reverted this PR's English-UI-label restorations back to Japanese — in one case even reintroducing the exact `->` vs `->` escaping bug fixed earlier in this same PR. I spot-checked a broad sample of the conflicting hunks before resolving: every one fit this same pattern (their side = fresh MT reverting our fix, no genuinely new content in the conflicting region itself). Resolved by keeping our side for every conflicting hunk specifically, while keeping the sync's auto-merged (non-conflicting) content everywhere else in those same files — several files did carry legitimate, unrelated improvements from the sync (e.g. some prerequisite-list phrasing cleanup, one accidental independent restoration of "Jupyter Notebook") which are preserved. Worth flagging: this class of conflict will likely recur on any future re-sync unless the upstream translation pipeline itself avoids re-translating already-reviewed English UI labels back into Japanese. |
EN says "click Install in Cursor" (location), not a direct-object click target, so the correct particle is で not に.
…m UI labels
Fix the TiDB Cloud connection-dialog checklist template repeated across
33 develop/*.md and ai/*.md files:
- Connection Type and Branch had been translated to Japanese
(接続タイプ / ブランチ) while Connect With and other sibling fields in
the same list stayed in English, per EN source which bolds all four
field names literally (Connection Type / Branch / Connect With /
Operating System).
- Several files had "Connect With" with the topic particle は trapped
inside the bold span ("**Connect With は**") instead of outside it.
- Operating System was translated (オペレーティングシステム) in most
files; in a 5-file subset the は particle was also trapped inside the
bold span.
- dev-guide-wordpress.md additionally had Database's は trapped inside
the bold span.
All values verified against the EN source (upstream/release-8.5) at the
corresponding sentence position.
Fix dashboard-diagnostics-access.md and dashboard-metrics-relation.md: Range Start Time, Range Duration, Start, Compare by Baseline, Baseline Range Start Time, and Cluster Diagnostics had been translated to Japanese (some also with the topic particle trapped inside the bold span, or wrapped in brackets) instead of kept as the literal English TiDB Dashboard UI labels, verified against upstream/release-8.5.
Chrome DevTools panel and menu names (Application, Local Storage) stay in English regardless of the browser's display language, matching the EN source's literal bold UI strings. Restore them from アプリケーション /ローカルストレージ to English, consistent with the third-party-tool-UI scope of this campaign.
dashboard-log-search.md: the Download Selected button had been fully translated (選択項目をダウンロード) while its sibling buttons Cancel/ Retry stayed in English; and the Running status bold label had been translated (実行中) while its siblings Success/Failed stayed in English. Restore both to match the EN source and sibling convention.
dashboard-overview.md: four UI labels had been translated to Japanese or wrapped in brackets while sibling labels in the same lists/notes stayed in English (View Alerts, and the Note's own reference to "View Metrics"), creating self-contradictions: - **[概要]** -> **Overview** (left nav menu item) - **インスタンスの** (trapped particle) -> **Instance**のタイトル - **メトリクスの表示** -> **View Metrics** - **診断の実行** -> **Run Diagnostics**
…n-sso.md Full pass over the file against the EN source. Fixes: - Missing を particle before ご覧ください in the SYSTEM_VARIABLES_ADMIN note. - Bracket-wrapped Japanese translations of TiDB Dashboard UI labels (Single Sign-On, Authorize and Save, Update, Authorize Impersonation, Sign in via Company Account, Sign On, Settings) restored to literal English, matching the EN source's bold UI strings. - Okta/Auth0 dialog field names (Sign-in method, Application Type, Single-Page Application, Sign-in/Sign-out redirect URIs, Assignments, OpenID Connect ID Token, Basic Information, Display name) restored to English. - OIDC Client ID / OIDC Discovery URL / Client ID / Domain field names (TiDB Dashboard's own SSO settings fields, referenced repeatedly throughout the file) unified to literal English instead of a mix of katakana and English.
The Domain-field-value prefix/suffix instruction was missing its verb object particle, reading as an incomplete sentence. Rephrase using the established "先頭にX、末尾にYを追加して" pattern already used for the same kind of instruction in tidb-cloud/dedicated-external-storage.md.
dashboard-slow-query.md: ☰ menu tooltip (その他 -> More), the Export button (translated to エクスポート with the particle trapped inside bold right after being correctly called Export one sentence earlier), and two column headers (終了時刻 -> Finish Time, 説明 -> Description) restored to the literal English TiDB Dashboard UI strings.
…e UI labels - Fix dev-guide-bookshop-schema-design.md: Data Format, Folder URI, Bucket Access, Role ARN, and the Import Data from Amazon S3 page title had been translated to Japanese instead of kept as literal TiDB Cloud UI strings. - Fix dev-guide-gui-datagrip.md: bracket-wrapped Data Source and Drivers window name restored to English. - Fix dev-guide-gui-dbeaver.md: Driver properties tab, CA certificate field, and Server Host/Port connection-form field names restored to English (some had the topic particle trapped inside the bold span). - Fix the repeated "In addition to the Public connection type, ... supports Private Endpoint connections" / "... supports Private Endpoint and VPC Peering connection types" boilerplate across all 26 develop/dev-guide-*.md files that include it: Private Endpoint and VPC Peering had been translated to katakana (プライベート エンドポイント / VPC ピアリング) while the sibling term Public stayed in English in the same sentence. All values verified against upstream/release-8.5 at the corresponding sentence position.
- dev-guide-gui-dbeaver.md: "SSLを使用する" -> "Use SSL" (isolated occurrence; sibling files datagrip.md/navicat.md already used the correct English checkbox label). - dev-guide-gui-vscode-sqltools.md: full pass restoring every VS Code/SQLTools UI field and button name to literal English (Connection name/group, Connect using, Server Address, Port, Username, Password mode, SQLTools Driver Credentials, MySQL driver specific options, Install, Extensions, CONNECTIONS, Add New Connection, Settings, Networking, Public Endpoint, Enable, Add IP Address, Enabled, Disabled, SSL Options (node.TLSSocket), Certificate Authority (CA) Certificate File, TEST CONNECTION), most of which had been translated to Japanese or wrapped in brackets while sibling fields in the same lists stayed correctly in English. Verified the file now has full 1:1 parity of bold English UI terms against upstream/release-8.5.
…ple-app files Systematic pass: extracted every bold English UI term from the EN source for each file and diffed against the JA file's bold terms, fixing every gap found. - dev-guide-gui-datagrip.md: Settings, Networking, Advanced tab, DataGrip field table header, and Host/Port/User/Password (both connection-string mapping tables and the Self-Managed bullet list) restored to English; also fixed a second occurrence of the bracket-wrapped Data Source and Drivers window name. - dev-guide-gui-dbeaver.md: Settings > Networking restored to English. - dev-guide-gui-navicat.md: Connection Name, Host, Port, User Name, Password, Settings, Networking, Public Endpoint, Enable, and Add IP Address restored to English. - dev-guide-gui-mysql-workbench.md: Connection Name, Hostname, Port, Username, Password, Store in Keychain .../Store in Vault, Settings, and Workbench Preferences restored to English. - All 21 develop/dev-guide-sample-application-*.md files: the bracket-wrapped "Settings > Networking" left navigation instruction restored to English (identical boilerplate across all files). - dev-guide-sample-application-aws-lambda.md: Functions page link text, Configuration tab, and Environment variables restored to English. - dev-guide-sample-application-ruby-rails.md: Connect With and Connection Type restored to English (were bracket-wrapped and translated, inconsistent with the same file's other two occurrences which were already correct English). Confirmed each file now has full 1:1 parity of bold English UI terms against upstream/release-8.5 (excluding a handful of unrelated prose-emphasis bold terms like MUST/RECOMMENDED and code-example section headings, which are not UI labels and out of scope here).
What is changed, added or deleted? (Required)
Corpus-wide sweep for the 1-word UI-label restoration campaign (the final and highest-false-positive-risk batch after the earlier 4/3-word and 2-word batches). Regenerated the candidate list fresh (329 words, 2,039 occurrences) via EN/JA bold-span positional pairing, restricted to files where EN and JA bold-span counts match per file.
Verification: each candidate word was checked against the actual TiDB Cloud console frontend source (dbaas-ui) for a genuine rendered UI string (
label:/title:/name:/placeholder:/data-mp-event/tight JSX text), not a source comment or prose-embedded coincidental match. Only words with at least one such confirmation were restored, and only at occurrences where the specific sentence context is a genuine UI reference rather than generic descriptive prose (the "category header vs UI reference" trap — a word can be a real dbaas-ui field name AND a common noun used to introduce a concept elsewhere).Fixed over 1600 occurrences across 145 files via this method, plus several occurrences requiring manual reconstruction rather than a simple content swap:
Verification
**-parity check across the full diff: 0 issues.Which TiDB version(s) do your changes apply to? (Required)
Tips for choosing the affected version(s):
By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.
For details, see tips for choosing the affected versions.
What is the related PR or file link(s)?
AI agent involvement
Do your changes match any of the following descriptions?
Summary by CodeRabbit