Merge remote-tracking branch 'upstream/main' into dev

# Conflicts:
#	app/components/settings.tsx
This commit is contained in:
sijinhui 2024-02-15 09:26:08 +08:00
commit cc87bb04e8
4 changed files with 18 additions and 19 deletions

View File

@ -1081,8 +1081,8 @@ export function Settings() {
{/* ></input>*/}
{/* </ListItem>*/}
{/* <ListItem*/}
{/* title={Locale.Settings.Access.Azure.ApiKey.Title}*/}
{/* subTitle={Locale.Settings.Access.Azure.ApiKey.SubTitle}*/}
{/* title={Locale.Settings.Access.Google.ApiKey.Title}*/}
{/* subTitle={Locale.Settings.Access.Google.ApiKey.SubTitle}*/}
{/* >*/}
{/* <PasswordInput*/}
{/* value={accessStore.googleApiKey}*/}
@ -1099,9 +1099,9 @@ export function Settings() {
{/* />*/}
{/* </ListItem>*/}
{/* <ListItem*/}
{/* title={Locale.Settings.Access.Google.ApiVerion.Title}*/}
{/* title={Locale.Settings.Access.Google.ApiVersion.Title}*/}
{/* subTitle={*/}
{/* Locale.Settings.Access.Google.ApiVerion.SubTitle*/}
{/* Locale.Settings.Access.Google.ApiVersion.SubTitle*/}
{/* }*/}
{/* >*/}
{/* <input*/}

View File

@ -355,19 +355,19 @@ const cn = {
},
Google: {
ApiKey: {
Title: "接口密钥",
SubTitle: "使用自定义 Google AI Studio API Key 绕过密码访问限制",
Placeholder: "Google AI Studio API Key",
Title: "API 密钥",
SubTitle: "从 Google AI 获取您的 API 密钥",
Placeholder: "输入您的 Google AI Studio API 密钥",
},
Endpoint: {
Title: "接口地址",
SubTitle: "不包含请求路径,样例:",
Title: "终端地址",
SubTitle: "例:",
},
ApiVerion: {
Title: "接口版本 (gemini-pro api version)",
SubTitle: "选择指定的部分版本",
ApiVersion: {
Title: "API 版本(仅适用于 gemini-pro",
SubTitle: "选择一个特定的 API 版本",
},
},
CustomModel: {

View File

@ -363,9 +363,8 @@ const en: LocaleType = {
Google: {
ApiKey: {
Title: "API Key",
SubTitle:
"Bypass password access restrictions using a custom Google AI Studio API Key",
Placeholder: "Google AI Studio API Key",
SubTitle: "Obtain your API Key from Google AI",
Placeholder: "Enter your Google AI Studio API Key",
},
Endpoint: {
@ -373,9 +372,9 @@ const en: LocaleType = {
SubTitle: "Example:",
},
ApiVerion: {
Title: "API Version (gemini-pro api version)",
SubTitle: "Select a specific part version",
ApiVersion: {
Title: "API Version (specific to gemini-pro)",
SubTitle: "Select a specific API version",
},
},
},

View File

@ -334,7 +334,7 @@ const sk: PartialLocaleType = {
SubTitle: "Príklad:",
},
ApiVerion: {
ApiVersion: {
Title: "Verzia API (gemini-pro verzia API)",
SubTitle: "Vyberte špecifickú verziu časti",
},