diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json index 9a5e61122e..d62eb985de 100644 --- a/src/renderer/src/i18n/locales/en-us.json +++ b/src/renderer/src/i18n/locales/en-us.json @@ -1848,6 +1848,10 @@ "subscribe_name.placeholder": "Alternative name used when the downloaded subscription feed has no name.", "subscribe_add_success": "Subscription feed added successfully!", "subscribe_delete": "Delete", + "subscribe_add_failed": "Failed to add blacklist subscription", + "subscribe_update_success": "Blacklist subscription updated successfully", + "subscribe_update_failed": "Failed to update blacklist subscription", + "subscribe_source_update_failed": "Failed to update blacklist subscription source", "overwrite": "Override search service", "overwrite_tooltip": "Force use search service instead of LLM", "apikey": "API key", diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json index b1b03c4f3b..b4b660d9c1 100644 --- a/src/renderer/src/i18n/locales/ja-jp.json +++ b/src/renderer/src/i18n/locales/ja-jp.json @@ -1860,7 +1860,11 @@ "provider_not_found": "プロバイダーが見つかりません", "rag_failed": "RAG に失敗しました" } - } + }, + "subscribe_add_failed": "ブラックリスト購読の追加に失敗しました", + "subscribe_update_success": "ブラックリスト購読が正常に更新されました", + "subscribe_update_failed": "ブラックリスト購読の更新に失敗しました", + "subscribe_source_update_failed": "ブラックリスト購読ソースの更新に失敗しました" }, "general.auto_check_update.title": "自動更新", "general.test_plan.title": "テストプラン", diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json index 46faee8677..b31008607c 100644 --- a/src/renderer/src/i18n/locales/ru-ru.json +++ b/src/renderer/src/i18n/locales/ru-ru.json @@ -984,7 +984,7 @@ "per_images": "за изображения", "required_field": "Обязательное поле", "uploaded_input": "Загруженный ввод", - "prompt_placeholder_en": "[to be translated]:Enter your image description, currently Imagen only supports English prompts" + "prompt_placeholder_en": "Введите описание изображения, в настоящее время Imagen поддерживает только английские подсказки" }, "prompts": { "explanation": "Объясните мне этот концепт", @@ -1860,7 +1860,11 @@ "provider_not_found": "Поставщик не найден", "rag_failed": "RAG не удалось" } - } + }, + "subscribe_add_failed": "Не удалось добавить подписку на черный список", + "subscribe_update_success": "Подписка на черный список успешно обновлена", + "subscribe_update_failed": "Не удалось обновить подписку на черный список", + "subscribe_source_update_failed": "Не удалось обновить источник подписки на черный список" }, "general.auto_check_update.title": "Автоматическое обновление", "general.test_plan.title": "Тестовый план", diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 859d88b626..5b989686b3 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -1878,7 +1878,11 @@ "provider_not_found": "未找到服务商", "rag_failed": "RAG 失败" } - } + }, + "subscribe_add_failed": "添加黑名单订阅失败", + "subscribe_update_success": "黑名单订阅更新成功", + "subscribe_update_failed": "更新黑名单订阅失败", + "subscribe_source_update_failed": "更新黑名单订阅源失败" }, "quickPhrase": { "title": "快捷短语", diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json index 46e3b59508..3e0cf72b5f 100644 --- a/src/renderer/src/i18n/locales/zh-tw.json +++ b/src/renderer/src/i18n/locales/zh-tw.json @@ -1863,7 +1863,11 @@ "provider_not_found": "未找到服務商", "rag_failed": "RAG 失敗" } - } + }, + "subscribe_add_failed": "加入黑名單訂閱失敗", + "subscribe_update_success": "黑名單訂閱更新成功", + "subscribe_update_failed": "更新黑名單訂閱失敗", + "subscribe_source_update_failed": "更新黑名單訂閱來源失敗" }, "general.auto_check_update.title": "自動更新", "general.test_plan.title": "測試計畫", diff --git a/src/renderer/src/pages/settings/ModelSettings/ModelSettings.tsx b/src/renderer/src/pages/settings/ModelSettings/ModelSettings.tsx index fbfc8bb05b..69020d90d0 100644 --- a/src/renderer/src/pages/settings/ModelSettings/ModelSettings.tsx +++ b/src/renderer/src/pages/settings/ModelSettings/ModelSettings.tsx @@ -2,7 +2,7 @@ import { RedoOutlined } from '@ant-design/icons' import ModelAvatar from '@renderer/components/Avatar/ModelAvatar' import { HStack } from '@renderer/components/Layout' import PromptPopup from '@renderer/components/Popups/PromptPopup' -import { isEmbeddingModel } from '@renderer/config/models' +import { isEmbeddingModel, isRerankModel } from '@renderer/config/models' import { TRANSLATE_PROMPT } from '@renderer/config/prompts' import { useTheme } from '@renderer/context/ThemeProvider' import { useAssistants, useDefaultAssistant, useDefaultModel } from '@renderer/hooks/useAssistant' @@ -45,7 +45,7 @@ const ModelSettings: FC = () => { label: p.isSystem ? t(`provider.${p.id}`) : p.name, title: p.name, options: sortBy(p.models, 'name') - .filter((m) => !isEmbeddingModel(m)) + .filter((m) => !isEmbeddingModel(m) && !isRerankModel(m)) .map((m) => ({ label: `${m.name} | ${p.isSystem ? t(`provider.${p.id}`) : p.name}`, value: getModelUniqId(m) @@ -233,7 +233,7 @@ const StyledButton = styled(Button)<{ selected: boolean }>` &:first-child { border-top-right-radius: 0; border-bottom-right-radius: 0; - border-right-width: 0px; // No right border for the first button when not selected + border-right-width: 0; // No right border for the first button when not selected } &:last-child { @@ -243,6 +243,7 @@ const StyledButton = styled(Button)<{ selected: boolean }>` } // Override Ant Design's default hover and focus styles for a cleaner look + &:hover, &:focus { z-index: 1;