xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-10-02 16:16:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/components/settings.tsx
View File

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

16
app/locales/cn.ts
View File

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

11
app/locales/en.ts
View File

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

2
app/locales/sk.ts
View File

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