Merge origin/main into nightly

Browse Source

Resolve conflicts:
- .gitignore: keep nightly additions (.test, skills-lock.json)
- relay/helper/price.go: keep both billingexpr and model imports
- en.json / zh-CN.json: keep nightly's superset of i18n entries
- service/billing_session.go: add missing 3rd arg to DecreaseUserQuota
- en.json / zh-CN.json: deduplicate 129+320 duplicate i18n keys

...

This commit is contained in:

CaIon

2026-04-23 21:23:40 +08:00

parent 55b7e485c1 11f8d42d66

commit 6bde1a9c8d

117 changed files with 9031 additions and 2910 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

web/src/i18n/locales/en.json

Vendored

+368 -321

File diff suppressed because it is too large Load Diff

web/src/i18n/locales/fr.json

Vendored

+381 -196

File diff suppressed because it is too large Load Diff

web/src/i18n/locales/ja.json

Vendored

+363 -190

File diff suppressed because it is too large Load Diff

web/src/i18n/locales/ru.json

Vendored

+395 -204

File diff suppressed because it is too large Load Diff

web/src/i18n/locales/vi.json

Vendored

+364 -194

File diff suppressed because it is too large Load Diff

web/src/i18n/locales/zh-CN.json

Vendored

+1100 -438

File diff suppressed because it is too large Load Diff

web/src/i18n/locales/zh-TW.json

Vendored

+665 -151

File diff suppressed because it is too large Load Diff