Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/locales/de-DE/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"email": "E-Mail",
"password": "Passwort",
"captcha": "CAPTCHA",
"captchaError": "CAPTCHA konnte nicht geladen werden: {{message}}",
"captchaError": "CAPTCHA konnte nicht geladen werden: ",
"signIn": "Anmelden",
"signUp": "Registrieren",
"signUpAccount": "Konto registrieren",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/en-US/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"useOtherAccount": "Use another account",
"password": "Password",
"captcha": "CAPTCHA",
"captchaError": "Cannot load CAPTCHA: {{message}}",
"captchaError": "Cannot load CAPTCHA: ",
"signIn": "Sign in",
"signUp": "Sign up",
"signUpAccount": "Sign up",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/es-ES/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"email": "Correo electrónico",
"password": "Contraseña",
"captcha": "Código de verificación",
"captchaError": "Error al cargar el código de verificación: {{message}}",
"captchaError": "Error al cargar el código de verificación: ",
"signIn": "Iniciar sesión",
"signUp": "Registrarse",
"signUpAccount": "Registrar cuenta",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/fr-FR/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"email": "E-mail",
"password": "Mot de passe",
"captcha": "CAPTCHA",
"captchaError": "Impossible de charger le CAPTCHA : {{message}}",
"captchaError": "Impossible de charger le CAPTCHA : ",
"resetThumbnail": "Réinitialiser la miniature cassée",
"resetThumbnailRequested": "Réinitialisation de la miniature demandée.",
"noFileCanResetThumbnail": "Aucun fichier pouvant réinitialiser la miniature.",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/it-IT/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"email": "Email",
"password": "Password",
"captcha": "CAPTCHA",
"captchaError": "Impossibile caricare il CAPTCHA: {{message}}",
"captchaError": "Impossibile caricare il CAPTCHA: ",
"signIn": "Accedi",
"signUp": "Registrati",
"signUpAccount": "Registra account",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/ja-JP/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"email": "メールアドレス",
"password": "パスワード",
"captcha": "認証コード",
"captchaError": "認証コード読み込み失敗:{{message}}",
"captchaError": "認証コード読み込み失敗:",
"signIn": "ログイン",
"signUp": "登録",
"signUpAccount": "アカウント登録",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/ko-KR/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"email": "이메일",
"password": "비밀번호",
"captcha": "보안문자",
"captchaError": "보안문자 로드 실패: {{message}}",
"captchaError": "보안문자 로드 실패: ",
"signIn": "로그인",
"signUp": "가입",
"signUpAccount": "계정 가입",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/pt-BR/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"email": "E-mail",
"password": "Senha",
"captcha": "CAPTCHA",
"captchaError": "Falha ao carregar CAPTCHA: {{message}}",
"captchaError": "Falha ao carregar CAPTCHA: ",
"signIn": "Entrar",
"signUp": "Cadastrar",
"signUpAccount": "Cadastrar conta",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/ru-RU/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"email": "Электронная почта",
"password": "Пароль",
"captcha": "Капча",
"captchaError": "Ошибка загрузки капчи: {{message}}",
"captchaError": "Ошибка загрузки капчи: ",
"signIn": "Войти",
"signUp": "Зарегистрироваться",
"signUpAccount": "Регистрация аккаунта",
Expand Down
94 changes: 47 additions & 47 deletions public/locales/zh-CN/application.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/locales/zh-CN/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"timeAgoLocaleCode": "zh_CN",
"forEditorLocaleCode": "zh-CN",
"artPlayerLocaleCode": "zh-cn",
"requestID": "请求 ID: {{id}}",
"requestID": "请求 ID{{id}}",
"object": "对象",
"error": "错误",
"areYouSure": "确认",
Expand Down
281 changes: 140 additions & 141 deletions public/locales/zh-CN/dashboard.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions public/locales/zh-CN/image_editor.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"back": "后退",
"loading": "加载中...",
"resetOperations": "重置/删除所有操作",
"changesLoseWarningHint": "如果您按下“重置”按钮,您的更改将丢失。确定要继续吗?",
"changesLoseWarningHint": "如果您按下 “重置” 按钮,您的更改将丢失。确定要继续吗?",
"discardChangesWarningHint": "如果关闭窗口,您的最后更改将不会被保存。",
"cancel": "取消",
"apply": "应用",
Expand Down Expand Up @@ -65,8 +65,8 @@
"sides": "侧面",
"rectangleTool": "长方形",
"cornerRadius": "拐角半径",
"resizeWidthTitle": "宽度以像素为单位",
"resizeHeightTitle": "高度以像素为单位",
"resizeWidthTitle": "宽度 (以像素为单位)",
"resizeHeightTitle": "高度 (以像素为单位)",
"toggleRatioLockTitle": "切换比率锁定",
"resetSize": "重置为原始图像大小",
"rotateTool": "旋转",
Expand Down Expand Up @@ -98,9 +98,9 @@
"format": "格式",
"nameIsRequired": "文件名为必填项。",
"quality": "质量",
"imageDimensionsHoverTitle": "保存的图像尺寸宽x高",
"imageDimensionsHoverTitle": "保存的图像尺寸 (宽x高)",
"cropSizeLowerThanResizedWarning": "请注意,所选的裁剪区域低于应用的调整大小,这可能会导致质量下降",
"actualSize": "实际尺寸100%",
"actualSize": "实际尺寸 (100%)",
"fitSize": "适合尺寸",
"addImageTitle": "选择要添加的图像...",
"mutualizedFailedToLoadImg": "加载图像失败。",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/zh-CN/markdown_editor.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"uploadImage": {
"dialogTitle": "上传图片",
"uploadInstructions": "从您的设备中上传图片:",
"addViaUrlInstructions": "或填写图片 URL / 相对路径相对于当前文件:",
"addViaUrlInstructions": "或填写图片 URL / 相对路径 (相对于当前文件):",
"autoCompletePlaceholder": "选择或粘贴图片 URL",
"addViaUrlInstructionsNoUpload": "图片 URL:",
"alt": "替代文本:",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/zh-TW/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"email": "電子郵箱",
"password": "密碼",
"captcha": "驗證碼",
"captchaError": "驗證碼載入失敗: {{message}}",
"captchaError": "驗證碼載入失敗",
"signIn": "登入",
"signUp": "注冊",
"signUpAccount": "注冊賬號",
Expand Down
2 changes: 1 addition & 1 deletion src/api/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export function getCaptcha(): ThunkResponse<CaptchaResponse> {
{
...defaultOpts,
noCredential: true,
errorSnackbarMsg: (e) => i18n.t("captchaError", { ns: "common" }) + e.message,
errorSnackbarMsg: (e) => i18n.t("login.captchaError", { ns: "application" }) + e.message,
},
),
);
Expand Down
2 changes: 1 addition & 1 deletion src/component/Admin/File/FileDialog/FileMetadata.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const FileMetadata = () => {
<Table size="small" stickyHeader sx={{ width: "100%", tableLayout: "fixed" }}>
<TableHead>
<TableRow>
<NoWrapTableCell width={150}>{t("file.name")}</NoWrapTableCell>
<NoWrapTableCell width={150}>{t("file.key")}</NoWrapTableCell>
<NoWrapTableCell width={150}>{t("file.value")}</NoWrapTableCell>
<NoWrapTableCell width={50}>{t("file.isPublic")}</NoWrapTableCell>
<NoWrapTableCell width={90}>{t("group.#")}</NoWrapTableCell>
Expand Down
1 change: 1 addition & 0 deletions src/component/Admin/Settings/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ const Settings = () => {
"thumb_ffmpeg_max_size",
"thumb_ffmpeg_exts",
"thumb_ffmpeg_seek",
"thumb_ffmpeg_extra_args",
"thumb_libreoffice_path",
"thumb_libreoffice_max_size",
"thumb_libreoffice_enabled",
Expand Down
2 changes: 1 addition & 1 deletion src/component/FileManager/Dialogs/LockConflictDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const ErrorTable = (props: ErrorTableProps) => {
{conflict.owner?.application && <Application app={conflict.owner?.application} />}
</NoWrapTableCell>
<NoWrapTableCell>
<Tooltip title={!conflict.token ? t("application:modals:onlyOwner") : ""}>
<Tooltip title={!conflict.token ? t("application:modals.onlyOwner") : ""}>
<span>
<Button
disabled={!conflict.token || props.loading}
Expand Down
2 changes: 1 addition & 1 deletion src/component/Pages/Tasks/TaskProps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ const TaskProps = ({ task }: TaskPropsProps) => {
{!!task.summary?.props.download?.upload_speed && (
<TaskPropsBlock
label={t("download.uploadSpeed")}
value={`${sizeToString(task.summary?.props.download?.upload_speed)} / s`}
value={`${sizeToString(task.summary?.props.download?.upload_speed)}/s`}
/>
)}
{!!task.summary?.props.download?.hash && (
Expand Down
2 changes: 1 addition & 1 deletion src/component/Pages/Tasks/TaskSummaryStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const TaskSummaryStatus = ({ type, status, summary, error, simplified }: TaskSum
}}
>
{!simplified &&
`${sizeToString(downloadStatus.download_speed)} /s - ${sizeToString(
`${sizeToString(downloadStatus.download_speed)}/s - ${sizeToString(
downloadStatus.downloaded,
)} / ${sizeToString(downloadStatus.total)}`}
<TaskStatusContent
Expand Down
2 changes: 1 addition & 1 deletion src/component/Uploader/Popup/UploadTask.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const getSpeedText = (speed: number, speedAvg: number, useSpeedAvg: boolean) =>
displayedSpeed = speed;
}

return `${sizeToString(displayedSpeed ? displayedSpeed : 0)} /s`;
return `${sizeToString(displayedSpeed ? displayedSpeed : 0)}/s`;
};

const getErrMsg = (error?: Error) => {
Expand Down