Merge branch 'main' into traduction

# Conflicts:
#	web/src/i18n/locales/zh.json

web/src/i18n/locales/en.json

@@ -837,6 +837,7 @@
   "确定要充值 $": "Confirm to top up $",
   "微信/支付宝 实付金额：": "WeChat/Alipay actual payment amount:",
   "Stripe 实付金额：": "Stripe actual payment amount:",
+  "允许在 Stripe 支付中输入促销码": "Allow entering promotion codes during Stripe checkout",
   "支付中...": "Paying",
   "支付宝": "Alipay",
   "收益统计": "Income statistics",

web/src/i18n/locales/zh.json

@@ -35,5 +35,6 @@
   "域名IP过滤详细说明": "⚠️此功能为实验性选项，域名可能解析到多个 IPv4/IPv6 地址，若开启，请确保 IP 过滤列表覆盖这些地址，否则可能导致访问失败。",
   "common": {
     "changeLanguage": "切换语言"
-  }
+  },
+  "允许在 Stripe 支付中输入促销码": "允许在 Stripe 支付中输入促销码"
 }