From 03938be7899b180f2d3c77f149abe5f1c5856470 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Date: Tue, 30 Dec 2025 11:56:11 +0800
Subject: [PATCH] fix: merge conflict

---
 .../provider-added-card/quota-panel.tsx       | 19 ++++++++++---------
 web/i18n/en-US/billing.json                   |  2 +-
 web/i18n/en-US/common.json                    |  6 +++++-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx
index 90cf1f363c..e3c0330974 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx
@@ -95,20 +95,21 @@ const QuotaPanel: FC<QuotaPanelProps> = ({
   return (
     <div className={cn('my-2 min-w-[72px] shrink-0 rounded-xl border-[0.5px] pb-2.5 pl-4 pr-2.5 pt-3 shadow-xs', credits <= 0 ? 'border-state-destructive-border hover:bg-state-destructive-hover' : 'border-components-panel-border bg-third-party-model-bg-default')}>
       <div className="system-xs-medium-uppercase mb-2 flex h-4 items-center text-text-tertiary">
-        {t('common.modelProvider.quota')}
-        <Tooltip popupContent={t('common.modelProvider.card.tip')} />
+        {t('modelProvider.quota', { ns: 'common' })}
+        <Tooltip popupContent={t('modelProvider.card.tip', { ns: 'common' })} />
       </div>
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-1 text-xs text-text-tertiary">
           <span className="system-md-semibold-uppercase mr-0.5 text-text-secondary">{formatNumber(credits)}</span>
-          <span>{t('common.modelProvider.credits')}</span>
+          <span>{t('modelProvider.credits', { ns: 'common' })}</span>
           {currentWorkspace.next_credit_reset_date
             ? (
                 <>
                   <span>·</span>
                   <span>
-                    {t('common.modelProvider.resetDate', {
-                      date: formatTime(currentWorkspace.next_credit_reset_date, t('appLog.dateFormat') as string),
+                    {t('modelProvider.resetDate', {
+                      ns: 'common',
+                      date: formatTime(currentWorkspace.next_credit_reset_date, t('dateFormat', { ns: 'appLog' })),
                       interpolation: { escapeValue: false },
                     })}
                   </span>
@@ -122,15 +123,15 @@ const QuotaPanel: FC<QuotaPanelProps> = ({
             const usingQuota = providerType === PreferredProviderTypeEnum.system
             const getTooltipKey = () => {
               if (usingQuota)
-                return 'common.modelProvider.card.modelSupported'
+                return 'modelProvider.card.modelSupported'
               if (providerType === PreferredProviderTypeEnum.custom)
-                return 'common.modelProvider.card.modelAPI'
-              return 'common.modelProvider.card.modelNotSupported'
+                return 'modelProvider.card.modelAPI'
+              return 'modelProvider.card.modelNotSupported'
             }
             return (
               <Tooltip
                 key={key}
-                popupContent={t(getTooltipKey(), { modelName: modelNameMap[key] })}
+                popupContent={t(getTooltipKey(), { ns: 'common', modelName: modelNameMap[key] })}
               >
                 <div
                   className={cn('relative h-6 w-6', !providerType && 'cursor-pointer hover:opacity-80')}
diff --git a/web/i18n/en-US/billing.json b/web/i18n/en-US/billing.json
index 1f10a49966..3242aa8e78 100644
--- a/web/i18n/en-US/billing.json
+++ b/web/i18n/en-US/billing.json
@@ -96,7 +96,7 @@
   "plansCommon.memberAfter": "Member",
   "plansCommon.messageRequest.title": "{{count,number}} message credits",
   "plansCommon.messageRequest.titlePerMonth": "{{count,number}} message credits/month",
-  "plansCommon.messageRequest.tooltip": "Message credits are provided to help you easily try out different OpenAI models in Dify. Credits are consumed based on the model type. Once they’re used up, you can switch to your own OpenAI API key.",
+  "plansCommon.messageRequest.tooltip": "Message credits are provided to help you easily try out different models from OpenAI, Anthropic, Gemini, xAI, DeepSeek and Tongyi in Dify. Credits are consumed based on the model type. Once they're used up, you can switch to your own API key.",
   "plansCommon.modelProviders": "Support OpenAI/Anthropic/Llama2/Azure OpenAI/Hugging Face/Replicate",
   "plansCommon.month": "month",
   "plansCommon.mostPopular": "Popular",
diff --git a/web/i18n/en-US/common.json b/web/i18n/en-US/common.json
index f971ff1668..64ac47d804 100644
--- a/web/i18n/en-US/common.json
+++ b/web/i18n/en-US/common.json
@@ -339,13 +339,16 @@
   "modelProvider.callTimes": "Call times",
   "modelProvider.card.buyQuota": "Buy Quota",
   "modelProvider.card.callTimes": "Call times",
+  "modelProvider.card.modelAPI": "{{modelName}} models are using the API Key.",
+  "modelProvider.card.modelNotSupported": "{{modelName}} models are not installed.",
+  "modelProvider.card.modelSupported": "{{modelName}} models are using this quota.",
   "modelProvider.card.onTrial": "On Trial",
   "modelProvider.card.paid": "Paid",
   "modelProvider.card.priorityUse": "Priority use",
   "modelProvider.card.quota": "QUOTA",
   "modelProvider.card.quotaExhausted": "Quota exhausted",
   "modelProvider.card.removeKey": "Remove API Key",
-  "modelProvider.card.tip": "Priority will be given to the paid quota. The Trial quota will be used after the paid quota is exhausted.",
+  "modelProvider.card.tip": "Message Credits supports models from OpenAI, Anthropic, Gemini, xAI, DeepSeek and Tongyi. Priority will be given to the paid quota. The free quota will be used after the paid quota is exhausted.",
   "modelProvider.card.tokens": "Tokens",
   "modelProvider.collapse": "Collapse",
   "modelProvider.config": "Config",
@@ -394,6 +397,7 @@
   "modelProvider.quotaTip": "Remaining available free tokens",
   "modelProvider.rerankModel.key": "Rerank Model",
   "modelProvider.rerankModel.tip": "Rerank model will reorder the candidate document list based on the semantic match with  user query, improving the results of semantic ranking",
+  "modelProvider.resetDate": "Reset on {{date}}",
   "modelProvider.searchModel": "Search model",
   "modelProvider.selectModel": "Select your model",
   "modelProvider.selector.emptySetting": "Please go to settings to configure",