Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update all web app translation key references and point to new core/i18n package (#2434)
Leendert de Borst793e7b999d05
diff --git a/apps/web/package-lock.json b/apps/web/package-lock.jsonindex 7522a412a..29ba5d21b 100644--- a/apps/web/package-lock.json+++ b/apps/web/package-lock.json@@ -10,6 +10,7 @@"hasInstallScript": true,"dependencies": {"@aliasvault/client": "file:../../core/client",+ "@aliasvault/i18n": "file:../../core/i18n","@aliasvault/models": "file:../../core/models","@aliasvault/vault": "file:../../core/vault","i18next": "^26.2.0",@@ -69,6 +70,11 @@"vitest": "^5.0.1"}},+ "../../core/i18n": {+ "name": "@aliasvault/i18n",+ "version": "0.31.0",+ "license": "AGPL-3.0"+ },"../../core/models": {"name": "@aliasvault/models","version": "1.0.0",@@ -100,6 +106,10 @@"resolved": "../../core/client","link": true},+ "node_modules/@aliasvault/i18n": {+ "resolved": "../../core/i18n",+ "link": true+ },"node_modules/@aliasvault/models": {"resolved": "../../core/models","link": truediff --git a/apps/web/package.json b/apps/web/package.jsonindex b61673441..0122f2517 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -21,6 +21,7 @@},"dependencies": {"@aliasvault/client": "file:../../core/client",+ "@aliasvault/i18n": "file:../../core/i18n","@aliasvault/models": "file:../../core/models","@aliasvault/vault": "file:../../core/vault","i18next": "^26.2.0",diff --git a/apps/web/src/components/alerts/CriticalErrorPanel.tsx b/apps/web/src/components/alerts/CriticalErrorPanel.tsxindex 8668a01f5..e2a954ac9 100644--- a/apps/web/src/components/alerts/CriticalErrorPanel.tsx+++ b/apps/web/src/components/alerts/CriticalErrorPanel.tsx@@ -55,7 +55,7 @@ const CriticalErrorPanel: React.FC<CriticalErrorPanelProps> = ({ report, title,<path d="M8 3a1 1 0 011-1h2a1 1 0 110 2H9a1 1 0 01-1-1z"></path><path d="M6 3a2 2 0 00-2 2v11a2 2 0 002 2h8a2 2 0 002-2V5a2 2 0 00-2-2 3 3 0 01-3 3H9a3 3 0 01-3-3z"></path></svg>- {copied ? t('components.main.components.totpCodes.totpViewer.CopiedMessage') : t('common.errors.copyErrorDetails')}+ {copied ? t('common.copiedShort') : t('app.vaultError.copyErrorDetails')}</button></div></div>@@ -65,7 +65,7 @@ const CriticalErrorPanel: React.FC<CriticalErrorPanelProps> = ({ report, title,{onBack && (<button type="button" id="critical-error-back" onClick={onBack} className="mt-6 w-full px-5 py-2 text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800">- {t('sharedResources.Back')}+ {t('common.back')}</button>)}</div>diff --git a/apps/web/src/components/alerts/SupportContact.tsx b/apps/web/src/components/alerts/SupportContact.tsxindex 07e0cb475..9490e8e42 100644--- a/apps/web/src/components/alerts/SupportContact.tsx+++ b/apps/web/src/components/alerts/SupportContact.tsx@@ -16,7 +16,7 @@ const SupportContact: React.FC<{ report?: string | null; className?: string }> =return null;}- const [before, after] = t('common.errors.contactSupportAt', { 0: EMAIL_MARKER }).split(EMAIL_MARKER);+ const [before, after] = t('common.errors.contactSupportAt', { email: EMAIL_MARKER }).split(EMAIL_MARKER);const href = report ? `mailto:${supportEmail}?body=${encodeURIComponent(report)}` : `mailto:${supportEmail}`;return (<p id="support-contact" className={`text-sm text-gray-500 dark:text-gray-400 ${className}`.trim()}>diff --git a/apps/web/src/components/attachments/AttachmentUploader.tsx b/apps/web/src/components/attachments/AttachmentUploader.tsxindex e53399abf..ff93fadfe 100644--- a/apps/web/src/components/attachments/AttachmentUploader.tsx+++ b/apps/web/src/components/attachments/AttachmentUploader.tsx@@ -1,4 +1,5 @@import React, { useRef, useState } from 'react';+import { useTranslation } from 'react-i18next';import type { Attachment } from '@aliasvault/models/vault';@@ -14,6 +15,7 @@ const MAX_FILE_SIZE = 1024 * 1024 * 10;* File picker and list for the attachments of an item.*/const AttachmentUploader: React.FC<AttachmentUploaderProps> = ({ attachments, onAttachmentsChange }) => {+ const { t } = useTranslation();const originalIds = useRef<string[]>(attachments.map(a => a.Id));const [statusMessage, setStatusMessage] = useState('');const visible = attachments.filter(a => !a.IsDeleted);@@ -24,19 +26,19 @@ const AttachmentUploader: React.FC<AttachmentUploaderProps> = ({ attachments, onconst handleFileSelection = async (event: React.ChangeEvent<HTMLInputElement>): Promise<void> => {const files = Array.from(event.target.files ?? []);event.target.value = '';- setStatusMessage('Uploading...');+ setStatusMessage(t('attachmentUploader.uploading'));let current = attachments;for (const file of files) {try {if (file.size > MAX_FILE_SIZE) {- throw new Error(`File exceeds the maximum size of ${MAX_FILE_SIZE / 1024 / 1024} MB.`);+ throw new Error(t('importExport.serviceCard.importErrorFileTooLarge', { size: MAX_FILE_SIZE / 1024 / 1024 }));}const now = new Date().toISOString();const attachment: Attachment = { Id: crypto.randomUUID(), Filename: file.name, Blob: new Uint8Array(await file.arrayBuffer()), ItemId: '', CreatedAt: now, UpdatedAt: now };current = [...current, attachment];- setStatusMessage('File uploaded successfully.');+ setStatusMessage(t('attachmentUploader.uploadSuccess'));} catch (error) {- setStatusMessage(`Error uploading file: ${error instanceof Error ? error.message : String(error)}`);+ setStatusMessage(t('attachmentUploader.uploadError', { error: error instanceof Error ? error.message : String(error) }));console.error('Error uploading file.', error);}}@@ -52,7 +54,7 @@ const AttachmentUploader: React.FC<AttachmentUploaderProps> = ({ attachments, on} else {onAttachmentsChange(attachments.filter(a => a.Id !== attachment.Id));}- setStatusMessage('Attachment deleted successfully.');+ setStatusMessage(t('attachmentUploader.deleteSuccess'));};return (@@ -61,14 +63,14 @@ const AttachmentUploader: React.FC<AttachmentUploaderProps> = ({ attachments, on{statusMessage.length > 0 && <p className="mt-2 text-sm text-gray-500 dark:text-gray-400">{statusMessage}</p>}{visible.length > 0 && (<div className="mt-4">- <h4 className="mb-2 text-lg font-semibold dark:text-white">Attachments:</h4>+ <h4 className="mb-2 text-lg font-semibold dark:text-white">{t('common.attachments')}</h4><ul className="list-disc list-inside">{visible.map(attachment => (<li key={attachment.Id} className="flex items-center justify-between text-sm text-gray-600 dark:text-gray-400">{(attachment.Blob?.length ?? 0) > 0? <span>{attachment.Filename}</span>- : <span className="text-gray-400 dark:text-gray-500" title="Attachment data unavailable">{attachment.Filename} (unavailable)</span>}- <button type="button" onClick={() => deleteAttachment(attachment)} className="text-red-500 hover:text-red-700">Delete</button>+ : <span className="text-gray-400 dark:text-gray-500" title={t('items.attachmentUnavailable')}>{attachment.Filename} ({t('common.unavailable')})</span>}+ <button type="button" onClick={() => deleteAttachment(attachment)} className="text-red-500 hover:text-red-700">{t('common.delete')}</button></li>))}</ul>diff --git a/apps/web/src/components/attachments/AttachmentViewer.tsx b/apps/web/src/components/attachments/AttachmentViewer.tsxindex f212aa629..44fd20963 100644--- a/apps/web/src/components/attachments/AttachmentViewer.tsx+++ b/apps/web/src/components/attachments/AttachmentViewer.tsx@@ -1,5 +1,6 @@import { downloadBytes } from '@aliasvault/client/utilities/FileDownload';import React from 'react';+import { useTranslation } from 'react-i18next';import Card from '@/components/shared/Card';import SectionTitle from '@/components/shared/SectionTitle';@@ -47,11 +48,12 @@ const DownloadIcon: React.FC = () => (* Lists the attachments of an item as download tiles.*/const AttachmentViewer: React.FC<AttachmentViewerProps> = ({ attachments }) => {+ const { t } = useTranslation();const visible = attachments.filter(a => !a.IsDeleted);return (<Card variant="section">- <SectionTitle>Attachments</SectionTitle>+ <SectionTitle>{t('common.attachments')}</SectionTitle>{visible.length > 0 ? (<div className="space-y-2">{visible.map((attachment) => {@@ -63,7 +65,7 @@ const AttachmentViewer: React.FC<AttachmentViewerProps> = ({ attachments }) => {type="button"disabled={!available}onClick={() => available && downloadBytes(attachment.Filename, attachment.Blob!)}- title={available ? attachment.Filename : 'Attachment data unavailable'}+ title={available ? attachment.Filename : t('items.attachmentUnavailable')}className="group flex w-full items-center gap-3 rounded-lg border border-gray-200 bg-white px-3 py-2.5 text-left transition-colors duration-200 enabled:hover:border-gray-300 enabled:hover:bg-gray-100 disabled:cursor-not-allowed dark:border-gray-700 dark:bg-gray-800 dark:enabled:hover:border-gray-700 dark:enabled:hover:bg-gray-700"><span className="flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-gray-100 text-gray-500 transition-colors duration-200 group-enabled:group-hover:bg-gray-200 dark:bg-gray-700 dark:text-gray-400 dark:group-enabled:group-hover:bg-gray-600">@@ -74,7 +76,7 @@ const AttachmentViewer: React.FC<AttachmentViewerProps> = ({ attachments }) => {{attachment.Filename}</span><span className="block text-xs text-gray-500 dark:text-gray-400">- {available ? formatSize(size) : 'Unavailable'}+ {available ? formatSize(size) : t('common.unavailable')}</span></span>{available && (@@ -87,7 +89,7 @@ const AttachmentViewer: React.FC<AttachmentViewerProps> = ({ attachments }) => {})}</div>) : (- <p className="text-gray-500 dark:text-gray-400">No attachments available.</p>+ <p className="text-gray-500 dark:text-gray-400">{t('items.noAttachments')}</p>)}</Card>);diff --git a/apps/web/src/components/auth/LanguageSwitcher.tsx b/apps/web/src/components/auth/LanguageSwitcher.tsxindex f0a679e47..56d63076e 100644--- a/apps/web/src/components/auth/LanguageSwitcher.tsx+++ b/apps/web/src/components/auth/LanguageSwitcher.tsx@@ -15,7 +15,7 @@ const LanguageSwitcher: React.FC = () => {<selectvalue={i18n.language}onChange={(e) => void changeLanguage(e.target.value)}- aria-label={t('pages.main.settings.general.AppLanguageLabel')}+ aria-label={t('settings.language')}className="appearance-none cursor-pointer pl-3 pr-9 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-600 rounded-md hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">{AVAILABLE_LANGUAGES.map((language) => (<option key={language.code} value={language.code}>{language.flag} {language.nativeName}</option>diff --git a/apps/web/src/components/auth/MobileUnlockModal.tsx b/apps/web/src/components/auth/MobileUnlockModal.tsxindex dad630200..7a356535c 100644--- a/apps/web/src/components/auth/MobileUnlockModal.tsx+++ b/apps/web/src/components/auth/MobileUnlockModal.tsx@@ -22,7 +22,7 @@ type MobileUnlockModalProps = {const MobileUnlockModal: React.FC<MobileUnlockModalProps> = ({ isOpen, mode, onClose, onSuccess }) => {const { t } = useTranslation();const webApi = useWebApi();- const tk = 'pages.auth.mobileUnlockModal';+const [qrCodeUrl, setQrCodeUrl] = useState<string | null>(null);const [verificationCode, setVerificationCode] = useState<string | null>(null);const [error, setError] = useState<MobileLoginErrorCode | null>(null);@@ -109,11 +109,11 @@ const MobileUnlockModal: React.FC<MobileUnlockModalProps> = ({ isOpen, mode, onCconst getErrorMessage = (errorCode: MobileLoginErrorCode): string => {switch (errorCode) {case MobileLoginErrorCode.TIMEOUT:- return t('mobileLogin.ErrorTimeout');+ return t('common.errors.mobileLoginRequestExpired');case MobileLoginErrorCode.DECLINED:- return t('mobileLogin.ErrorDeclined');+ return t('common.errors.mobileLoginRequestDeclined');default:- return t('sharedResources.ErrorUnknown');+ return t('common.errors.unknownErrorTryAgain');}};@@ -125,17 +125,17 @@ const MobileUnlockModal: React.FC<MobileUnlockModalProps> = ({ isOpen, mode, onCreturn (<FormModalisOpen={isOpen}- title={mode === 'unlock' ? t(`${tk}.UnlockTitle`) : t(`${tk}.PageTitle`)}+ title={mode === 'unlock' ? t('auth.unlockWithMobile') : t('auth.loginWithMobile')}maxWidth="md"submitOnEnter={false}onClose={onClose}footerContent={(<button type="button" onClick={onClose} className="inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:hover:bg-gray-600">- {t('sharedResources.Cancel')}+ {t('common.cancel')}</button>)}><div className="flex items-start justify-between gap-3 mb-4">- <p className="text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.ScanQrCodeDescription`)}</p>+ <p className="text-sm text-gray-600 dark:text-gray-400">{t('auth.mobileUnlock.scanQrCodeDescription')}</p>{qrCodeUrl && (<span className="flex-shrink-0 px-2 py-0.5 rounded-full bg-gray-100 dark:bg-gray-700 text-xs font-medium tabular-nums text-gray-600 dark:text-gray-300">{formatTime(timeRemaining)}@@ -147,13 +147,13 @@ const MobileUnlockModal: React.FC<MobileUnlockModalProps> = ({ isOpen, mode, onC{qrCodeUrl && (<div className="flex flex-col items-center w-full max-w-[300px] mx-auto">- <img src={qrCodeUrl} alt="QR Code" className="w-full bg-white rounded-lg border-4 border-gray-200 dark:border-gray-600 mb-3" />+ <img src={qrCodeUrl} alt={t('common.qrCode')} className="w-full bg-white rounded-lg border-4 border-gray-200 dark:border-gray-600 mb-3" />{verificationCode && (<div className="w-full flex items-center gap-3 p-3 rounded-lg border border-gray-200 dark:border-gray-600 bg-gray-50 dark:bg-gray-700/50"><div className="flex-shrink-0 flex items-center justify-center w-14 h-14 rounded-full border-2 border-primary-500 bg-white dark:bg-gray-800 text-2xl font-bold text-gray-900 dark:text-white">{verificationCode}</div>- <p className="text-sm font-medium text-gray-700 dark:text-gray-300">{t(`${tk}.VerificationCodeDescription`)}</p>+ <p className="text-sm font-medium text-gray-700 dark:text-gray-300">{t('auth.mobileUnlockVerificationCode')}</p></div>)}</div>diff --git a/apps/web/src/components/auth/setup/SetupSteps.tsx b/apps/web/src/components/auth/setup/SetupSteps.tsxindex 2e168bb65..6028bcaef 100644--- a/apps/web/src/components/auth/setup/SetupSteps.tsx+++ b/apps/web/src/components/auth/setup/SetupSteps.tsx@@ -52,19 +52,18 @@ const StepFrame: React.FC<{ isLoading: boolean; children: React.ReactNode }> = (export const TermsAndConditionsStep: React.FC<{ agreedToTerms: boolean; onAgreedToTermsChange: (agreed: boolean) => void }> = ({ agreedToTerms, onAgreedToTermsChange }) => {const { t } = useTranslation();const isLoading = useStepLoading();- const tk = 'components.auth.setup.termsAndConditionsStep';return (<StepFrame isLoading={isLoading}><div className="bg-white dark:bg-gray-800 rounded-lg shadow-lg lg:shadow-none p-6">- <p className="text-sm text-gray-600 dark:text-gray-400 mb-4">{t(`${tk}.PleaseReadAndAgree`)}</p>+ <p className="text-sm text-gray-600 dark:text-gray-400 mb-4">{t('auth.setup.termsStep.pleaseReadAndAgree')}</p><div className="bg-gray-100 dark:bg-gray-700 rounded-lg p-4 mb-8 h-80 overflow-y-auto">- <h3 className="text-lg font-semibold text-gray-900 dark:text-white mb-2">{t(`${tk}.TermsAndConditionsTitle`)}</h3>- <p className="text-sm text-gray-600 dark:text-gray-400 whitespace-pre-line">{t(`${tk}.TermsContent`)}</p>+ <h3 className="text-lg font-semibold text-gray-900 dark:text-white mb-2">{t('auth.register.termsAndConditionsLink')}</h3>+ <p className="text-sm text-gray-600 dark:text-gray-400 whitespace-pre-line">{t('auth.setup.termsStep.termsContent')}</p></div><div className="flex items-center"><input type="checkbox" id="agreeTerms" checked={agreedToTerms} onChange={e => onAgreedToTermsChange(e.target.checked)} className="mr-2" />- <label htmlFor="agreeTerms" className="text-sm font-bold text-gray-600 dark:text-gray-400">{t(`${tk}.AgreementCheckboxLabel`)}</label>+ <label htmlFor="agreeTerms" className="text-sm font-bold text-gray-600 dark:text-gray-400">{t('auth.setup.termsStep.agreementCheckboxLabel')}</label></div></div></StepFrame>@@ -83,7 +82,6 @@ export const UsernameStep: React.FC<{ defaultUsername: string; onUsernameChange:const [isValid, setIsValid] = useState(false);const [errorMessage, setErrorMessage] = useState('');const debounceTimer = useRef<ReturnType<typeof setTimeout> | null>(null);- const tk = 'components.auth.setup.usernameStep';/*** Ask the server whether the username can be used.@@ -92,7 +90,7 @@ export const UsernameStep: React.FC<{ defaultUsername: string; onUsernameChange:if (value.trim().length === 0) {setIsValidating(false);setIsValid(false);- setErrorMessage(t(`${tk}.UsernameRequiredError`));+ setErrorMessage(t('apiErrors.USERNAME_REQUIRED'));onUsernameChange('');return;}@@ -103,7 +101,7 @@ export const UsernameStep: React.FC<{ defaultUsername: string; onUsernameChange:onUsernameChange(value);} catch (error) {setIsValid(false);- setErrorMessage(error instanceof ApiRequestError ? apiErrorMessage(error, t, t(`${tk}.ServerCommunicationError`)) : t(`${tk}.ServerCommunicationError`));+ setErrorMessage(error instanceof ApiRequestError ? apiErrorMessage(error, t, t('auth.setup.usernameStep.serverCommunicationError')) : t('auth.setup.usernameStep.serverCommunicationError'));onUsernameChange('');} finally {setIsValidating(false);@@ -143,27 +141,27 @@ export const UsernameStep: React.FC<{ defaultUsername: string; onUsernameChange:<div className="bg-white dark:bg-gray-800 rounded-lg shadow-lg lg:shadow-none p-6 mb-6"><div className="flex items-start mb-4"><div className="flex-shrink-0">- <img className="h-10 w-10" src="/img/logo.svg" alt={t(`${tk}.AssistantAvatarAlt`)} />+ <img className="h-10 w-10" src="/img/logo.svg" alt={t('auth.setup.usernameStep.assistantAvatarAlt')} /></div><div className="ml-3 bg-blue-100 dark:bg-blue-900 rounded-lg p-3">- <p className="text-sm text-gray-900 dark:text-white">{t(`${tk}.GreatNowLetsSetupUsername`)}</p>- <p className="text-sm text-gray-900 dark:text-white mt-3">{t(`${tk}.EnterUsernameInstructions`)}</p>- <p className="text-sm text-gray-900 dark:text-white mt-3 font-semibold">{t(`${tk}.RememberUsernameNote`)}</p>+ <p className="text-sm text-gray-900 dark:text-white">{t('auth.setup.usernameStep.greatNowLetsSetupUsername')}</p>+ <p className="text-sm text-gray-900 dark:text-white mt-3">{t('auth.setup.usernameStep.enterUsernameInstructions')}</p>+ <p className="text-sm text-gray-900 dark:text-white mt-3 font-semibold">{t('auth.setup.usernameStep.rememberUsernameNote')}</p></div></div></div><div className="space-y-4"><div>- <EditFormRow id="username" label={t(`${tk}.UsernameLabel`)} value={username} onChange={onChange} placeholder={t(`${tk}.UsernamePlaceholder`)} onFocus={() => {+ <EditFormRow id="username" label={t('common.username')} value={username} onChange={onChange} placeholder={t('auth.setup.usernameStep.usernamePlaceholder')} onFocus={() => {setIsValid(false);setIsValidating(false);setErrorMessage('');}} />{isValidating- ? <div className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.ValidatingUsernameMessage`)}</div>+ ? <div className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t('auth.setup.usernameStep.validatingUsernameMessage')}</div>: isValid- ? <div className="mt-2 text-sm text-green-600 dark:text-green-400">{t(`${tk}.UsernameAvailableMessage`)}</div>+ ? <div className="mt-2 text-sm text-green-600 dark:text-green-400">{t('apiErrors.USERNAME_AVAILABLE')}</div>: errorMessage.length > 0 && <div className="mt-2 text-sm text-red-600 dark:text-red-400">{errorMessage}</div>}</div></div>@@ -181,7 +179,6 @@ export const PasswordStep: React.FC<{ onPasswordChange: (password: string) => voconst [confirmPassword, setConfirmPassword] = useState('');const [errorMessage, setErrorMessage] = useState('');const debounceTimer = useRef<ReturnType<typeof setTimeout> | null>(null);- const tk = 'components.auth.setup.passwordStep';// Autofocus the password input.useEffect(() => {@@ -195,7 +192,7 @@ export const PasswordStep: React.FC<{ onPasswordChange: (password: string) => vo*/const validate = (value: string, confirm: string): void => {if (value.length < MIN_ACCEPTED_PASSWORD_LENGTH) {- setErrorMessage(t('validationMessages.PasswordMinLengthGeneric', { 0: MIN_ACCEPTED_PASSWORD_LENGTH }));+ setErrorMessage(t('settings.securitySettings.changePassword.passwordTooShort', { minLength: MIN_ACCEPTED_PASSWORD_LENGTH }));onPasswordChange('');return;}@@ -205,7 +202,7 @@ export const PasswordStep: React.FC<{ onPasswordChange: (password: string) => voreturn;}if (value !== confirm) {- setErrorMessage(t('validationMessages.PasswordsDoNotMatchGeneric'));+ setErrorMessage(t('common.errorPasswordMismatch'));onPasswordChange('');return;}@@ -238,35 +235,35 @@ export const PasswordStep: React.FC<{ onPasswordChange: (password: string) => vo<div className="bg-white dark:bg-gray-800 rounded-lg shadow-lg lg:shadow-none p-6"><div className="flex items-start mb-4"><div className="flex-shrink-0">- <img className="h-10 w-10" src="/img/logo.svg" alt="AliasVault Assistant" />+ <img className="h-10 w-10" src="/img/logo.svg" alt={t('auth.setup.usernameStep.assistantAvatarAlt')} /></div><div className="ml-3 bg-blue-100 dark:bg-blue-900 rounded-lg p-3">- <p className="text-sm text-gray-900 dark:text-white">{t(`${tk}.WelcomeMessage`)}</p>+ <p className="text-sm text-gray-900 dark:text-white">{t('auth.setup.passwordStep.welcomeMessage')}</p></div></div></div><div className="p-4 mb-6 bg-gray-100 dark:bg-gray-900 rounded-lg text-gray-900 dark:text-gray-100">- <p className="text-sm font-semibold">{t(`${tk}.ImportantNote`)}</p>+ <p className="text-sm font-semibold">{t('auth.setup.passwordStep.importantNote')}</p><ul className="text-sm mt-3 list-disc list-inside">- <li>{t(`${tk}.SecurityPoint1`)}</li>- <li>{t(`${tk}.SecurityPoint2`)}</li>- <li>{t(`${tk}.SecurityPoint3`)}</li>+ <li>{t('auth.setup.passwordStep.securityPoint1')}</li>+ <li>{t('auth.setup.passwordStep.securityPoint2')}</li>+ <li>{t('auth.setup.passwordStep.securityPoint3')}</li></ul></div><div className="space-y-4"><div><div>- <FormLabel htmlFor="password">{t(`${tk}.MasterPasswordLabel`)}</FormLabel>- <PasswordInputField id="password" value={password} onValueChange={onPasswordInput} placeholder={t(`${tk}.MasterPasswordPlaceholder`)} />+ <FormLabel htmlFor="password">{t('auth.masterPassword')}</FormLabel>+ <PasswordInputField id="password" value={password} onValueChange={onPasswordInput} placeholder={t('auth.setup.passwordStep.masterPasswordPlaceholder')} /></div><PasswordStrengthIndicator password={password} /><div className="mt-4">- <FormLabel htmlFor="confirmPassword">{t(`${tk}.ConfirmMasterPasswordLabel`)}</FormLabel>- <PasswordInputField id="confirmPassword" value={confirmPassword} onValueChange={onConfirmInput} placeholder={t(`${tk}.ConfirmMasterPasswordPlaceholder`)} />+ <FormLabel htmlFor="confirmPassword">{t('auth.setup.passwordStep.confirmMasterPasswordLabel')}</FormLabel>+ <PasswordInputField id="confirmPassword" value={confirmPassword} onValueChange={onConfirmInput} placeholder={t('auth.setup.passwordStep.confirmMasterPasswordPlaceholder')} /></div>{errorMessage.length > 0 && <div className="mt-2 text-sm text-red-600 dark:text-red-400">{errorMessage}</div>}</div>@@ -302,7 +299,7 @@ export const CreatingStep: React.FC<{ username: string; password: string; onDone} catch (error) {console.error('Registration failed:', error);setIsLoading(false);- notifications.addErrorMessage(apiErrorMessage(error, t, t('components.auth.register.RegistrationErrorMessage')), true);+ notifications.addErrorMessage(apiErrorMessage(error, t, t('auth.register.registrationErrorMessage')), true);}};void completeSetup();diff --git a/apps/web/src/components/email/EmailModal.tsx b/apps/web/src/components/email/EmailModal.tsxindex 27926d034..9f30c9e7f 100644--- a/apps/web/src/components/email/EmailModal.tsx+++ b/apps/web/src/components/email/EmailModal.tsx@@ -86,7 +86,7 @@ const EmailModal: React.FC<EmailModalProps> = ({ email, onClose, onEmailDeleted,if (!email) {return;}- const confirmed = await showConfirmation(t('components.main.email.emailModal.DeleteEmailTitle'), t('components.main.email.emailModal.DeleteEmailConfirmation'), t('sharedResources.Confirm'), t('sharedResources.Cancel'));+ const confirmed = await showConfirmation(t('emails.deleteEmail'), t('emails.modal.deleteEmailConfirmation'), t('common.confirm'), t('common.cancel'));if (!confirmed) {return;}@@ -95,19 +95,19 @@ const EmailModal: React.FC<EmailModalProps> = ({ email, onClose, onEmailDeleted,if (email.isSpamOk) {const response = await spamOk.request('DELETE', `Email/${encodeURIComponent(email.toLocal)}/${email.id}`);if (!response.ok) {- notifications.addErrorMessage(`${t('components.main.email.emailModal.EmailDeleteFailed')}: ${await response.text()}`, true);+ notifications.addErrorMessage(`${t('emails.modal.emailDeleteFailed')}: ${await response.text()}`, true);return;}onEmailDeleted(email.id);- notifications.addSuccessMessage(t('components.main.email.emailModal.EmailDeletedSuccess'), true);+ notifications.addSuccessMessage(t('emails.modal.emailDeletedSuccess'), true);onClose();} else {await webApi.delete(`Email/${email.id}`);onEmailDeleted(email.id);- notifications.addSuccessMessage(t('components.main.email.emailModal.EmailDeletedSuccess'), true);+ notifications.addSuccessMessage(t('emails.modal.emailDeletedSuccess'), true);}} catch (error) {- notifications.addErrorMessage(`${t('components.main.email.emailModal.EmailDeleteFailed')}: ${error instanceof Error ? error.message : String(error)}`, true);+ notifications.addErrorMessage(`${t('emails.modal.emailDeleteFailed')}: ${error instanceof Error ? error.message : String(error)}`, true);}};@@ -121,12 +121,12 @@ const EmailModal: React.FC<EmailModalProps> = ({ email, onClose, onEmailDeleted,try {const bytes = await getAttachmentBytes(webApi, dbContext.sqliteClient, email, attachment);if (!bytes) {- notifications.addErrorMessage(t('components.main.email.emailModal.AttachmentDownloadFailed'), true);+ notifications.addErrorMessage(t('common.attachmentDownloadFailed'), true);return;}downloadBytes(attachment.filename, bytes, attachment.mimeType);} catch (error) {- notifications.addErrorMessage(`${t('components.main.email.emailModal.AttachmentDownloadError')}: ${error instanceof Error ? error.message : String(error)}`, true);+ notifications.addErrorMessage(`${t('emails.modal.attachmentDownloadError')}: ${error instanceof Error ? error.message : String(error)}`, true);}};@@ -143,16 +143,16 @@ const EmailModal: React.FC<EmailModalProps> = ({ email, onClose, onEmailDeleted,</h2><div className="flex items-center gap-1 flex-shrink-0">{availableModes.length > 1 && (- <ModalHeaderAction onClick={cycleViewMode} title={t('sharedResources.EmailFormatSwitchTitle')}>{formatLabel}</ModalHeaderAction>+ <ModalHeaderAction onClick={cycleViewMode} title={t('emails.formatSwitchTitle')}>{formatLabel}</ModalHeaderAction>)}{email !== null && (- <ModalHeaderAction onClick={() => void showDeleteConfirmation()} title={t('components.main.email.emailModal.DeleteButton')} variant="danger">+ <ModalHeaderAction onClick={() => void showDeleteConfirmation()} title={t('common.delete')} variant="danger"><svg className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" /></svg></ModalHeaderAction>)}- <ModalHeaderAction onClick={onClose} title={t('sharedResources.Close')}>+ <ModalHeaderAction onClick={onClose} title={t('common.close')}><svg className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12" /></svg>@@ -174,20 +174,20 @@ const EmailModal: React.FC<EmailModalProps> = ({ email, onClose, onEmailDeleted,) : (<><div className="space-y-1">- <p>{t('components.main.email.emailModal.FromLabel')} {email.fromLocal}@{email.fromDomain}</p>- <p>{t('components.main.email.emailModal.ToLabel')} {email.toLocal}@{email.toDomain}</p>+ <p>{t('emails.from')} {email.fromLocal}@{email.fromDomain}</p>+ <p>{t('emails.to')} {email.toLocal}@{email.toDomain}</p></div><div className="space-y-1 mt-1 sm:mt-0">- <p>{t('components.main.email.emailModal.DateLabel')} {new Date(email.dateSystem).toLocaleString()}</p>+ <p>{t('emails.date')} {new Date(email.dateSystem).toLocaleString()}</p>{showItemLink && (item !== null && item.name.length > 0 ? (<p>- <span className="font-medium">{t('sharedResources.EmailItemLabel')}</span>{' '}+ <span className="font-medium">{t('common.emailItemLabel')}</span>{' '}<button type="button" onClick={() => navigate(itemRoute(item.ref))} className="text-primary-600 hover:underline dark:text-primary-400 cursor-pointer">{item.name}</button></p>) : (<p>- <span className="font-medium">{t('sharedResources.EmailItemLabel')}</span>{' '}- <span className="text-gray-400 dark:text-gray-500">{t('sharedResources.EmailItemNone')}</span>+ <span className="font-medium">{t('common.emailItemLabel')}</span>{' '}+ <span className="text-gray-400 dark:text-gray-500">{t('common.none')}</span></p>))}</div>@@ -209,14 +209,14 @@ const EmailModal: React.FC<EmailModalProps> = ({ email, onClose, onEmailDeleted,</div>) : (<div>- <iframe title="email" className="w-full overscroll-y-auto bg-white rounded" style={{ height: '500px' }} srcDoc={emailBody} sandbox="allow-popups allow-popups-to-escape-sandbox"></iframe>+ <iframe title={t('common.email')} className="w-full overscroll-y-auto bg-white rounded" style={{ height: '500px' }} srcDoc={emailBody} sandbox="allow-popups allow-popups-to-escape-sandbox"></iframe></div>)}</div><div className="mt-4">{email !== null && email.attachments.length > 0 && (<div className="border-t border-gray-200 dark:border-gray-600 pt-4">- <h3 className="text-sm font-medium text-gray-500 dark:text-gray-400 mb-2">{t('components.main.email.emailModal.AttachmentsLabel')}</h3>+ <h3 className="text-sm font-medium text-gray-500 dark:text-gray-400 mb-2">{t('common.attachments')}</h3><div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">{email.attachments.map((attachment) => (<div key={attachment.index} className="flex items-center space-x-2">diff --git a/apps/web/src/components/email/EmailPreview.tsx b/apps/web/src/components/email/EmailPreview.tsxindex 3b26e51fe..3c6cd1ccc 100644--- a/apps/web/src/components/email/EmailPreview.tsx+++ b/apps/web/src/components/email/EmailPreview.tsx@@ -36,7 +36,7 @@ const EmailPreview: React.FC<EmailPreviewProps> = ({ email, onEmailDeleted, itemif (!email) {return;}- const confirmed = await showConfirmation(t('components.main.email.emailPreview.DeleteEmailTitle'), t('components.main.email.emailPreview.DeleteEmailConfirmation'), t('sharedResources.Confirm'), t('sharedResources.Cancel'));+ const confirmed = await showConfirmation(t('emails.deleteEmail'), t('emails.modal.deleteEmailConfirmation'), t('common.confirm'), t('common.cancel'));if (!confirmed) {return;}@@ -45,16 +45,16 @@ const EmailPreview: React.FC<EmailPreviewProps> = ({ email, onEmailDeleted, itemif (email.isSpamOk) {const response = await spamOk.request('DELETE', `Email/${encodeURIComponent(email.toLocal)}/${email.id}`);if (!response.ok) {- notifications.addErrorMessage(`${t('components.main.email.emailPreview.EmailDeleteFailed')}: ${await response.text()}`, true);+ notifications.addErrorMessage(`${t('emails.modal.emailDeleteFailed')}: ${await response.text()}`, true);return;}} else {await webApi.delete(`Email/${email.id}`);}onEmailDeleted(email.id);- notifications.addSuccessMessage(t('components.main.email.emailPreview.EmailDeletedSuccess'), true);+ notifications.addSuccessMessage(t('emails.modal.emailDeletedSuccess'), true);} catch (error) {- notifications.addErrorMessage(`${t('components.main.email.emailPreview.EmailDeleteFailed')}: ${error instanceof Error ? error.message : String(error)}`, true);+ notifications.addErrorMessage(`${t('emails.modal.emailDeleteFailed')}: ${error instanceof Error ? error.message : String(error)}`, true);}};@@ -68,12 +68,12 @@ const EmailPreview: React.FC<EmailPreviewProps> = ({ email, onEmailDeleted, itemtry {const bytes = await getAttachmentBytes(webApi, dbContext.sqliteClient, email, attachment);if (!bytes) {- notifications.addErrorMessage(t('components.main.email.emailPreview.AttachmentDownloadFailed'), true);+ notifications.addErrorMessage(t('common.attachmentDownloadFailed'), true);return;}downloadBytes(attachment.filename, bytes, attachment.mimeType);} catch (error) {- notifications.addErrorMessage(`${t('components.main.email.emailPreview.AttachmentDownloadError')}: ${error instanceof Error ? error.message : String(error)}`, true);+ notifications.addErrorMessage(`${t('emails.modal.attachmentDownloadError')}: ${error instanceof Error ? error.message : String(error)}`, true);}};@@ -90,7 +90,7 @@ const EmailPreview: React.FC<EmailPreviewProps> = ({ email, onEmailDeleted, item</h2><div className="flex items-center gap-2">{availableModes.length > 1 && (- <button type="button" onClick={cycleViewMode} title={t('sharedResources.EmailFormatSwitchTitle')} className="text-xs font-medium px-2 py-1 rounded text-gray-600 hover:text-gray-800 hover:bg-gray-200 dark:text-gray-300 dark:hover:text-gray-100 dark:hover:bg-gray-600">+ <button type="button" onClick={cycleViewMode} title={t('emails.formatSwitchTitle')} className="text-xs font-medium px-2 py-1 rounded text-gray-600 hover:text-gray-800 hover:bg-gray-200 dark:text-gray-300 dark:hover:text-gray-100 dark:hover:bg-gray-600">{formatLabel}</button>)}@@ -103,17 +103,17 @@ const EmailPreview: React.FC<EmailPreviewProps> = ({ email, onEmailDeleted, item</div><div className="grid grid-cols-1 sm:grid-cols-2 gap-4 text-sm text-gray-600 dark:text-gray-300"><div className="space-y-1">- <p><span className="font-medium">{t('components.main.email.emailPreview.FromLabel')}</span> {email.fromLocal}@{email.fromDomain}</p>- <p><span className="font-medium">{t('components.main.email.emailPreview.ToLabel')}</span> {email.toLocal}@{email.toDomain}</p>+ <p><span className="font-medium">{t('emails.from')}</span> {email.fromLocal}@{email.fromDomain}</p>+ <p><span className="font-medium">{t('emails.to')}</span> {email.toLocal}@{email.toDomain}</p></div><div className="space-y-1">- <p><span className="font-medium">{t('components.main.email.emailPreview.DateLabel')}</span> {new Date(email.dateSystem).toLocaleString()}</p>+ <p><span className="font-medium">{t('emails.date')}</span> {new Date(email.dateSystem).toLocaleString()}</p>{item !== null && item.name.length > 0 ? (- <p><span className="font-medium">{t('sharedResources.EmailItemLabel')}</span>{' '}+ <p><span className="font-medium">{t('common.emailItemLabel')}</span>{' '}<button type="button" onClick={() => onItemClick(item.ref)} className="text-primary-600 hover:underline dark:text-primary-400 cursor-pointer">{item.name}</button></p>) : (- <p><span className="font-medium">{t('sharedResources.EmailItemLabel')}</span> <span className="text-gray-400 dark:text-gray-500">{t('sharedResources.EmailItemNone')}</span></p>+ <p><span className="font-medium">{t('common.emailItemLabel')}</span> <span className="text-gray-400 dark:text-gray-500">{t('common.none')}</span></p>)}</div></div>@@ -123,13 +123,13 @@ const EmailPreview: React.FC<EmailPreviewProps> = ({ email, onEmailDeleted, item<div className="flex-1 overflow-y-auto p-4"><div className="text-gray-700 dark:text-gray-300 h-full">{/* Mount only once the body exists to prevent browsers from dropping a srcdoc change made while the initial empty srcdoc still loads. */}- {emailBody !== '' && <iframe title="email" className="w-full h-full border-0" srcDoc={emailBody} sandbox="allow-popups allow-popups-to-escape-sandbox"></iframe>}+ {emailBody !== '' && <iframe title={t('common.email')} className="w-full h-full border-0" srcDoc={emailBody} sandbox="allow-popups allow-popups-to-escape-sandbox"></iframe>}</div></div>{email.attachments.length > 0 && (<div className="border-t border-gray-200 dark:border-gray-600 p-4 bg-gray-50 dark:bg-gray-800">- <h3 className="text-sm font-medium text-gray-500 dark:text-gray-400 mb-2">{t('components.main.email.emailPreview.AttachmentsLabel')}</h3>+ <h3 className="text-sm font-medium text-gray-500 dark:text-gray-400 mb-2">{t('common.attachments')}</h3><div className="grid grid-cols-1 gap-2 max-h-32 overflow-y-auto">{email.attachments.map((attachment) => (<div key={attachment.index} className="flex items-center space-x-2">@@ -152,7 +152,7 @@ const EmailPreview: React.FC<EmailPreviewProps> = ({ email, onEmailDeleted, item<svg className="mx-auto h-12 w-12 text-gray-300 dark:text-gray-600" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M3 8l7.89 4.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" /></svg>- <p className="mt-2 text-sm">{t('components.main.email.emailPreview.SelectEmailMessage')}</p>+ <p className="mt-2 text-sm">{t('emails.preview.selectEmailMessage')}</p></div></div>)}diff --git a/apps/web/src/components/email/EmailRow.tsx b/apps/web/src/components/email/EmailRow.tsxindex 67d06f813..45baa4558 100644--- a/apps/web/src/components/email/EmailRow.tsx+++ b/apps/web/src/components/email/EmailRow.tsx@@ -65,7 +65,7 @@ const EmailRowComponent: React.FC<EmailRowProps> = ({ email, onEmailClick, onEma</svg>)}{isNewEmail && (- <div className="w-2 h-2 ml-1 bg-yellow-500 rounded-full animate-pulse flex-shrink-0" title={t('components.main.email.emailRow.NewEmailTooltip')}></div>+ <div className="w-2 h-2 ml-1 bg-yellow-500 rounded-full animate-pulse flex-shrink-0" title={t('emails.row.newEmailTooltip')}></div>)}</div><div className="text-sm text-gray-600 dark:text-gray-300 truncate mb-1">diff --git a/apps/web/src/components/email/RecentEmails.tsx b/apps/web/src/components/email/RecentEmails.tsxindex c69ddf62a..8e85edfa5 100644--- a/apps/web/src/components/email/RecentEmails.tsx+++ b/apps/web/src/components/email/RecentEmails.tsx@@ -74,7 +74,7 @@ const RecentEmails: React.FC<RecentEmailsProps> = ({ emailAddress }) => {}} catch (err) {if (apiErrorCodeOf(err) === 'CLAIM_DOES_NOT_MATCH_USER') {- setError(t('components.main.email.recentEmails.EmailAddressInUseError'));+ setError(t('apiErrors.CLAIM_DOES_NOT_MATCH_USER'));} else if (apiErrorCodeOf(err) === 'CLAIM_DOES_NOT_EXIST') {/** The server learns about a new address when the vault push that follows a save lands. A load that races@@ -84,7 +84,7 @@ const RecentEmails: React.FC<RecentEmailsProps> = ({ emailAddress }) => {setTimeout(() => void loadRecentEmails(), ACTIVE_TAB_REFRESH_INTERVAL_MS);return;}- setError(t('components.main.email.recentEmails.EmailLoadError'));+ setError(t('apiErrors.CLAIM_DOES_NOT_EXIST'));} else {setError(err instanceof Error ? err.message : String(err));}@@ -190,8 +190,8 @@ const RecentEmails: React.FC<RecentEmailsProps> = ({ emailAddress }) => {const canLoadMore = displayedCount < mailboxEmails.length;const headerRow = (<tr>- <th scope="col" className="p-4 text-xs font-medium tracking-wider text-left text-gray-500 uppercase dark:text-white">{t('components.main.email.recentEmails.SubjectColumn')}</th>- <th scope="col" className="p-4 text-xs font-medium tracking-wider text-left text-gray-500 uppercase dark:text-white">{t('components.main.email.recentEmails.DateColumn')}</th>+ <th scope="col" className="p-4 text-xs font-medium tracking-wider text-left text-gray-500 uppercase dark:text-white">{t('emails.recent.subjectColumn')}</th>+ <th scope="col" className="p-4 text-xs font-medium tracking-wider text-left text-gray-500 uppercase dark:text-white">{t('emails.dateColumn')}</th></tr>);@@ -202,11 +202,11 @@ const RecentEmails: React.FC<RecentEmailsProps> = ({ emailAddress }) => {<Card variant="section"><div className="flex justify-between"><div>- <SectionTitle>{t('components.main.email.recentEmails.EmailSectionTitle')}</SectionTitle>+ <SectionTitle>{t('common.email')}</SectionTitle></div><div className="flex justify-end items-center space-x-2">{autoRefreshEnabled && (- <div className="w-3 h-3 mr-2 rounded-full bg-primary-300 border-2 border-primary-100 animate-pulse" title={t('components.main.email.recentEmails.AutoRefreshEnabledTooltip')}></div>+ <div className="w-3 h-3 mr-2 rounded-full bg-primary-300 border-2 border-primary-100 animate-pulse" title={t('emails.home.autoRefreshEnabledTooltip')}></div>)}<button id="recent-email-refresh" onClick={() => void manualRefresh()} type="button" className="text-gray-500 border border-gray-300 hover:bg-gray-100 hover:text-gray-700 focus:ring-4 focus:outline-none focus:ring-gray-200 font-medium rounded-full text-sm p-2 text-center inline-flex items-center dark:border-gray-600 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-gray-200 dark:focus:ring-gray-700"><svg className="w-4 h-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2.5" stroke="currentColor">@@ -243,7 +243,7 @@ const RecentEmails: React.FC<RecentEmailsProps> = ({ emailAddress }) => {) : error.length > 0 ? (<AlertMessageError message={error} />) : mailboxEmails.length === 0 ? (- <div className="text-sm text-gray-600 dark:text-gray-400">{t('components.main.email.recentEmails.NoEmailsReceivedMessage')}</div>+ <div className="text-sm text-gray-600 dark:text-gray-400">{t('emails.recent.noEmailsReceivedMessage')}</div>) : (<div className="flex flex-col mt-6"><div className="overflow-x-auto rounded-lg">@@ -270,7 +270,7 @@ const RecentEmails: React.FC<RecentEmailsProps> = ({ emailAddress }) => {{canLoadMore && (<button onClick={() => setDisplayedCount(c => c + EMAILS_PER_LOAD)} type="button" className="w-full mt-3 py-1 px-3 bg-gray-50 dark:bg-gray-800 hover:bg-gray-100 dark:hover:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-md transition-colors duration-200 text-sm text-gray-600 dark:text-gray-300 hover:text-gray-800 dark:hover:text-gray-100 flex items-center justify-center gap-1">- <span>{t('components.main.email.recentEmails.LoadMoreButton')}</span>+ <span>{t('common.loadMore')}</span><svg className="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 9l-7 7-7-7" /></svg>diff --git a/apps/web/src/components/folders/DeleteFolderModal.tsx b/apps/web/src/components/folders/DeleteFolderModal.tsxindex 556e7abdc..1493cfe04 100644--- a/apps/web/src/components/folders/DeleteFolderModal.tsx+++ b/apps/web/src/components/folders/DeleteFolderModal.tsx@@ -35,7 +35,7 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({ isOpen, folderNamreturn (<FormModalisOpen={isOpen}- title={t('components.folders.deleteFolderModal.DeleteFolderTitle')}+ title={t('items.folders.deleteFolder')}iconBackgroundClass="bg-red-100 dark:bg-red-900/30"showDefaultFooter={false}onClose={onClose}@@ -57,8 +57,8 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({ isOpen, folderNam</svg></div><div className="flex-1 text-left">- <div className="font-medium text-orange-700 dark:text-orange-300">{t('components.folders.deleteFolderModal.DeleteFolderOnlyTitle')}</div>- <div className="text-sm text-orange-600/80 dark:text-orange-400/80">{t('components.folders.deleteFolderModal.DeleteFolderOnlyDescription')}</div>+ <div className="font-medium text-orange-700 dark:text-orange-300">{t('items.folders.deleteFolderKeepItems')}</div>+ <div className="text-sm text-orange-600/80 dark:text-orange-400/80">{t('items.folders.deleteFolderKeepItemsDescription')}</div></div></button>@@ -75,8 +75,8 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({ isOpen, folderNam</svg></div><div className="flex-1 text-left">- <div className="font-medium text-red-700 dark:text-red-300">{t('components.folders.deleteFolderModal.DeleteFolderAndContentsTitle')}</div>- <div className="text-sm text-red-600/80 dark:text-red-400/80">{t('components.folders.deleteFolderModal.DeleteFolderAndContentsDescription', { 0: itemCount })}</div>+ <div className="font-medium text-red-700 dark:text-red-300">{t('items.folders.deleteModal.deleteFolderAndContentsTitle')}</div>+ <div className="text-sm text-red-600/80 dark:text-red-400/80">{t('items.folders.deleteModal.deleteFolderAndContentsDescription', { count: itemCount })}</div></div></button>)}@@ -85,12 +85,12 @@ const DeleteFolderModal: React.FC<DeleteFolderModalProps> = ({ isOpen, folderNamtype="button"onClick={onClose}className="w-full mt-2 inline-flex justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:hover:bg-gray-600">- {t('components.folders.deleteFolderModal.CancelButton')}+ {t('common.cancel')}</button></div>)}><p className="text-sm text-gray-500 dark:text-gray-400">- {t('components.folders.deleteFolderModal.DeleteFolderDescription', { 0: folderName })}+ {t('items.folders.deleteModal.deleteFolderDescription', { name: folderName })}</p></FormModal>);diff --git a/apps/web/src/components/folders/FolderModal.tsx b/apps/web/src/components/folders/FolderModal.tsxindex 73dfaf05f..362151266 100644--- a/apps/web/src/components/folders/FolderModal.tsx+++ b/apps/web/src/components/folders/FolderModal.tsx@@ -34,7 +34,7 @@ const FolderModal: React.FC<FolderModalProps> = ({ isOpen, mode, initialName = 'const handleSave = async (): Promise<void> => {const trimmedName = folderName.trim();if (trimmedName.length === 0) {- setErrorMessage(t('components.folders.folderModal.FolderNameRequired'));+ setErrorMessage(t('items.folders.folderNameRequired'));return;}@@ -53,9 +53,9 @@ const FolderModal: React.FC<FolderModalProps> = ({ isOpen, mode, initialName = 'return (<FormModalisOpen={isOpen}- title={mode === 'create' ? t('components.folders.folderModal.CreateFolderTitle') : t('components.folders.folderModal.EditFolderTitle')}- confirmText={mode === 'create' ? t('components.folders.folderModal.CreateButton') : t('components.folders.folderModal.SaveButton')}- cancelText={t('components.folders.folderModal.CancelButton')}+ title={mode === 'create' ? t('items.folders.createFolder') : t('items.folders.editFolder')}+ confirmText={mode === 'create' ? t('common.create') : t('common.save')}+ cancelText={t('common.cancel')}isLoading={isSaving}confirmDisabled={folderName.trim().length === 0}onClose={onClose}@@ -66,14 +66,14 @@ const FolderModal: React.FC<FolderModalProps> = ({ isOpen, mode, initialName = '</svg>)}><label htmlFor="folder-name" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">- {t('components.folders.folderModal.FolderNameLabel')}+ {t('items.folders.folderName')}</label><inputtype="text"id="folder-name"value={folderName}onChange={(e) => setFolderName(e.target.value)}- placeholder={t('components.folders.folderModal.FolderNamePlaceholder')}+ placeholder={t('items.folders.modal.folderNamePlaceholder')}autoFocusclassName="block w-full rounded-md border-0 py-2 px-3 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-orange-600 sm:text-sm sm:leading-6 dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:placeholder:text-gray-500 dark:focus:ring-orange-500" />{errorMessage && (diff --git a/apps/web/src/components/forms/CustomFieldLabel.tsx b/apps/web/src/components/forms/CustomFieldLabel.tsxindex a9cf21f83..29bdb036b 100644--- a/apps/web/src/components/forms/CustomFieldLabel.tsx+++ b/apps/web/src/components/forms/CustomFieldLabel.tsx@@ -17,13 +17,13 @@ const CustomFieldLabel: React.FC<CustomFieldLabelProps> = ({ htmlFor, label, onEreturn (<div className="flex items-center gap-2 mb-2"><label htmlFor={htmlFor} className="text-sm font-medium text-gray-900 dark:text-white">{label}</label>- <button type="button" onClick={onEdit} className="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 text-xs" title={t('components.main.forms.editableFieldLabel.EditLabel')}>+ <button type="button" onClick={onEdit} className="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 text-xs" title={t('items.editableFieldLabel.editLabel')}><svg className="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z" /></svg></button>{onDelete && (- <button type="button" onClick={onDelete} className="text-red-600 dark:text-red-400 hover:text-red-700 dark:hover:text-red-300 text-xs" title={t('components.main.forms.editableFieldLabel.DeleteField')}>+ <button type="button" onClick={onDelete} className="text-red-600 dark:text-red-400 hover:text-red-700 dark:hover:text-red-300 text-xs" title={t('items.editableFieldLabel.deleteField')}><svg className="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" /></svg>diff --git a/apps/web/src/components/forms/CustomFieldModal.tsx b/apps/web/src/components/forms/CustomFieldModal.tsxindex 2e8277e72..a17e54361 100644--- a/apps/web/src/components/forms/CustomFieldModal.tsx+++ b/apps/web/src/components/forms/CustomFieldModal.tsx@@ -15,15 +15,15 @@ type CustomFieldModalProps = {/** The field types a custom field can have, with their translation keys. */const FIELD_TYPE_OPTIONS: [string, string][] = [- [FieldTypes.Text, 'FieldTypeText'],- [FieldTypes.Password, 'FieldTypePassword'],- [FieldTypes.Hidden, 'FieldTypeHidden'],- [FieldTypes.TextArea, 'FieldTypeTextArea'],- [FieldTypes.URL, 'FieldTypeUrl'],- [FieldTypes.Email, 'FieldTypeEmail'],- [FieldTypes.Phone, 'FieldTypePhone'],- [FieldTypes.Number, 'FieldTypeNumber'],- [FieldTypes.Date, 'FieldTypeDate'],+ [FieldTypes.Text, 'itemTypes.fieldTypes.text'],+ [FieldTypes.Password, 'itemTypes.fieldTypes.password'],+ [FieldTypes.Hidden, 'itemTypes.fieldTypes.hidden'],+ [FieldTypes.TextArea, 'itemTypes.fieldTypes.textArea'],+ [FieldTypes.URL, 'itemTypes.fieldTypes.url'],+ [FieldTypes.Email, 'itemTypes.fieldTypes.email'],+ [FieldTypes.Phone, 'itemTypes.fieldTypes.phone'],+ [FieldTypes.Number, 'itemTypes.fieldTypes.number'],+ [FieldTypes.Date, 'itemTypes.fieldTypes.date'],];/**@@ -62,9 +62,9 @@ const CustomFieldModal: React.FC<CustomFieldModalProps> = ({ isOpen, isEditModereturn (<FormModalisOpen={isOpen}- title={isEditMode ? t('components.main.items.addFieldMenu.EditCustomField') : t('components.main.items.addFieldMenu.AddCustomField')}- confirmText={isEditMode ? t('sharedResources.Save') : t('components.main.items.addFieldMenu.Add')}- cancelText={t('components.main.items.addFieldMenu.Cancel')}+ title={isEditMode ? t('itemTypes.editCustomField') : t('itemTypes.addCustomField')}+ confirmText={isEditMode ? t('common.save') : t('common.add')}+ cancelText={t('common.cancel')}confirmButtonClass="bg-primary-600 hover:bg-primary-500 dark:bg-primary-700 dark:hover:bg-primary-600"maxWidth="md"onClose={onClose}@@ -77,13 +77,13 @@ const CustomFieldModal: React.FC<CustomFieldModalProps> = ({ isOpen, isEditMode><div className="space-y-4"><div>- <label htmlFor="custom-field-label-input" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{t('components.main.items.addFieldMenu.FieldLabel')}</label>- <input ref={inputRef} type="text" id="custom-field-label-input" value={label} onChange={e => setLabel(e.target.value)} className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-700 dark:text-white" placeholder={t('components.main.items.addFieldMenu.EnterFieldName')} />+ <label htmlFor="custom-field-label-input" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{t('itemTypes.fieldLabel')}</label>+ <input ref={inputRef} type="text" id="custom-field-label-input" value={label} onChange={e => setLabel(e.target.value)} className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-700 dark:text-white" placeholder={t('itemTypes.enterFieldName')} /></div><div>- <label htmlFor="custom-field-type-select" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{t('components.main.items.addFieldMenu.FieldType')}</label>+ <label htmlFor="custom-field-type-select" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{t('itemTypes.fieldType')}</label><select id="custom-field-type-select" value={fieldType} onChange={e => setFieldType(e.target.value)} className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 dark:bg-gray-700 dark:text-white">- {FIELD_TYPE_OPTIONS.map(([value, key]) => <option key={value} value={value}>{t(`components.main.items.addFieldMenu.${key}`)}</option>)}+ {FIELD_TYPE_OPTIONS.map(([value, key]) => <option key={value} value={value}>{t(key)}</option>)}</select></div></div>diff --git a/apps/web/src/components/forms/EditPasswordFormRow.tsx b/apps/web/src/components/forms/EditPasswordFormRow.tsxindex aa337cc9a..4cbcdbade 100644--- a/apps/web/src/components/forms/EditPasswordFormRow.tsx+++ b/apps/web/src/components/forms/EditPasswordFormRow.tsx@@ -31,7 +31,6 @@ const EditPasswordFormRow: React.FC<EditPasswordFormRowProps> = ({ id, label, vaconst [isSettingsVisible, setIsSettingsVisible] = useState(false);const [settings, setSettings] = useState<PasswordSettings | null>(null);const [sliderValue, setSliderValue] = useState(0);- const tk = 'components.main.settings.passwordSettingsPopup';useEffect(() => {if (showPassword) {@@ -111,7 +110,7 @@ const EditPasswordFormRow: React.FC<EditPasswordFormRowProps> = ({ id, label, va<div className="pt-2"><div className="flex items-center justify-between mb-1"><label htmlFor={`${id}-inline-length`} className="text-sm font-medium text-gray-700 dark:text-gray-300">- {isDiceware ? t(`${tk}.WordCountLabel`) : t(`${tk}.PasswordLengthLabel`, { 0: settings.Length })}+ {isDiceware ? t('items.wordCount') : t('items.passwordSettingsPopup.passwordLengthLabel', { length: settings.Length })}</label>{isDiceware && <span className="text-sm text-gray-600 dark:text-gray-400 font-mono">{settings.WordCount}</span>}</div>diff --git a/apps/web/src/components/forms/EmailDomainField.tsx b/apps/web/src/components/forms/EmailDomainField.tsxindex 8e9549624..1c369952d 100644--- a/apps/web/src/components/forms/EmailDomainField.tsx+++ b/apps/web/src/components/forms/EmailDomainField.tsx@@ -31,7 +31,6 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({ id, value, onChangeconst [selectedDomain, setSelectedDomain] = useState('');const [isPopupVisible, setIsPopupVisible] = useState(false);const modeToggledByUser = useRef(false);- const tk = 'components.main.forms.emailDomainField';const showPrivateDomains = privateDomains.length > 0 && !(privateDomains.length === 1 && (privateDomains[0] === 'DISABLED.TLD' || privateDomains[0] === ''));const defaultDomain = showPrivateDomains ? privateDomains[0] : publicDomains[0] ?? '';@@ -178,17 +177,17 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({ id, value, onChange<div className="flex items-center"><div className="flex items-center"><button type="button" disabled={isCustomDomain} className={isCustomDomain ? 'text-sm font-medium text-primary-600 dark:text-primary-400' : 'text-sm font-medium text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400 cursor-pointer transition-colors'} onClick={toggleToEmailMode}>- {t('sharedResources.Email')}+ {t('common.email')}</button><span className="mx-2 text-gray-400 dark:text-gray-500">/</span><button type="button" disabled={!isCustomDomain} className={!isCustomDomain ? 'text-sm font-medium text-primary-600 dark:text-primary-400' : 'text-sm font-medium text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400 cursor-pointer transition-colors'} onClick={toggleToAliasMode}>- {t(`${tk}.Alias`)}+ {t('common.alias')}</button>{required && <span className="text-red-500 ml-1">*</span>}</div></div>{onRemove && (- <button type="button" onClick={onRemove} className="w-5 h-5 flex items-center justify-center text-gray-300 hover:text-red-400 dark:text-gray-500 dark:hover:text-red-400 transition-colors" title={t('sharedResources.Delete')}>+ <button type="button" onClick={onRemove} className="w-5 h-5 flex items-center justify-center text-gray-300 hover:text-red-400 dark:text-gray-500 dark:hover:text-red-400 transition-colors" title={t('common.delete')}><svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><line x1="18" y1="6" x2="6" y2="18" /><line x1="6" y1="6" x2="18" y2="18" />@@ -207,7 +206,7 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({ id, value, onChange</button>)}{!isCustomDomain && onGenerateAlias && (- <button type="button" onClick={handleRegenerate} className="px-3 text-gray-500 dark:text-white bg-gray-200 hover:bg-gray-300 focus:ring-4 focus:outline-none focus:ring-gray-300 font-medium rounded-r-lg text-sm border-l border-gray-300 dark:border-gray-700 dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800" title={t('sharedResources.Generate')}>+ <button type="button" onClick={handleRegenerate} className="px-3 text-gray-500 dark:text-white bg-gray-200 hover:bg-gray-300 focus:ring-4 focus:outline-none focus:ring-gray-300 font-medium rounded-r-lg text-sm border-l border-gray-300 dark:border-gray-700 dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800" title={t('common.generate')}><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" /></svg>@@ -221,9 +220,9 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({ id, value, onChange{showPrivateDomains && (<div className="mb-4"><h4 className="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-2">- {t(`${tk}.PrivateEmailTitle`)} <span className="text-gray-500 dark:text-gray-400">({t(`${tk}.PrivateEmailAliasVaultServer`)})</span>+ {t('items.privateEmailTitle')} <span className="text-gray-500 dark:text-gray-400">({t('items.privateEmailAliasVaultServer')})</span></h4>- <p className="text-xs text-gray-500 dark:text-gray-400 mb-3">{t(`${tk}.PrivateEmailDescription`)}</p>+ <p className="text-xs text-gray-500 dark:text-gray-400 mb-3">{t('items.privateEmailDescription')}</p><div className="flex flex-wrap gap-2">{privateDomains.map(domain => <button key={domain} type="button" onClick={() => selectDomain(domain)} className={domainButtonClasses(domain)}>{domain}</button>)}</div>@@ -231,8 +230,8 @@ const EmailDomainField: React.FC<EmailDomainFieldProps> = ({ id, value, onChange)}<div className={showPrivateDomains ? 'border-t border-gray-200 dark:border-gray-600 pt-4' : ''}>- <h4 className="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-2">{t(`${tk}.PublicEmailTitle`)}</h4>- <p className="text-xs text-gray-500 dark:text-gray-400 mb-3">{t(`${tk}.PublicEmailDescription`)}</p>+ <h4 className="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-2">{t('items.publicEmailTitle')}</h4>+ <p className="text-xs text-gray-500 dark:text-gray-400 mb-3">{t('items.publicEmailDescription')}</p><div className="flex flex-wrap gap-2">{publicDomains.map(domain => <button key={domain} type="button" onClick={() => selectDomain(domain)} className={domainButtonClasses(domain)}>{domain}</button>)}</div>diff --git a/apps/web/src/components/forms/RemovableSection.tsx b/apps/web/src/components/forms/RemovableSection.tsxindex 0cca4d640..3456875d8 100644--- a/apps/web/src/components/forms/RemovableSection.tsx+++ b/apps/web/src/components/forms/RemovableSection.tsx@@ -24,7 +24,7 @@ const RemovableSection: React.FC<RemovableSectionProps> = ({ title = '', canRemo{children}</div>{canRemove && (- <button type="button" onClick={onRemove} className="absolute top-3 right-3 text-gray-400 hover:text-red-500 transition-colors" title={t('sharedResources.Delete')}>+ <button type="button" onClick={onRemove} className="absolute top-3 right-3 text-gray-400 hover:text-red-500 transition-colors" title={t('common.delete')}><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12" /></svg>diff --git a/apps/web/src/components/items/AddFieldMenu.tsx b/apps/web/src/components/items/AddFieldMenu.tsxindex 602d28f17..38de62e47 100644--- a/apps/web/src/components/items/AddFieldMenu.tsx+++ b/apps/web/src/components/items/AddFieldMenu.tsx@@ -1,4 +1,4 @@-import { FieldCategories, FieldKey, type SystemFieldDefinition } from '@aliasvault/models/vault';+import { FieldCategories, type SystemFieldDefinition } from '@aliasvault/models/vault';import React, { useState } from 'react';import { useTranslation } from 'react-i18next';@@ -18,24 +18,6 @@ type AddFieldMenuProps = {};/** Translation keys of the optional system field names. */-const FIELD_LABEL_KEYS: Record<string, string> = {- [FieldKey.LoginUsername]: 'FieldLoginUsername',- [FieldKey.LoginPassword]: 'FieldLoginPassword',- [FieldKey.LoginEmail]: 'FieldLoginEmail',- [FieldKey.LoginUrl]: 'FieldLoginUrl',- [FieldKey.AliasFirstName]: 'FieldAliasFirstName',- [FieldKey.AliasLastName]: 'FieldAliasLastName',- [FieldKey.AliasGender]: 'FieldAliasGender',- [FieldKey.AliasBirthdate]: 'FieldAliasBirthdate',- [FieldKey.CardNumber]: 'FieldCardNumber',- [FieldKey.CardCardholderName]: 'FieldCardCardholderName',- [FieldKey.CardExpiryMonth]: 'FieldCardExpiryMonth',- [FieldKey.CardExpiryYear]: 'FieldCardExpiryYear',- [FieldKey.CardCvv]: 'FieldCardCvv',- [FieldKey.CardPin]: 'FieldCardPin',- [FieldKey.NotesContent]: 'FieldNotesContent',-};-/*** The icon of a field category.*/@@ -60,7 +42,6 @@ const AddFieldMenu: React.FC<AddFieldMenuProps> = ({ optionalSystemFields, visibconst [isOpen, setIsOpen] = useState(false);const [showCustomFieldModal, setShowCustomFieldModal] = useState(false);const [customFieldLabel, setCustomFieldLabel] = useState('');- const tk = 'components.main.items.addFieldMenu';return (<div className="relative">@@ -80,7 +61,7 @@ const AddFieldMenu: React.FC<AddFieldMenuProps> = ({ optionalSystemFields, visibsetIsOpen(false);}} className={MENU_ITEM_CLASSES}><span className="text-gray-500 dark:text-gray-400"><FieldIcon category={field.Category} /></span>- <span>{FIELD_LABEL_KEYS[field.FieldKey] ? t(`${tk}.${FIELD_LABEL_KEYS[field.FieldKey]}`) : field.FieldKey}</span>+ <span>{t(`fieldLabels.${field.FieldKey}`, { defaultValue: field.FieldKey })}</span></button>))}@@ -94,7 +75,7 @@ const AddFieldMenu: React.FC<AddFieldMenuProps> = ({ optionalSystemFields, visib<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z" /></svg></span>- <span>{t(`${tk}.TwoFactorAuthentication`)}</span>+ <span>{t('common.twoFactorAuthentication')}</span></button>)}@@ -108,12 +89,12 @@ const AddFieldMenu: React.FC<AddFieldMenuProps> = ({ optionalSystemFields, visib<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13" /></svg></span>- <span>{t(`${tk}.Attachments`)}</span>+ <span>{t('common.attachments')}</span></button>)}<button type="button" onClick={() => {- setCustomFieldLabel(t(`${tk}.DefaultFieldLabel`, { 0: customFieldCount + 1 }));+ setCustomFieldLabel(t('items.addFieldMenu.defaultFieldLabel', { number: customFieldCount + 1 }));setShowCustomFieldModal(true);setIsOpen(false);}} className={MENU_ITEM_CLASSES}>@@ -122,7 +103,7 @@ const AddFieldMenu: React.FC<AddFieldMenuProps> = ({ optionalSystemFields, visib<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6" /></svg></span>- <span>{t(`${tk}.AddCustomField`)}</span>+ <span>{t('itemTypes.addCustomField')}</span></button></div></>diff --git a/apps/web/src/components/items/FieldBlock.tsx b/apps/web/src/components/items/FieldBlock.tsxindex e83307f63..1636ecceb 100644--- a/apps/web/src/components/items/FieldBlock.tsx+++ b/apps/web/src/components/items/FieldBlock.tsx@@ -34,7 +34,7 @@ export function useFieldLabel(field: DisplayField): string {return field.Label.length > 0 ? field.Label : formatFieldName(field.FieldKey);}if (field.FieldKey.length > 0) {- const key = `components.fields.fieldBlock.FieldLabel_${field.FieldKey.replace(/\./g, '_')}`;+ const key = `fieldLabels.${field.FieldKey}`;const localized = t(key, { defaultValue: '' });if (localized.length > 0) {return localized;@@ -96,7 +96,7 @@ const FieldBlock: React.FC<FieldBlockProps> = ({ field, item, fullWidth = false,<FormLabel htmlFor={fieldId}>{label}{field.EnableHistory && historyCount > 0 && (- <button type="button" className="ml-2 inline-flex items-center text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 focus:outline-none" title={t('components.fields.fieldBlock.ViewHistory')} onClick={() => setShowHistoryModal(true)}>+ <button type="button" className="ml-2 inline-flex items-center text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 focus:outline-none" title={t('items.viewHistory')} onClick={() => setShowHistoryModal(true)}><svg className="h-4 w-4" fill="none" viewBox="0 0 24 24" strokeWidth="1.5" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" /></svg>diff --git a/apps/web/src/components/items/FieldHistoryModal.tsx b/apps/web/src/components/items/FieldHistoryModal.tsxindex 25a7a01d0..5c3431b18 100644--- a/apps/web/src/components/items/FieldHistoryModal.tsx+++ b/apps/web/src/components/items/FieldHistoryModal.tsx@@ -86,9 +86,9 @@ const FieldHistoryModal: React.FC<FieldHistoryModalProps> = ({ item, fieldKey, f<div className="p-4 border-b border-gray-200 dark:border-gray-700"><div className="flex items-center justify-between"><h2 className="text-xl font-bold text-gray-900 dark:text-white">- {t('components.fields.fieldHistoryModal.HistoryTitle')} - {fieldLabel}+ {t('items.history')} - {fieldLabel}</h2>- <button type="button" onClick={onClose} className="text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" title={t('sharedResources.Close')} aria-label={t('sharedResources.Close')}>+ <button type="button" onClick={onClose} className="text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" title={t('common.close')} aria-label={t('common.close')}><svg className="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12" /></svg>@@ -105,7 +105,7 @@ const FieldHistoryModal: React.FC<FieldHistoryModalProps> = ({ item, fieldKey, f</svg></div>) : records.length === 0 ? (- <p className="text-gray-500 dark:text-gray-400 text-center py-8">{t('components.fields.fieldHistoryModal.NoHistoryAvailable')}</p>+ <p className="text-gray-500 dark:text-gray-400 text-center py-8">{t('items.noHistoryAvailable')}</p>) : (<div className="space-y-4">{records.map((record) => {@@ -116,16 +116,16 @@ const FieldHistoryModal: React.FC<FieldHistoryModalProps> = ({ item, fieldKey, f<div className="text-sm text-gray-500 dark:text-gray-400">{formatDate(record.ChangedAt)}</div>{confirmDeleteId === record.Id ? (<div className="flex items-center gap-2">- <span className="text-xs text-gray-500 dark:text-gray-400">{t('components.fields.fieldHistoryModal.DeleteConfirm')}</span>+ <span className="text-xs text-gray-500 dark:text-gray-400">{t('items.fieldHistory.deleteConfirm')}</span><button type="button" onClick={() => void deleteRecord(record.Id)} className="text-xs px-2 py-1 text-red-600 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 font-medium">- {t('sharedResources.Confirm')}+ {t('common.confirm')}</button><button type="button" onClick={() => setConfirmDeleteId(null)} className="text-xs px-2 py-1 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200">- {t('sharedResources.Cancel')}+ {t('common.cancel')}</button></div>) : (- <button type="button" onClick={() => setConfirmDeleteId(record.Id)} className="text-gray-500 hover:text-red-600 dark:text-gray-400 dark:hover:text-red-400 transition-colors" title={t('sharedResources.Delete')}>+ <button type="button" onClick={() => setConfirmDeleteId(record.Id)} className="text-gray-500 hover:text-red-600 dark:text-gray-400 dark:hover:text-red-400 transition-colors" title={t('common.delete')}><svg className="h-4 w-4" fill="none" viewBox="0 0 24 24" strokeWidth="1.5" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" /></svg>diff --git a/apps/web/src/components/items/FolderSelector.tsx b/apps/web/src/components/items/FolderSelector.tsxindex 3afdd386f..f6fcd769d 100644--- a/apps/web/src/components/items/FolderSelector.tsx+++ b/apps/web/src/components/items/FolderSelector.tsx@@ -30,7 +30,7 @@ const FolderSelector: React.FC<FolderSelectorProps> = ({ selectedFolder, onSelecconst [itemCounts, setItemCounts] = useState<Record<string, number>>({});const [expandedFolderIds, setExpandedFolderIds] = useState<Set<string>>(new Set());const [showFolderModal, setShowFolderModal] = useState(false);- const tk = 'components.main.items.folderSelector';+const personalManifestId = dbContext.sqliteClient?.getPersonalManifestId() ?? null;useEffect(() => {@@ -155,7 +155,7 @@ const FolderSelector: React.FC<FolderSelectorProps> = ({ selectedFolder, onSelec<path strokeLinecap="round" strokeLinejoin="round" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z" /></svg>)}- <span className="truncate">{selectedFolder ? selectedFolderRow?.Name : t(`${tk}.NoFolder`)}</span>+ <span className="truncate">{selectedFolder ? selectedFolderRow?.Name : t('items.folderSelector.noFolder')}</span><svg className="w-3.5 h-3.5 ml-auto flex-shrink-0 opacity-70" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth="2"><path strokeLinecap="round" strokeLinejoin="round" d="M19 9l-7 7-7-7" /></svg>@@ -163,7 +163,7 @@ const FolderSelector: React.FC<FolderSelectorProps> = ({ selectedFolder, onSelec<FormModalisOpen={showFolderModal}- title={t(`${tk}.SelectFolderTitle`)}+ title={t('items.folders.selectFolder')}showDefaultFooter={false}maxWidth="sm"onClose={() => setShowFolderModal(false)}@@ -215,7 +215,7 @@ const FolderSelector: React.FC<FolderSelectorProps> = ({ selectedFolder, onSelec);})}- {flatTree.length === 0 && <p className="px-3 py-2 text-sm text-gray-500 dark:text-gray-400 italic">{t(`${tk}.NoFoldersAvailable`)}</p>}+ {flatTree.length === 0 && <p className="px-3 py-2 text-sm text-gray-500 dark:text-gray-400 italic">{t('items.folderSelector.noFoldersAvailable')}</p>}</div></FormModal></>diff --git a/apps/web/src/components/items/ItemCard.tsx b/apps/web/src/components/items/ItemCard.tsxindex 7a221375c..4c6f3c4a4 100644--- a/apps/web/src/components/items/ItemCard.tsx+++ b/apps/web/src/components/items/ItemCard.tsx@@ -1,5 +1,6 @@import { ItemTypes } from '@aliasvault/models/vault';import React, { useRef } from 'react';+import { useTranslation } from 'react-i18next';import { useNavigate } from 'react-router-dom';import ItemContextMenu, { type ItemContextMenuHandle } from '@/components/items/ItemContextMenu';@@ -30,9 +31,10 @@ const getDisplayText = (entry: ItemListEntry): string => {* Item card in the grid view.*/const ItemCard: React.FC<ItemCardProps> = ({ entry, onMutated }) => {+ const { t } = useTranslation();const navigate = useNavigate();const menuRef = useRef<ItemContextMenuHandle>(null);- const serviceName = entry.service && entry.service.length > 0 ? entry.service : 'Untitled';+ const serviceName = entry.service && entry.service.length > 0 ? entry.service : t('items.untitled');return (<div@@ -51,17 +53,17 @@ const ItemCard: React.FC<ItemCardProps> = ({ entry, onMutated }) => {<div className="flex items-center justify-center gap-1.5 w-full"><div className="text-gray-900 dark:text-gray-100 break-words truncate max-w-[150px]" title={serviceName}>{serviceName}</div>{entry.hasTotp && (- <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 -960 960 960" fill="currentColor" aria-label="Has TOTP">+ <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 -960 960 960" fill="currentColor" aria-label={t('items.hasTotp')}><path d="M160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm100-200h46v-240h-36l-70 50 24 36 36-26v180Zm124 0h156v-40h-94l-2-2q21-20 34.5-34t21.5-22q18-18 27-36t9-38q0-29-22-48.5T458-600q-26 0-47 15t-29 39l40 16q5-13 14.5-20.5T458-558q15 0 24.5 8t9.5 20q0 11-4 20.5T470-486l-32 32-54 54v40Zm296 0q36 0 58-20t22-52q0-18-10-32t-28-22v-2q14-8 22-20.5t8-29.5q0-27-21-44.5T678-600q-25 0-46.5 14.5T604-550l40 16q4-12 13-19t21-7q13 0 21.5 7.5T708-534q0 14-10 22t-26 8h-18v40h20q20 0 31 8t11 22q0 13-11 22.5t-25 9.5q-17 0-26-7.5T638-436l-40 16q7 29 28.5 44.5T680-360ZM160-240h640v-480H160v480Zm0 0v-480 480Z" /></svg>)}{entry.hasPasskey && (- <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-label="Has passkey">+ <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-label={t('items.hasPasskey')}><path d="M21 2l-2 2m-7.61 7.61a5.5 5.5 0 1 1-7.778 7.778 5.5 5.5 0 0 1 7.777-7.777zm0 0L15.5 7.5m0 0l3 3L22 7l-3-3m-3.5 3.5L19 4" /></svg>)}{entry.hasAttachment && (- <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-label="Has attachments">+ <svg className="w-3.5 h-3.5 text-gray-500 dark:text-gray-400 flex-shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-label={t('items.hasAttachments')}><path d="M21.44 11.05l-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48" /></svg>)}diff --git a/apps/web/src/components/items/ItemContextMenu.tsx b/apps/web/src/components/items/ItemContextMenu.tsxindex 5304d6e50..443fac661 100644--- a/apps/web/src/components/items/ItemContextMenu.tsx+++ b/apps/web/src/components/items/ItemContextMenu.tsx@@ -86,13 +86,13 @@ const ItemContextMenu = forwardRef<ItemContextMenuHandle, ItemContextMenuProps>(await executeVaultMutationAsync(async () => {await dbContext.sqliteClient!.items.duplicate(item);});- notifications.addSuccessMessage(t('sharedResources.DuplicateSuccessMessage'), true);+ notifications.addSuccessMessage(t('common.duplicateSuccessMessage'), true);onMutated();} catch (error) {console.error('Failed to duplicate item:', error);// Failed push (e.g. server not reachable).if (!(error instanceof VaultPushFailedError)) {- notifications.addErrorMessage(t('sharedResources.DuplicateErrorMessage'), true);+ notifications.addErrorMessage(t('common.duplicateErrorMessage'), true);}} finally {setIsDuplicating(false);@@ -111,7 +111,7 @@ const ItemContextMenu = forwardRef<ItemContextMenuHandle, ItemContextMenuProps>(await executeVaultMutationAsync(async () => {await dbContext.sqliteClient!.items.trash(item);});- notifications.addSuccessMessage(t('pages.main.items.delete.DeleteSuccessMessage'), true);+ notifications.addSuccessMessage(t('items.delete.deleteSuccessMessage'), true);setShowDeleteModal(false);onMutated();} catch (error) {@@ -132,7 +132,7 @@ const ItemContextMenu = forwardRef<ItemContextMenuHandle, ItemContextMenuProps>(ref={buttonRef}type="button"onClick={toggleMenu}- aria-label={t('sharedResources.ItemOptions')}+ aria-label={t('items.contextMenu.title')}aria-haspopup="menu"className={`px-0.5 py-1 rounded text-gray-400 transition-opacity ${isOpen ? 'opacity-100' : 'opacity-0'} group-hover:opacity-100 group-focus-within:opacity-100 focus:opacity-100 hover:text-gray-600 dark:hover:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-primary-500`}><svg className="w-2 h-4" viewBox="0 0 12 24" fill="currentColor" aria-hidden="true">@@ -145,25 +145,25 @@ const ItemContextMenu = forwardRef<ItemContextMenuHandle, ItemContextMenuProps>({isOpen && (<div ref={menuRef} role="menu" style={menuStyle} className={`${position ? 'fixed' : 'absolute right-0 top-full mt-1'} z-50 w-40 overflow-hidden rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 dark:bg-gray-800 dark:shadow-xl dark:shadow-black/40 dark:ring-gray-600 dark:ring-opacity-100`}><button type="button" role="menuitem" onClick={() => navigate(itemRoute(item, true))} className="w-full text-left px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700">- {t('sharedResources.Edit')}+ {t('common.edit')}</button><button type="button" role="menuitem" onClick={duplicateItem} className="w-full text-left px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700">- {t('sharedResources.Duplicate')}+ {t('common.duplicate')}</button><button type="button" role="menuitem" onClick={() => {setIsOpen(false); setShowDeleteModal(true);}} className="w-full text-left px-4 py-2 text-sm text-red-600 dark:text-red-400 hover:bg-gray-100 dark:hover:bg-gray-700">- {t('sharedResources.Delete')}+ {t('common.delete')}</button></div>)}<FormModalisOpen={showDeleteModal}- title={t('pages.main.items.delete.DeleteItemTitle')}+ title={t('items.deleteItem')}iconBackgroundClass="bg-red-100 dark:bg-red-900/30"- confirmText={t('pages.main.items.delete.YesImSureButton')}- cancelText={t('pages.main.items.delete.NoCancelButton')}+ confirmText={t('items.delete.yesImSureButton')}+ cancelText={t('items.delete.noCancelButton')}confirmButtonClass="bg-red-600 hover:bg-red-700"isLoading={isDeleting}onConfirm={confirmDelete}@@ -174,7 +174,7 @@ const ItemContextMenu = forwardRef<ItemContextMenuHandle, ItemContextMenuProps>(</svg>)}><p className="text-sm text-gray-500 dark:text-gray-400 mb-3">- {t('pages.main.items.delete.DeleteItemDescription', { 0: TRASH_RETENTION_DEFAULT_DAYS })}+ {t('items.delete.deleteItemDescription', { days: TRASH_RETENTION_DEFAULT_DAYS })}</p><div className="bg-gray-50 dark:bg-gray-700/50 rounded-md p-3"><p className="text-sm font-medium text-gray-900 dark:text-white break-all">{itemName ?? ''}</p>diff --git a/apps/web/src/components/items/ItemFilterDropdown.tsx b/apps/web/src/components/items/ItemFilterDropdown.tsxindex bec1a4d41..09e1622e8 100644--- a/apps/web/src/components/items/ItemFilterDropdown.tsx+++ b/apps/web/src/components/items/ItemFilterDropdown.tsx@@ -78,13 +78,13 @@ const ItemFilterDropdown: React.FC<ItemFilterDropdownProps> = ({ title, count, a<div className="py-1"><div className={`flex items-center justify-between px-4 py-2 ${isActive(ItemFilter.All) ? 'bg-orange-50 dark:bg-orange-900/20' : ''}`}><button onClick={() => pickFilter(ItemFilter.All)} className={`text-left text-sm hover:text-gray-900 dark:hover:text-white ${isActive(ItemFilter.All) ? 'text-orange-600 dark:text-orange-400' : 'text-gray-700 dark:text-gray-300'}`}>- {t('pages.main.items.home.FilterAllOption')}+ {t('items.title')}</button>{showFoldersToggle && (<button onClick={(e) => {e.stopPropagation(); setIsOpen(false); onToggleShowFolders();}} className="flex items-center gap-1.5 text-xs text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300">- <span>{t('pages.main.items.home.ShowFoldersOption')}</span>+ <span>{t('items.filters.showFolders')}</span><svg className={`w-5 h-5 ${showFolders ? 'text-orange-500 dark:text-orange-400' : 'text-gray-400 dark:text-gray-500'}`} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><rect x="3" y="3" width="18" height="18" rx="2" />{showFolders && <polyline points="7 12 10 15 17 8" />}@@ -98,37 +98,37 @@ const ItemFilterDropdown: React.FC<ItemFilterDropdownProps> = ({ title, count, a<svg className={iconClass(ItemFilter.Login)} fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z" /></svg>- {t('components.main.items.itemTypeSelector.TypeLogin')}+ {t('itemTypes.login.title')}</button><button onClick={() => pickFilter(ItemFilter.Alias)} className={rowClass(ItemFilter.Alias, true)}><svg className={iconClass(ItemFilter.Alias)} fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" /></svg>- {t('components.main.items.itemTypeSelector.TypeAlias')}+ {t('itemTypes.alias.title')}</button><button onClick={() => pickFilter(ItemFilter.CreditCard)} className={rowClass(ItemFilter.CreditCard, true)}><svg className={iconClass(ItemFilter.CreditCard)} fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z" /></svg>- {t('components.main.items.itemTypeSelector.TypeCreditCard')}+ {t('itemTypes.creditCard.title')}</button><button onClick={() => pickFilter(ItemFilter.Note)} className={rowClass(ItemFilter.Note, true)}><svg className={iconClass(ItemFilter.Note)} fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" /></svg>- {t('components.main.items.itemTypeSelector.TypeNote')}+ {t('itemTypes.secureNote')}</button><div className="border-t border-gray-200 dark:border-gray-600 my-1"></div><button onClick={() => pickFilter(ItemFilter.Passkeys)} className={rowClass(ItemFilter.Passkeys, false)}>- {t('pages.main.items.home.FilterPasskeysOption')}+ {t('common.passkeys')}</button><button onClick={() => pickFilter(ItemFilter.Attachments)} className={rowClass(ItemFilter.Attachments, false)}>- {t('pages.main.items.home.FilterAttachmentsOption')}+ {t('common.attachments')}</button><button onClick={() => pickFilter(ItemFilter.Totp)} className={rowClass(ItemFilter.Totp, false)}>- {t('pages.main.items.home.FilterTotpOption')}+ {t('items.filters.totp')}</button><div className="border-t border-gray-200 dark:border-gray-600 my-1"></div>@@ -136,7 +136,7 @@ const ItemFilterDropdown: React.FC<ItemFilterDropdownProps> = ({ title, count, a<button onClick={() => {setIsOpen(false); onSelectRecentlyDeleted();}} className={`w-full text-left px-4 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-600 flex items-center justify-between ${isRecentlyDeletedActive ? 'bg-orange-50 dark:bg-orange-900/20 text-orange-600 dark:text-orange-400' : 'text-gray-700 dark:text-gray-300'}`}>- <span>{t('pages.main.items.home.FilterRecentlyDeletedOption')}</span>+ <span>{t('items.recentlyDeleted.title')}</span>{recentlyDeletedCount > 0 && (<span className={isRecentlyDeletedActive ? 'text-orange-500 dark:text-orange-400' : 'text-gray-400 dark:text-gray-500'}>{recentlyDeletedCount}</span>)}diff --git a/apps/web/src/components/items/ItemTypeSelector.tsx b/apps/web/src/components/items/ItemTypeSelector.tsxindex 0f491745d..a4093a1fd 100644--- a/apps/web/src/components/items/ItemTypeSelector.tsx+++ b/apps/web/src/components/items/ItemTypeSelector.tsx@@ -33,10 +33,10 @@ const TypeIcon: React.FC<{ itemType: ItemType; className?: string }> = ({ itemTy*/const typeNameKey = (itemType: ItemType): string => {switch (itemType) {- case ItemTypes.Login: return 'components.main.items.itemTypeSelector.TypeLogin';- case ItemTypes.Alias: return 'components.main.items.itemTypeSelector.TypeAlias';- case ItemTypes.CreditCard: return 'components.main.items.itemTypeSelector.TypeCreditCard';- default: return 'components.main.items.itemTypeSelector.TypeNote';+ case ItemTypes.Login: return 'itemTypes.login.title';+ case ItemTypes.Alias: return 'itemTypes.alias.title';+ case ItemTypes.CreditCard: return 'itemTypes.creditCard.title';+ default: return 'itemTypes.secureNote';}};@@ -66,7 +66,7 @@ export const ItemTypePill: React.FC<ItemTypePillProps> = ({ itemType, onClick, i<button type="button" onClick={onClick} className="inline-flex items-center gap-1.5 pl-2.5 pr-2 py-0.5 bg-primary-50 dark:bg-primary-900/20 border border-primary-200 dark:border-primary-800 rounded-full hover:bg-primary-100 dark:hover:bg-primary-900/40 focus:outline-none focus:ring-2 focus:ring-primary-500 transition-colors"><span className="shrink-0 text-primary-600 dark:text-primary-400"><TypeIcon itemType={itemType} className="w-3.5 h-3.5" /></span><span className="text-xs font-medium whitespace-nowrap text-primary-700 dark:text-primary-300">{t(typeNameKey(itemType))}</span>- <span className="ml-1 text-xs whitespace-nowrap text-primary-600/70 dark:text-primary-400/70">{t('sharedResources.ItemTypeLabel')}</span>+ <span className="ml-1 text-xs whitespace-nowrap text-primary-600/70 dark:text-primary-400/70">{t('itemTypes.typeLabel')}</span><svg className={`w-3 h-3 shrink-0 text-primary-500 transition-transform ${isOpen ? 'rotate-180' : ''}`} fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 9l-7 7-7-7" /></svg>diff --git a/apps/web/src/components/items/LogoPickerModal.tsx b/apps/web/src/components/items/LogoPickerModal.tsxindex 0aad9fe6b..c073dbf62 100644--- a/apps/web/src/components/items/LogoPickerModal.tsx+++ b/apps/web/src/components/items/LogoPickerModal.tsx@@ -61,7 +61,7 @@ const LogoPickerModal: React.FC<LogoPickerModalProps> = ({ item, currentLogo, we<div className="p-4 border-b border-gray-200 dark:border-gray-700"><div className="flex items-center justify-between"><h2 className="text-xl font-bold text-gray-900 dark:text-white">{t('items.logo.chooseLogo')}</h2>- <button type="button" onClick={onClose} className="text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" title={t('sharedResources.Close')} aria-label={t('sharedResources.Close')}>+ <button type="button" onClick={onClose} className="text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" title={t('common.close')} aria-label={t('common.close')}><svg className="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12" /></svg>diff --git a/apps/web/src/components/layout/ClipboardCountdownBar.tsx b/apps/web/src/components/layout/ClipboardCountdownBar.tsxindex 54ae4a8f1..f70511cac 100644--- a/apps/web/src/components/layout/ClipboardCountdownBar.tsx+++ b/apps/web/src/components/layout/ClipboardCountdownBar.tsx@@ -36,7 +36,7 @@ const ClipboardCountdownBar: React.FC = () => {{status === 'manual_clear_required' && (<div className="fixed top-2 left-1/2 transform -translate-x-1/2 z-50 bg-blue-500 dark:bg-blue-600 text-white px-4 py-2 rounded-md shadow-lg flex items-center gap-3"><button type="button" onClick={() => void clipboardCopyService.clearNow()} className="px-3 py-1 bg-white dark:bg-gray-800 text-blue-600 dark:text-blue-400 rounded text-sm font-medium hover:bg-gray-100 dark:hover:bg-gray-700">- {t('components.main.clipboardCountdownBar.ClearClipboardButton')}+ {t('common.clipboardCountdown.clearClipboardButton')}</button></div>)}diff --git a/apps/web/src/components/layout/CreateNewIdentityWidget.tsx b/apps/web/src/components/layout/CreateNewIdentityWidget.tsxindex 5736b556b..efd643884 100644--- a/apps/web/src/components/layout/CreateNewIdentityWidget.tsx+++ b/apps/web/src/components/layout/CreateNewIdentityWidget.tsx@@ -93,7 +93,7 @@ const CreateNewIdentityWidget: React.FC = () => {return;}setIsCreating(true);- showLoading(t('components.main.widgets.createNewIdentityWidget.CreatingNewAliasMessage'));+ showLoading(t('items.quickCreate.creatingNewAliasMessage'));try {let edit: ItemEdit = { ...createNewItemEdit(getCurrentFolderFromUrl(), dbContext.sqliteClient?.getPersonalManifestId() ?? null), ItemType: ItemTypes.Alias, ServiceName: serviceName.trim() };if (serviceUrl !== DEFAULT_SERVICE_URL) {@@ -110,12 +110,12 @@ const CreateNewIdentityWidget: React.FC = () => {edit = setFieldValue(edit, 'alias.birthdate', identity.birthdate);}const saved = await saveItem(edit);- notifications.addSuccessMessage(t('components.main.widgets.createNewIdentityWidget.ItemCreatedSuccessMessage'));+ notifications.addSuccessMessage(t('items.toasts.itemCreated'));closePopup();navigate(itemRoute(saved));} catch (error) {console.error('Error creating alias:', error);- notifications.addErrorMessage(t('components.main.widgets.createNewIdentityWidget.CreateItemErrorMessage'), true);+ notifications.addErrorMessage(t('items.quickCreate.createItemErrorMessage'), true);} finally {hideLoading();setIsCreating(false);@@ -128,7 +128,7 @@ const CreateNewIdentityWidget: React.FC = () => {const handleSubmit = (e: React.FormEvent): void => {e.preventDefault();if (serviceName.trim().length === 0) {- setNameError(t('validationMessages.ServiceNameRequired'));+ setNameError(t('validation.serviceNameRequired'));return;}if (itemType === ItemTypes.Alias) {@@ -155,10 +155,10 @@ const CreateNewIdentityWidget: React.FC = () => {*/const getPopupTitle = (): string => {switch (itemType) {- case ItemTypes.Alias: return t('components.main.widgets.createNewIdentityWidget.CreateNewAliasTitle');- case ItemTypes.CreditCard: return t('components.main.widgets.createNewIdentityWidget.CreateNewCreditCardTitle');- case ItemTypes.Note: return t('components.main.widgets.createNewIdentityWidget.CreateNewNoteTitle');- default: return t('components.main.widgets.createNewIdentityWidget.CreateNewLoginTitle');+ case ItemTypes.Alias: return t('items.quickCreate.createNewAliasTitle');+ case ItemTypes.CreditCard: return t('items.quickCreate.createNewCreditCardTitle');+ case ItemTypes.Note: return t('items.quickCreate.createNewNoteTitle');+ default: return t('items.quickCreate.createNewLoginTitle');}};@@ -167,10 +167,10 @@ const CreateNewIdentityWidget: React.FC = () => {*/const getNamePlaceholder = (): string => {switch (itemType) {- case ItemTypes.Alias: return t('components.main.widgets.createNewIdentityWidget.NamePlaceholderAlias');- case ItemTypes.CreditCard: return t('components.main.widgets.createNewIdentityWidget.NamePlaceholderCard');- case ItemTypes.Note: return t('components.main.widgets.createNewIdentityWidget.NamePlaceholderNote');- default: return t('components.main.widgets.createNewIdentityWidget.NamePlaceholderLogin');+ case ItemTypes.Alias: return t('items.addEdit.serviceNamePlaceholder');+ case ItemTypes.CreditCard: return t('items.quickCreate.namePlaceholderCard');+ case ItemTypes.Note: return t('items.quickCreate.namePlaceholderNote');+ default: return t('items.addEdit.serviceNamePlaceholder');}};@@ -179,19 +179,19 @@ const CreateNewIdentityWidget: React.FC = () => {*/const getTypeDisplayName = (type: ItemType): string => {switch (type) {- case ItemTypes.Alias: return t('components.main.widgets.createNewIdentityWidget.TypeAlias');- case ItemTypes.CreditCard: return t('components.main.widgets.createNewIdentityWidget.TypeCard');- case ItemTypes.Note: return t('components.main.widgets.createNewIdentityWidget.TypeNote');- default: return t('components.main.widgets.createNewIdentityWidget.TypeLogin');+ case ItemTypes.Alias: return t('common.alias');+ case ItemTypes.CreditCard: return t('items.quickCreate.typeCard');+ case ItemTypes.Note: return t('itemTypes.note.title');+ default: return t('items.quickCreate.typeLogin');}};- const newAliasButtonText = t('components.main.widgets.createNewIdentityWidget.NewAliasButtonText');+ const newAliasButtonText = t('items.quickCreate.newAliasButtonText');return (<div className="relative" ref={containerRef}><button onClick={() => (isPopupVisible ? closePopup() : showPopup())} id="quickIdentityButton" className="px-4 py-2 text-sm font-medium text-white bg-gradient-to-r from-primary-500 to-primary-600 hover:from-primary-600 hover:to-primary-700 focus:outline-none dark:from-primary-400 dark:to-primary-500 dark:hover:from-primary-500 dark:hover:to-primary-600 rounded-md shadow-sm transition duration-150 ease-in-out transform hover:scale-105 active:scale-95 focus:shadow-outline">- {t('components.main.widgets.createNewIdentityWidget.NewAliasButtonShort')} <span className="hidden md:inline">{newAliasButtonText.substring(1).trim()}</span>+ {t('items.quickCreate.newAliasButtonShort')} <span className="hidden md:inline">{newAliasButtonText.substring(1).trim()}</span></button>{isPopupVisible && (@@ -215,7 +215,7 @@ const CreateNewIdentityWidget: React.FC = () => {<h3 className="text-lg font-semibold mb-4 text-gray-900 dark:text-white">{getPopupTitle()}</h3><form onSubmit={handleSubmit}><div className="mb-4">- <FormLabel htmlFor="serviceName">{t('components.main.widgets.createNewIdentityWidget.NameLabel')}</FormLabel>+ <FormLabel htmlFor="serviceName">{t('items.itemName')}</FormLabel><inputref={nameInputRef}id="serviceName"@@ -230,7 +230,7 @@ const CreateNewIdentityWidget: React.FC = () => {</div>{(itemType === ItemTypes.Login || itemType === ItemTypes.Alias) && (<div className="mb-4">- <FormLabel htmlFor="serviceUrl">{t('components.main.widgets.createNewIdentityWidget.WebsiteUrlLabel')}</FormLabel>+ <FormLabel htmlFor="serviceUrl">{t('fieldLabels.login.url')}</FormLabel><inputid="serviceUrl"type="text"@@ -246,9 +246,9 @@ const CreateNewIdentityWidget: React.FC = () => {)}<div className="flex justify-between items-center"><button id="quickIdentitySubmit" type="submit" className={`${itemType === ItemTypes.Alias ? 'bg-green-600 hover:bg-green-700' : 'bg-primary-600 hover:bg-primary-700'} text-white font-bold py-2 px-4 rounded flex items-center gap-2`}>- {itemType === ItemTypes.Alias ? t('components.main.widgets.createNewIdentityWidget.CreateButton') : (+ {itemType === ItemTypes.Alias ? t('common.create') : (<>- {t('components.main.widgets.createNewIdentityWidget.ContinueButton')}+ {t('common.continue')}<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 5l7 7-7 7" /></svg>diff --git a/apps/web/src/components/layout/DbLockButton.tsx b/apps/web/src/components/layout/DbLockButton.tsxindex 6fbb9fad9..f737bbc43 100644--- a/apps/web/src/components/layout/DbLockButton.tsx+++ b/apps/web/src/components/layout/DbLockButton.tsx@@ -24,7 +24,7 @@ const DbLockButton: React.FC = () => {return (<div className="ms-2 items-center hidden lg:flex">- <button className="p-2 hover:bg-gray-200 rounded-2xl" onClick={onLockClick} title={t('sharedResources.LockVault')}>+ <button className="p-2 hover:bg-gray-200 rounded-2xl" onClick={onLockClick} title={t('common.lockVault')}><svg xmlns="http://www.w3.org/2000/svg" className="h-4 w-4 text-gray-400" viewBox="0 0 20 20" fill="currentColor"><path fillRule="evenodd" d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z" clipRule="evenodd" /></svg>diff --git a/apps/web/src/components/layout/DbStatusIndicator.tsx b/apps/web/src/components/layout/DbStatusIndicator.tsxindex eac5a4c62..fa64ac2d6 100644--- a/apps/web/src/components/layout/DbStatusIndicator.tsx+++ b/apps/web/src/components/layout/DbStatusIndicator.tsx@@ -110,7 +110,7 @@ const DbStatusIndicator: React.FC = () => {notifications.addErrorMessage(errorMessage, true);}} else if (await hasUnsyncedUserChanges()) {- notifications.addErrorMessage(t('sharedResources.VaultSaveError'), true);+ notifications.addErrorMessage(t('common.vaultSaveError'), true);}} finally {setIsRefreshing(false);@@ -122,15 +122,15 @@ const DbStatusIndicator: React.FC = () => {*/const getStatusTitle = (): string => {if (dbContext.isUploading) {- return t('sharedResources.SyncingChanges');+ return t('common.syncingChanges');}if (dbContext.isSyncing) {- return t('sharedResources.LoadingVault');+ return t('common.loadingVault');}if (showSyncError) {- return t('sharedResources.VaultSaveError');+ return t('common.vaultSaveError');}- return t('sharedResources.SyncVaultData');+ return t('common.syncVaultData');};return (diff --git a/apps/web/src/components/layout/Footer.tsx b/apps/web/src/components/layout/Footer.tsxindex 31328dbf1..fd53ae32d 100644--- a/apps/web/src/components/layout/Footer.tsx+++ b/apps/web/src/components/layout/Footer.tsx@@ -4,7 +4,7 @@ import { useLocation } from 'react-router-dom';import { getAppConfig } from '@/config/AppConfig';-const TIP_KEYS = ['layout.footer.TipCreateShortcut', 'layout.footer.TipFindShortcut', 'layout.footer.TipHomeShortcut', 'layout.footer.TipLockShortcut'];+const TIP_KEYS = ['web.footer.tipCreateShortcut', 'web.footer.tipFindShortcut', 'web.footer.tipHomeShortcut', 'web.footer.tipLockShortcut'];/*** Page footer.@@ -25,7 +25,7 @@ const Footer: React.FC = () => {<div className="container mx-auto px-4 py-4"><div className="flex flex-col lg:flex-row justify-between items-center"><p className="text-sm text-center text-gray-500 mb-4 lg:mb-0">- © {new Date().getFullYear()} <span>AliasVault v{__APP_VERSION__}</span>{deploymentMode && <> <span className="ml-1">({deploymentMode})</span></>}. {t('layout.footer.CopyrightText')}+ © {new Date().getFullYear()} <span>AliasVault v{__APP_VERSION__}</span>{deploymentMode && <> <span className="ml-1">({deploymentMode})</span></>}. {t('web.footer.copyrightText')}</p><div className="hidden lg:block text-center text-gray-400 text-sm">{t(tipKey)}</div></div>diff --git a/apps/web/src/components/layout/FooterLogin.tsx b/apps/web/src/components/layout/FooterLogin.tsxindex 1d70726fd..faa54dbea 100644--- a/apps/web/src/components/layout/FooterLogin.tsx+++ b/apps/web/src/components/layout/FooterLogin.tsx@@ -14,7 +14,7 @@ const FooterLogin: React.FC = () => {<footer className="fixed -z-10 bottom-0 left-0 right-0 dark:bg-gray-900"><div className="container mx-auto px-4 py-4"><p className="text-sm text-center text-gray-400 dark:text-gray-500 mb-4 lg:mb-0">- © {new Date().getFullYear()} <span>AliasVault v{__APP_VERSION__}</span>{deploymentMode && <> <span className="ml-1">({deploymentMode})</span></>}. {t('layout.footer.CopyrightText')}+ © {new Date().getFullYear()} <span>AliasVault v{__APP_VERSION__}</span>{deploymentMode && <> <span className="ml-1">({deploymentMode})</span></>}. {t('web.footer.copyrightText')}</p></div></footer>diff --git a/apps/web/src/components/layout/SearchWidget.tsx b/apps/web/src/components/layout/SearchWidget.tsxindex e29a5e0c2..74b9dde07 100644--- a/apps/web/src/components/layout/SearchWidget.tsx+++ b/apps/web/src/components/layout/SearchWidget.tsx@@ -142,7 +142,7 @@ const SearchWidget: React.FC = () => {ref={inputRef}id="searchWidget"type="text"- placeholder={t('components.main.widgets.searchWidget.SearchVaultPlaceholder')}+ placeholder={t('items.searchPlaceholder')}autoComplete="off"className="w-full px-4 py-2 text-gray-700 bg-white border rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 dark:bg-gray-800 dark:text-gray-300 dark:border-gray-600 dark:focus:ring-primary-500"value={searchTerm}@@ -155,11 +155,11 @@ const SearchWidget: React.FC = () => {<><div className="absolute z-10 w-full mt-1 bg-white rounded-md shadow-lg dark:bg-gray-800 p-2 text-sm text-gray-600 dark:text-gray-400">{searchTerm.length === 0 ? (- <p>{t('components.main.widgets.searchWidget.SearchHelpText')}</p>+ <p>{t('items.search.searchHelpText')}</p>) : searchTerm.length === 1 ? (- <p>{t('components.main.widgets.searchWidget.SearchTooShortMessage')}</p>+ <p>{t('items.search.searchTooShortMessage')}</p>) : (- <p>{t('components.main.widgets.searchWidget.SearchingForMessage', { 0: searchTerm })}</p>+ <p>{t('items.search.searchingForMessage', { search: searchTerm })}</p>)}</div>@@ -171,7 +171,7 @@ const SearchWidget: React.FC = () => {<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle><path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>- {t('components.main.widgets.searchWidget.SearchingMessage')}+ {t('items.search.searchingMessage')}</div></div>) : results.length > 0 ? (@@ -204,7 +204,7 @@ const SearchWidget: React.FC = () => {) : (<div className={popupClass}><div className="px-4 py-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700">- {t('components.main.widgets.searchWidget.NoResultsFoundMessage')}+ {t('items.search.noResultsFoundMessage')}</div></div>)diff --git a/apps/web/src/components/layout/TopMenu.tsx b/apps/web/src/components/layout/TopMenu.tsxindex 8765eff29..49c865f46 100644--- a/apps/web/src/components/layout/TopMenu.tsx+++ b/apps/web/src/components/layout/TopMenu.tsx@@ -55,17 +55,17 @@ const TopMenu: React.FC = () => {<img src="/img/logo-cropped.png" className="mr-3 h-8 w-10" alt="AliasVault Logo" /><span className="self-center hidden sm:flex text-2xl font-semibold content-start align-top whitespace-nowrap dark:text-white">AliasVault- <span className="text-primary-500 text-[10px] ml-1 font-normal hidden sm:inline-block">{t('layout.topMenu.BetaLabel')}</span>+ <span className="text-primary-500 text-[10px] ml-1 font-normal hidden sm:inline-block">{t('web.topMenu.betaLabel')}</span></span></NavLink><div className="hidden justify-between items-center w-full lg:flex lg:w-auto lg:order-1"><ul className="flex flex-col mt-4 space-x-6 text-sm font-medium lg:flex-row xl:space-x-8 lg:mt-0"><NavLink to="/items" end className={({ isActive }) => navLinkClass(isActive, DESKTOP_LINK)}>- {t('layout.topMenu.VaultNav')}+ {t('navigation.vault')}</NavLink><NavLink to="/emails" end className={({ isActive }) => navLinkClass(isActive, DESKTOP_LINK)}>- {t('layout.topMenu.EmailsNav')}+ {t('emails.title')}</NavLink></ul></div>@@ -80,7 +80,7 @@ const TopMenu: React.FC = () => {<DbLockButton /><DbStatusIndicator /><button ref={toggleRef} onClick={() => setIsMobileMenuOpen(!isMobileMenuOpen)} type="button" id="toggleMobileMenuButton" className="items-center p-2 text-gray-500 rounded-lg md:ml-2 hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:text-white dark:hover:bg-gray-700 focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600" aria-expanded={isMobileMenuOpen}>- <span className="sr-only">{t('layout.topMenu.OpenMenuLabel')}</span>+ <span className="sr-only">{t('web.topMenu.openMenuLabel')}</span><svg className="w-6 h-6" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fillRule="evenodd" d="M3 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 10a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 15a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z" clipRule="evenodd"></path></svg></button></div>@@ -89,12 +89,12 @@ const TopMenu: React.FC = () => {<ul className="lg:hidden py-1 text-gray-700 dark:text-gray-400"><li><NavLink to="/items" className={({ isActive }) => navLinkClass(isActive, DROPDOWN_LINK)}>- {t('layout.topMenu.VaultNav')}+ {t('navigation.vault')}</NavLink></li><li><NavLink to="/emails" end className={({ isActive }) => navLinkClass(isActive, DROPDOWN_LINK)}>- {t('layout.topMenu.EmailsNav')}+ {t('emails.title')}</NavLink></li></ul>@@ -116,32 +116,32 @@ const TopMenu: React.FC = () => {<ul className="py-1 text-gray-700 dark:text-gray-400"><li><NavLink to="/settings/general" end className={({ isActive }) => navLinkClass(isActive, DROPDOWN_LINK)}>- {t('layout.topMenu.GeneralSettingsNav')}+ {t('settings.general.pageTitle')}</NavLink></li><li><NavLink to="/settings/security" end className={({ isActive }) => navLinkClass(isActive, DROPDOWN_LINK)}>- {t('layout.topMenu.SecuritySettingsNav')}+ {t('settings.securitySettings.pageTitle')}</NavLink></li><li><NavLink to="/settings/storage-insights" end className={({ isActive }) => navLinkClass(isActive, DROPDOWN_LINK)}>- {t('layout.topMenu.StorageInsightsNav')}+ {t('settings.storageInsights.breadcrumbTitle')}</NavLink></li><li><NavLink to="/settings/import-export" end className={({ isActive }) => navLinkClass(isActive, DROPDOWN_LINK)}>- {t('layout.topMenu.ImportExportNav')}+ {t('settings.importExport')}</NavLink></li><li className="border-t border-b border-gray-100 dark:border-gray-600"><NavLink to="/settings/apps" end className={({ isActive }) => navLinkClass(isActive, DROPDOWN_LINK)}>- {t('layout.topMenu.ExtensionsAppsNav')}+ {t('settings.apps.pageTitle')}</NavLink></li><li><button id="theme-toggle" type="button" onClick={toggleTheme} className="w-full text-start py-2 px-4 text-sm hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-400 dark:hover:text-white">- {isDarkMode ? t('layout.topMenu.EnableLightMode') : t('layout.topMenu.EnableDarkMode')}+ {isDarkMode ? t('web.topMenu.enableLightMode') : t('web.topMenu.enableDarkMode')}{isDarkMode ? (<svg id="theme-toggle-light-icon" className="w-5 h-5 align-middle inline-block" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z" fillRule="evenodd" clipRule="evenodd"></path></svg>) : (@@ -151,7 +151,7 @@ const TopMenu: React.FC = () => {</li><li><NavLink to="/user/logout" className={({ isActive }) => `block py-2 px-4 font-bold text-sm text-primary-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-primary-200 dark:hover:text-white ${isActive ? 'text-primary-700 dark:text-primary-500' : ''}`}>- {t('layout.topMenu.LogOut')}+ {t('web.topMenu.logOut')}</NavLink></li></ul>diff --git a/apps/web/src/components/loading/LoadingIndicator.tsx b/apps/web/src/components/loading/LoadingIndicator.tsxindex 255af05f7..fbd54740b 100644--- a/apps/web/src/components/loading/LoadingIndicator.tsx+++ b/apps/web/src/components/loading/LoadingIndicator.tsx@@ -1,20 +1,24 @@import React from 'react';+import { useTranslation } from 'react-i18next';/*** Inline loading indicator shown while a page loads its data.*/-const LoadingIndicator: React.FC = () => (- <div role="status" className="px-4 mt-4">- <div className="aliasvault-spinner-inline">- <div className="cloud-shape-inline-enhanced">- <div className="dot-inline delay-1"></div>- <div className="dot-inline delay-2"></div>- <div className="dot-inline delay-3"></div>- <div className="dot-inline delay-4"></div>+const LoadingIndicator: React.FC = () => {+ const { t } = useTranslation();+ return (+ <div role="status" className="px-4 mt-4">+ <div className="aliasvault-spinner-inline">+ <div className="cloud-shape-inline-enhanced">+ <div className="dot-inline delay-1"></div>+ <div className="dot-inline delay-2"></div>+ <div className="dot-inline delay-3"></div>+ <div className="dot-inline delay-4"></div>+ </div></div>+ <span className="sr-only">{t('common.loading')}</span></div>- <span className="sr-only">Loading...</span>- </div>-);+ );+};export default LoadingIndicator;diff --git a/apps/web/src/components/loading/SmallLoadingIndicator.tsx b/apps/web/src/components/loading/SmallLoadingIndicator.tsxindex bfef02120..c9db9e22b 100644--- a/apps/web/src/components/loading/SmallLoadingIndicator.tsx+++ b/apps/web/src/components/loading/SmallLoadingIndicator.tsx@@ -1,4 +1,5 @@import React from 'react';+import { useTranslation } from 'react-i18next';type SmallLoadingIndicatorProps = {title?: string;@@ -9,17 +10,20 @@ type SmallLoadingIndicatorProps = {/*** Small circular spinner.*/-const SmallLoadingIndicator: React.FC<SmallLoadingIndicatorProps> = ({ title = '', spinning = true, children }) => (- <div role="status" className="px-2 flex items-center" title={title}>- <div className="relative inline-flex items-center justify-center">- {children}- <svg aria-hidden="true" className={`inline w-8 h-8 text-gray-200 ${spinning ? 'animate-spin fill-primary-600' : ''} dark:text-gray-600`} viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">- <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor" />- <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill" />- </svg>+const SmallLoadingIndicator: React.FC<SmallLoadingIndicatorProps> = ({ title = '', spinning = true, children }) => {+ const { t } = useTranslation();+ return (+ <div role="status" className="px-2 flex items-center" title={title}>+ <div className="relative inline-flex items-center justify-center">+ {children}+ <svg aria-hidden="true" className={`inline w-8 h-8 text-gray-200 ${spinning ? 'animate-spin fill-primary-600' : ''} dark:text-gray-600`} viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">+ <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor" />+ <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill" />+ </svg>+ </div>+ <span className="sr-only">{t('common.loading')}</span></div>- <span className="sr-only">Loading...</span>- </div>-);+ );+};export default SmallLoadingIndicator;diff --git a/apps/web/src/components/settings/DefaultPasswordSettings.tsx b/apps/web/src/components/settings/DefaultPasswordSettings.tsxindex acfbb1617..fe37e2d7e 100644--- a/apps/web/src/components/settings/DefaultPasswordSettings.tsx+++ b/apps/web/src/components/settings/DefaultPasswordSettings.tsx@@ -15,7 +15,6 @@ const DefaultPasswordSettings: React.FC = () => {const dbContext = useDb();const [settings, setSettings] = useState<PasswordSettings | null>(null);const [isVisible, setIsVisible] = useState(false);- const tk = 'components.main.settings.defaultPasswordSettings';useEffect(() => {setSettings(dbContext.sqliteClient?.settings.getPasswordSettings() ?? null);@@ -23,11 +22,11 @@ const DefaultPasswordSettings: React.FC = () => {return (<div className="mb-4">- <FormLabel htmlFor="password-generator-settings-modal">{t(`${tk}.PasswordGeneratorSettingsLabel`)}</FormLabel>+ <FormLabel htmlFor="password-generator-settings-modal">{t('settings.passwordGeneratorSettings.passwordGeneratorSettingsLabel')}</FormLabel><button type="button" id="password-generator-settings-modal" className="px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 dark:bg-primary-700 dark:hover:bg-primary-600" onClick={() => setIsVisible(true)}>- {t(`${tk}.ConfigureButton`)}+ {t('settings.passwordGeneratorSettings.configureButton')}</button>- <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400 mt-2">{t(`${tk}.PasswordGeneratorSettingsDescription`)}</span>+ <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400 mt-2">{t('settings.passwordGeneratorSettings.description')}</span>{isVisible && settings && (<PasswordSettingsPopup passwordSettings={settings} isTemporary={false} onSaveSettings={(saved) => setSettings(saved)} onClose={() => setIsVisible(false)} />diff --git a/apps/web/src/components/settings/PasswordSettingsPopup.tsx b/apps/web/src/components/settings/PasswordSettingsPopup.tsxindex 2b91d1786..7cbdc5597 100644--- a/apps/web/src/components/settings/PasswordSettingsPopup.tsx+++ b/apps/web/src/components/settings/PasswordSettingsPopup.tsx@@ -76,7 +76,11 @@ const PasswordSettingsPopup: React.FC<PasswordSettingsPopupProps> = ({ passwordSconst { settings, previewPassword, dicewareLanguages, handleSettingChange, handleRefreshPreview } = usePasswordConfig({ ...passwordSettings });const [sliderValue, setSliderValue] = useState(lengthToSlider(passwordSettings.Length));const isDiceware = settings.Type === 'diceware';- const tk = 'components.main.settings.passwordSettingsPopup';++ /**+ * The label of a passphrase option value, e.g. dicewareSeparatorOption.Dash; "None" is shared.+ */+ const optionLabel = (group: 'Capitalization' | 'Separator' | 'Salt', value: string): string => (value === 'None' ? t('common.none') : t(`items.diceware${group}Option.${value}`));// The "auto" language shown when the user has not picked one explicitly, resolved like the Rust core does.const effectiveLanguage = useMemo(() => resolveDefaultLanguage(i18n.language, dicewareLanguages), [dicewareLanguages, i18n.language]);@@ -98,7 +102,7 @@ const PasswordSettingsPopup: React.FC<PasswordSettingsPopupProps> = ({ passwordS} finally {hideLoading();}- notifications.addSuccessMessage(t(`${tk}.SettingsUpdatedMessage`), true);+ notifications.addSuccessMessage(t('items.passwordSettingsPopup.settingsUpdatedMessage'), true);onSaveSettings(settings, previewPassword);onClose();};@@ -143,13 +147,13 @@ const PasswordSettingsPopup: React.FC<PasswordSettingsPopupProps> = ({ passwordS<Modal id="passwordSettingsModal" onBackdropClick={onClose} panelClassName="p-5 pt-0 w-96 max-w-full"><div className="m-2"><div className="flex border-b border-gray-200 dark:border-gray-700">- <button type="button" onClick={() => handleSettingChange('Type', 'basic')} className={tabClasses('basic')}>{t(`${tk}.PasswordTypeBasic`)}</button>- <button type="button" onClick={() => handleSettingChange('Type', 'diceware')} className={tabClasses('diceware')}>{t(`${tk}.PasswordTypeDiceware`)}</button>+ <button type="button" onClick={() => handleSettingChange('Type', 'basic')} className={tabClasses('basic')}>{t('common.password')}</button>+ <button type="button" onClick={() => handleSettingChange('Type', 'diceware')} className={tabClasses('diceware')}>{t('items.passwordTypeDiceware')}</button></div><div className="mt-4 space-y-4"><div>- <label className="block text-sm font-medium text-gray-700 dark:text-gray-300">{t(`${tk}.PreviewLabel`)}</label>+ <label className="block text-sm font-medium text-gray-700 dark:text-gray-300">{t('items.passwordSettingsPopup.previewLabel')}</label><div className="mt-1 flex"><div className="flex-grow"><CopyPasteFormRow id="preview-password" value={previewPassword} /></div><button type="button" className="ml-2 px-3 py-2 text-sm text-gray-500 dark:text-white bg-gray-200 hover:bg-gray-300 focus:ring-4 focus:outline-none focus:ring-gray-300 font-medium rounded-md dark:bg-gray-600 dark:hover:bg-gray-700 dark:focus:ring-gray-800" onClick={handleRefreshPreview}>@@ -163,7 +167,7 @@ const PasswordSettingsPopup: React.FC<PasswordSettingsPopupProps> = ({ passwordS{!isDiceware ? (<><div>- <label htmlFor="password-length" className="block text-sm font-medium text-gray-700 dark:text-gray-300">{t(`${tk}.PasswordLengthLabel`, { 0: settings.Length })}</label>+ <label htmlFor="password-length" className="block text-sm font-medium text-gray-700 dark:text-gray-300">{t('items.passwordSettingsPopup.passwordLengthLabel', { length: settings.Length })}</label><input type="range" id="password-length" min={SLIDER_MIN} max={SLIDER_MAX} step="0.1" className="mt-1 w-full h-2 bg-gray-200 rounded-lg appearance-none cursor-pointer dark:bg-gray-700 av-range-slider" value={sliderValue} onChange={(e) => {const value = Number.parseFloat(e.target.value);setSliderValue(value);@@ -172,41 +176,41 @@ const PasswordSettingsPopup: React.FC<PasswordSettingsPopupProps> = ({ passwordS</div><div className="grid grid-cols-2 gap-2">- <button type="button" className={toggleClasses(settings.UseLowercase)} title={t(`${tk}.IncludeLowercaseLabel`)} onClick={() => handleSettingChange('UseLowercase', !settings.UseLowercase)}><span className="font-mono text-base">a-z</span></button>- <button type="button" className={toggleClasses(settings.UseUppercase)} title={t(`${tk}.IncludeUppercaseLabel`)} onClick={() => handleSettingChange('UseUppercase', !settings.UseUppercase)}><span className="font-mono text-base">A-Z</span></button>- <button type="button" className={toggleClasses(settings.UseNumbers)} title={t(`${tk}.IncludeNumbersLabel`)} onClick={() => handleSettingChange('UseNumbers', !settings.UseNumbers)}><span className="font-mono text-base">0-9</span></button>- <button type="button" className={toggleClasses(settings.UseSpecialChars)} title={t(`${tk}.IncludeSpecialCharsLabel`)} onClick={() => handleSettingChange('UseSpecialChars', !settings.UseSpecialChars)}><span className="font-mono text-base">!@#</span></button>+ <button type="button" className={toggleClasses(settings.UseLowercase)} title={t('items.passwordSettingsPopup.includeLowercaseLabel')} onClick={() => handleSettingChange('UseLowercase', !settings.UseLowercase)}><span className="font-mono text-base">a-z</span></button>+ <button type="button" className={toggleClasses(settings.UseUppercase)} title={t('items.passwordSettingsPopup.includeUppercaseLabel')} onClick={() => handleSettingChange('UseUppercase', !settings.UseUppercase)}><span className="font-mono text-base">A-Z</span></button>+ <button type="button" className={toggleClasses(settings.UseNumbers)} title={t('items.passwordSettingsPopup.includeNumbersLabel')} onClick={() => handleSettingChange('UseNumbers', !settings.UseNumbers)}><span className="font-mono text-base">0-9</span></button>+ <button type="button" className={toggleClasses(settings.UseSpecialChars)} title={t('items.passwordSettingsPopup.includeSpecialCharsLabel')} onClick={() => handleSettingChange('UseSpecialChars', !settings.UseSpecialChars)}><span className="font-mono text-base">!@#</span></button></div><div className="flex items-center"><input id="use-non-ambiguous" type="checkbox" className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded dark:bg-gray-700 dark:border-gray-600" checked={settings.UseNonAmbiguousChars} onChange={e => handleSettingChange('UseNonAmbiguousChars', e.target.checked)} />- <label htmlFor="use-non-ambiguous" className="ml-2 block text-sm text-gray-700 dark:text-gray-300">{t(`${tk}.AvoidAmbiguousCharsLabel`)}</label>+ <label htmlFor="use-non-ambiguous" className="ml-2 block text-sm text-gray-700 dark:text-gray-300">{t('items.passwordSettingsPopup.avoidAmbiguousCharsLabel')}</label></div></>) : (<><div><div className="flex items-center justify-between mb-2">- <label htmlFor="diceware-word-count" className="text-sm font-medium text-gray-700 dark:text-gray-300">{t(`${tk}.WordCountLabel`)}</label>+ <label htmlFor="diceware-word-count" className="text-sm font-medium text-gray-700 dark:text-gray-300">{t('items.wordCount')}</label><span className="text-sm text-gray-600 dark:text-gray-400 font-mono">{settings.WordCount}</span></div><input type="range" id="diceware-word-count" min={MIN_WORD_COUNT} max={MAX_WORD_COUNT} step="1" className="w-full h-2 bg-gray-200 rounded-lg appearance-none cursor-pointer dark:bg-gray-700 av-range-slider" value={settings.WordCount} onChange={e => handleSettingChange('WordCount', Number.parseInt(e.target.value, 10))} /></div><div className="grid grid-cols-3 gap-2">- <button type="button" className={optionClasses(settings.Capitalization !== DEFAULT_CAPITALIZATION)} title={t(`${tk}.Capitalization${settings.Capitalization ?? DEFAULT_CAPITALIZATION}`)} onClick={() => handleSettingChange('Capitalization', cycle(CAPITALIZATION_OPTIONS, settings.Capitalization))}>+ <button type="button" className={optionClasses(settings.Capitalization !== DEFAULT_CAPITALIZATION)} title={optionLabel('Capitalization', settings.Capitalization ?? DEFAULT_CAPITALIZATION)} onClick={() => handleSettingChange('Capitalization', cycle(CAPITALIZATION_OPTIONS, settings.Capitalization))}><span className="font-mono text-base">{capitalizationGlyph(settings.Capitalization)}</span></button>- <button type="button" className={optionClasses(settings.Separator !== DEFAULT_SEPARATOR)} title={`${t(`${tk}.SeparatorLabel`)}: ${t(`${tk}.Separator${settings.Separator ?? DEFAULT_SEPARATOR}`)}`} onClick={() => handleSettingChange('Separator', cycle(SEPARATOR_OPTIONS, settings.Separator))}>+ <button type="button" className={optionClasses(settings.Separator !== DEFAULT_SEPARATOR)} title={`${t('items.separator')}: ${optionLabel('Separator', settings.Separator ?? DEFAULT_SEPARATOR)}`} onClick={() => handleSettingChange('Separator', cycle(SEPARATOR_OPTIONS, settings.Separator))}><span className="font-mono text-base">{separatorGlyph(settings.Separator)}</span></button>- <button type="button" className={optionClasses(settings.Salt !== DEFAULT_SALT)} title={`${t(`${tk}.SaltLabel`)}: ${t(`${tk}.Salt${settings.Salt ?? DEFAULT_SALT}`)}`} onClick={() => handleSettingChange('Salt', cycle(SALT_OPTIONS, settings.Salt))}>+ <button type="button" className={optionClasses(settings.Salt !== DEFAULT_SALT)} title={`${t('items.salt')}: ${optionLabel('Salt', settings.Salt ?? DEFAULT_SALT)}`} onClick={() => handleSettingChange('Salt', cycle(SALT_OPTIONS, settings.Salt))}><span className="font-mono text-base">{saltGlyph(settings.Salt)}</span></button></div><div>- <label htmlFor="diceware-language" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">{t(`${tk}.LanguageLabel`)}</label>+ <label htmlFor="diceware-language" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">{t('items.passphraseLanguage')}</label><select id="diceware-language" className="w-full px-3 py-2 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md text-gray-900 dark:text-white focus:ring-primary-500 focus:border-primary-500" value={selectedLanguage} onChange={e => handleSettingChange('Language', e.target.value)}>{dicewareLanguages.map(language => <option key={language} value={language}>{getLanguageInfo(language).label}</option>)}</select>@@ -217,11 +221,11 @@ const PasswordSettingsPopup: React.FC<PasswordSettingsPopupProps> = ({ passwordS<div className="flex justify-end pt-4 gap-2">{isTemporary && (<button type="button" className="px-4 py-2 bg-gray-200 text-gray-800 dark:bg-gray-700 dark:text-white rounded-md hover:bg-gray-300 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-500" onClick={onSaveTemporary}>- {t(`${tk}.UseJustOnceButton`)}+ {t('items.passwordSettingsPopup.useJustOnceButton')}</button>)}<button type="button" id="save-button" className="px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 dark:bg-primary-700 dark:hover:bg-primary-600" onClick={() => void onSaveGlobal()}>- {t(`${tk}.SaveGloballyButton`)}+ {t('items.passwordSettingsPopup.saveGloballyButton')}</button></div></div>diff --git a/apps/web/src/components/settings/importexport/ExportPasswordModal.tsx b/apps/web/src/components/settings/importexport/ExportPasswordModal.tsxindex 2f0f72046..59bd77819 100644--- a/apps/web/src/components/settings/importexport/ExportPasswordModal.tsx+++ b/apps/web/src/components/settings/importexport/ExportPasswordModal.tsx@@ -23,7 +23,7 @@ type ExportPasswordModalProps = {*/const ExportPasswordModal: React.FC<ExportPasswordModalProps> = ({ isOpen, title, description, errorMessage = '', onPasswordSubmitted, onClose }) => {const { t } = useTranslation();- const tk = 'pages.main.settings.importExport.components.exportPasswordModal';+const [exportPassword, setExportPassword] = useState('');const [confirmPassword, setConfirmPassword] = useState('');const [validationError, setValidationError] = useState('');@@ -43,11 +43,11 @@ const ExportPasswordModal: React.FC<ExportPasswordModalProps> = ({ isOpen, title*/const validate = (password: string, confirm: string): void => {if (password.trim().length > 0 && password.length < MIN_ACCEPTED_PASSWORD_LENGTH) {- setValidationError(t('validationMessages.PasswordMinLengthGeneric', { 0: MIN_ACCEPTED_PASSWORD_LENGTH }));+ setValidationError(t('settings.securitySettings.changePassword.passwordTooShort', { minLength: MIN_ACCEPTED_PASSWORD_LENGTH }));return;}if (confirm.trim().length > 0 && password !== confirm) {- setValidationError(t('validationMessages.PasswordsDoNotMatchGeneric'));+ setValidationError(t('common.errorPasswordMismatch'));return;}setValidationError('');@@ -116,10 +116,10 @@ const ExportPasswordModal: React.FC<ExportPasswordModalProps> = ({ isOpen, titlefooterContent={(<><button type="button" onClick={handleSubmit} disabled={!isPasswordValid} className="inline-flex w-full justify-center rounded-md bg-primary-600 hover:bg-primary-700 px-3 py-2 text-sm font-semibold text-white shadow-sm sm:w-auto disabled:opacity-50 disabled:cursor-not-allowed">- {t(`${tk}.CreateEncryptedExportButton`)}+ {t('importExport.exportPasswordModal.createEncryptedExportButton')}</button><button type="button" onClick={onClose} className="mt-3 inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:mt-0 sm:w-auto dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:hover:bg-gray-600">- {t('sharedResources.Cancel')}+ {t('common.cancel')}</button></>)}>@@ -129,13 +129,13 @@ const ExportPasswordModal: React.FC<ExportPasswordModalProps> = ({ isOpen, title{errorMessage.length > 0 && <AlertMessageError message={errorMessage} hasTopMargin={false} />}<div className="mb-4">- <label htmlFor="exportPassword" className="block text-sm font-medium text-gray-900 dark:text-white mb-2">{t(`${tk}.ExportPasswordLabel`)}</label>+ <label htmlFor="exportPassword" className="block text-sm font-medium text-gray-900 dark:text-white mb-2">{t('importExport.exportPasswordModal.exportPasswordLabel')}</label><PasswordInputField id="exportPassword" value={exportPassword} onValueChange={handleExportPasswordChange} autoFocus={true} /><PasswordStrengthIndicator password={exportPassword} /></div><div className="mb-4">- <label htmlFor="confirmExportPassword" className="block text-sm font-medium text-gray-900 dark:text-white mb-2">{t(`${tk}.ConfirmExportPasswordLabel`)}</label>+ <label htmlFor="confirmExportPassword" className="block text-sm font-medium text-gray-900 dark:text-white mb-2">{t('importExport.exportPasswordModal.confirmExportPasswordLabel')}</label><PasswordInputField id="confirmExportPassword" value={confirmPassword} onValueChange={handleConfirmPasswordChange} /></div>diff --git a/apps/web/src/components/settings/importexport/ImportServiceCard.tsx b/apps/web/src/components/settings/importexport/ImportServiceCard.tsxindex e19981d59..6e1a74336 100644--- a/apps/web/src/components/settings/importexport/ImportServiceCard.tsx+++ b/apps/web/src/components/settings/importexport/ImportServiceCard.tsx@@ -142,7 +142,7 @@ const buildErrorPayload = (serviceName: string, filename: string, fileSize: numb*/const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, description = '', logoUrl = '', acceptedFileExtensions, processFile, children }) => {const { t } = useTranslation();- const tk = 'components.main.settings.importExport.importServiceCard';+const navigate = useNavigate();const dbContext = useDb();const webApi = useWebApi();@@ -193,7 +193,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc*/const setImportErrorFromException = (error: unknown, filename: string, fileSize: number, defaultStage: ImportStage, fallbackMessage?: string): void => {const stage = error instanceof ImportException ? error.stage : defaultStage;- setImportError(fallbackMessage ?? t(`${tk}.ImportErrorGeneric`));+ setImportError(fallbackMessage ?? t('importExport.serviceCard.importErrorGeneric'));setErrorPayload(buildErrorPayload(serviceName, filename, fileSize, stage, error));};@@ -270,14 +270,14 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, descconst handleFileUpload = async (event: React.ChangeEvent<HTMLInputElement>): Promise<void> => {const file = event.target.files?.[0];if (!file || file.name.length === 0) {- setImportError(t(`${tk}.ImportErrorInvalidFile`));+ setImportError(t('importExport.serviceCard.importErrorInvalidFile'));return;}const extensionIndex = file.name.lastIndexOf('.');const fileExtension = extensionIndex >= 0 ? file.name.substring(extensionIndex).toLowerCase() : '';if (!acceptedFileExtensions.some(ext => ext.toLowerCase() === fileExtension)) {- setImportError(t(`${tk}.ImportErrorUnsupportedFormat`, { 0: acceptedFileExtensions.join(', ') }));+ setImportError(t('importExport.serviceCard.importErrorUnsupportedFormat', { formats: acceptedFileExtensions.join(', ') }));return;}@@ -290,7 +290,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, descsetErrorPayload(null);if (file.size > MAX_FILE_SIZE_MB * 1024 * 1024) {- setImportError(t(`${tk}.ImportErrorFileTooLarge`, { 0: MAX_FILE_SIZE_MB }));+ setImportError(t('importExport.serviceCard.importErrorFileTooLarge', { size: MAX_FILE_SIZE_MB }));return;}@@ -347,11 +347,11 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, descsetCurrentStep(ImportStep.Preview);} catch (error) {if (error instanceof AvexDecryptionError) {- setImportError(t(`${tk}.IncorrectPasswordError`));+ setImportError(t('common.errors.wrongPassword'));setErrorPayload(null);} else {console.error('[Import] Error decrypting .avex file:', error);- setImportErrorFromException(error, pendingAvexFilename.current ?? 'decrypted.avux', avexBytes.length, ImportStage.Parse, t(`${tk}.DecryptionErrorGeneric`));+ setImportErrorFromException(error, pendingAvexFilename.current ?? 'decrypted.avux', avexBytes.length, ImportStage.Parse, t('importExport.serviceCard.decryptionErrorGeneric'));}} finally {setIsImporting(false);@@ -468,7 +468,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, descreturn;}- notifications.addSuccessMessage(t(`${tk}.ImportSuccessMessage`, { 0: importedCredentials.length }));+ notifications.addSuccessMessage(t('importExport.serviceCard.importSuccessMessage', { count: importedCredentials.length }));navigate('/items');};@@ -539,10 +539,10 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc<p>{importError}</p>{errorPayload && (<>- <p className="mt-3 mb-2 text-sm">{t(`${tk}.ImportErrorDetailsIntro`)}</p>+ <p className="mt-3 mb-2 text-sm">{t('importExport.serviceCard.importErrorDetailsIntro')}</p><pre className="text-xs whitespace-pre-wrap break-words bg-red-50 dark:bg-red-50 p-2 rounded border border-red-200 dark:border-red-300 select-all">{errorPayload}</pre><div className="mt-2">- <button type="button" onClick={() => void copyToClipboard(errorPayload)} className="text-xs underline font-medium hover:no-underline">{t(`${tk}.ImportErrorCopyDetailsButton`)}</button>+ <button type="button" onClick={() => void copyToClipboard(errorPayload)} className="text-xs underline font-medium hover:no-underline">{t('importExport.serviceCard.importErrorCopyDetailsButton')}</button></div></>)}@@ -559,14 +559,14 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc<div className={isImporting ? 'hidden' : ''}>{children}<p className="text-gray-600 dark:text-gray-400 text-sm mb-4">- <strong>{t(`${tk}.supportedFormats`)}:</strong> {acceptedFileExtensions.join(', ')}+ <strong>{t('importExport.serviceCard.supportedFormats')}:</strong> {acceptedFileExtensions.join(', ')}</p><div className="mb-4 bg-amber-50 border border-amber-400 dark:bg-amber-800/30 dark:border-amber-500/50 rounded-lg p-4">- <p className="mb-4 text-gray-700 dark:text-gray-200">{t(`${tk}.UploadExportFileText`, { 0: serviceName })}</p>+ <p className="mb-4 text-gray-700 dark:text-gray-200">{t('importExport.serviceCard.uploadExportFileText', { service: serviceName })}</p><input ref={fileInputRef} type="file" accept={fileAcceptTypes} onChange={e => void handleFileUpload(e)} className="text-gray-700 dark:text-gray-200 file:mr-4 file:py-2 file:px-4 file:rounded-lg file:border-0 file:text-sm file:font-semibold file:bg-primary-50 file:text-primary-700 hover:file:bg-primary-100 dark:file:bg-primary-900/40 dark:file:text-primary-300 dark:hover:file:bg-primary-800/60" /></div><div className="flex justify-end mt-6 space-x-2">- <Button onClick={closeModal} color="secondary">{t(`${tk}.CancelButton`)}</Button>+ <Button onClick={closeModal} color="secondary">{t('common.cancel')}</Button></div></div></div>@@ -581,21 +581,21 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc{isImporting ? (<div className="text-center"><LoadingIndicator />- <p className="mt-4 text-gray-700 dark:text-gray-300">{t(`${tk}.DecryptingFile`)}</p>+ <p className="mt-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.decryptingFile')}</p></div>) : (<><div className="mb-4">- <p className="mb-4 text-gray-700 dark:text-gray-300">{t(`${tk}.EncryptedFilePasswordPrompt`)}</p>- <label htmlFor="decryptionPassword" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{t(`${tk}.DecryptionPasswordLabel`)}</label>+ <p className="mb-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.encryptedFilePasswordPrompt')}</p>+ <label htmlFor="decryptionPassword" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{t('importExport.serviceCard.decryptionPasswordLabel')}</label><input id="decryptionPassword" type="password" value={decryptionPassword} onChange={e => setDecryptionPassword(e.target.value)} onKeyDown={handlePasswordKeyDown} autoFocus autoComplete="off" className="bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:outline-none focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500" /></div><div className="mb-4 p-3 bg-orange-50 dark:bg-orange-900/20 border border-orange-200 dark:border-orange-800 rounded-lg">- <p className="text-xs text-orange-800 dark:text-orange-200">{t(`${tk}.DecryptionPasswordHint`)}</p>+ <p className="text-xs text-orange-800 dark:text-orange-200">{t('importExport.serviceCard.decryptionPasswordHint')}</p></div><div className="flex justify-end mt-6 space-x-2">- <Button onClick={handlePreviousStep} color="secondary" arrow="back">{t(`${tk}.BackButton`)}</Button>- <Button onClick={() => void handleDecryptFile()} color="primary" isDisabled={decryptionPassword.trim().length === 0}>{t(`${tk}.DecryptAndContinueButton`)}</Button>+ <Button onClick={handlePreviousStep} color="secondary" arrow="back">{t('common.back')}</Button>+ <Button onClick={() => void handleDecryptFile()} color="primary" isDisabled={decryptionPassword.trim().length === 0}>{t('importExport.serviceCard.decryptAndContinueButton')}</Button></div></>)}@@ -611,7 +611,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc<svg xmlns="http://www.w3.org/2000/svg" className="w-5 h-5 shrink-0 text-amber-600 dark:text-amber-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth="2" aria-hidden="true"><path strokeLinecap="round" strokeLinejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126ZM12 15.75h.008v.008H12v-.008Z" /></svg>- <p className="font-medium text-amber-900 dark:text-amber-200">{t(`${tk}.ImportPartialFailureWarning`, { 0: parseFailures.length })}</p>+ <p className="font-medium text-amber-900 dark:text-amber-200">{t('importExport.serviceCard.importPartialFailureWarning', { count: parseFailures.length })}</p></div><ul className="mb-3 ml-7 text-xs list-disc pl-5 space-y-0.5 text-gray-700 dark:text-gray-300">{parseFailures.slice(0, FAILED_ITEMS_PREVIEW_LIMIT).map(failure => (@@ -622,20 +622,20 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc))}</ul>{parseFailures.length > FAILED_ITEMS_PREVIEW_LIMIT && (- <p className="mb-3 ml-7 text-xs text-gray-700 dark:text-gray-300">{t(`${tk}.MoreCredentials`, { 0: parseFailures.length - FAILED_ITEMS_PREVIEW_LIMIT })}</p>+ <p className="mb-3 ml-7 text-xs text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.moreCredentials', { count: parseFailures.length - FAILED_ITEMS_PREVIEW_LIMIT })}</p>)}<button type="button" onClick={() => setShowFailureDetails(!showFailureDetails)} className="ml-7 inline-flex items-center gap-1 text-xs font-medium text-amber-800 dark:text-amber-300 hover:text-amber-900 dark:hover:text-amber-200 hover:underline"><span className={`${showFailureDetails ? 'rotate-90' : ''} transition-transform`}>▸</span>- {showFailureDetails ? t(`${tk}.ImportErrorHideDetailsButton`) : t(`${tk}.ImportErrorShowDetailsButton`)}+ {showFailureDetails ? t('common.hideDetails') : t('common.showDetails')}</button>{showFailureDetails && (<div className="mt-2 ml-7 flex items-start gap-2"><textarea readOnly rows={4} value={buildFailureDetailsText()} className="flex-1 text-xs font-mono p-2 rounded border border-gray-300 dark:border-gray-700 bg-gray-50 dark:bg-gray-900 text-gray-800 dark:text-gray-200 leading-snug" />- <button type="button" onClick={() => void copyToClipboard(buildFailureDetailsText())} title={t(`${tk}.ImportErrorCopyDetailsButton`)} className="shrink-0 inline-flex items-center gap-1 px-2.5 py-1.5 text-xs font-medium rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-600">+ <button type="button" onClick={() => void copyToClipboard(buildFailureDetailsText())} title={t('importExport.serviceCard.importErrorCopyDetailsButton')} className="shrink-0 inline-flex items-center gap-1 px-2.5 py-1.5 text-xs font-medium rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-600"><svg xmlns="http://www.w3.org/2000/svg" className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth="2" aria-hidden="true"><path strokeLinecap="round" strokeLinejoin="round" d="M15.75 17.25v3.375c0 .621-.504 1.125-1.125 1.125h-9.75a1.125 1.125 0 0 1-1.125-1.125V7.875c0-.621.504-1.125 1.125-1.125H6.75a9.06 9.06 0 0 1 1.5.124m7.5 10.376h3.375c.621 0 1.125-.504 1.125-1.125V11.25c0-4.46-3.243-8.161-7.5-8.876a9.06 9.06 0 0 0-1.5-.124H9.375c-.621 0-1.125.504-1.125 1.125v3.5m7.5 10.375H9.375a1.125 1.125 0 0 1-1.125-1.125v-9.25m12 6.625v-1.875a3.375 3.375 0 0 0-3.375-3.375h-1.5a1.125 1.125 0 0 1-1.125-1.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H9.75" /></svg>- {t(`${tk}.ImportErrorCopyDetailsButton`)}+ {t('importExport.serviceCard.importErrorCopyDetailsButton')}</button></div>)}@@ -650,7 +650,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc<div className="mb-4">{duplicateCredentialsCount > 0 && (<div className="p-4 mb-4 text-gray-700 bg-gray-100 rounded-lg dark:bg-gray-700/50 dark:text-gray-300" role="alert">- <p>{t(`${tk}.DuplicateCredentialsWarning`, { 0: duplicateCredentialsCount })}</p>+ <p>{t('importExport.serviceCard.duplicateCredentialsWarning', { count: duplicateCredentialsCount })}</p></div>)}@@ -658,17 +658,17 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc{importedCredentials.length === 0 ? (<div className="p-4 mb-4 text-amber-700 bg-amber-100 rounded-lg dark:bg-amber-800/30 dark:text-amber-300" role="alert">- <p>{t(`${tk}.NoNewCredentials`)}</p>+ <p>{t('importExport.serviceCard.noNewCredentials')}</p></div>) : (<>- <p className="mb-4 text-gray-700 dark:text-gray-300">{t(`${tk}.PreviewInstructions`)}</p>+ <p className="mb-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.previewInstructions')}</p><table className="min-w-full divide-y divide-gray-200 dark:divide-gray-700"><thead className="bg-gray-50 dark:bg-gray-700"><tr>- <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">{t(`${tk}.ServiceColumn`)}</th>- <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">{t(`${tk}.UsernameColumn`)}</th>- <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">{t(`${tk}.PasswordColumn`)}</th>+ <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">{t('importExport.serviceCard.serviceColumn')}</th>+ <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">{t('common.username')}</th>+ <th className="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">{t('common.password')}</th></tr></thead><tbody className="bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700">@@ -682,25 +682,25 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc</tbody></table>{importedCredentials.length > PREVIEW_ROW_COUNT && (- <p className="mt-2 text-sm text-gray-500 dark:text-gray-400">{t(`${tk}.MoreCredentials`, { 0: importedCredentials.length - PREVIEW_ROW_COUNT })}</p>+ <p className="mt-2 text-sm text-gray-500 dark:text-gray-400">{t('importExport.serviceCard.moreCredentials', { count: importedCredentials.length - PREVIEW_ROW_COUNT })}</p>)}</>)}</div>{importedCredentials.length > 0 && (<div className="mb-4 space-y-2">- <ImportOption checked={extractFavicons} onChange={setExtractFavicons} label={t(`${tk}.ExtractFaviconsLabel`)} />+ <ImportOption checked={extractFavicons} onChange={setExtractFavicons} label={t('importExport.serviceCard.extractFaviconsLabel')} />{detectedFolderPaths.length > 0 && (- <ImportOption checked={importFolders} onChange={setImportFolders} label={t(`${tk}.ImportFoldersLabel`)} detail={t(`${tk}.FoldersDetected`, { 0: detectedFolderPaths.length })} />+ <ImportOption checked={importFolders} onChange={setImportFolders} label={t('importExport.serviceCard.importFoldersLabel')} detail={t('importExport.serviceCard.foldersDetected', { count: detectedFolderPaths.length })} />)}{detectedAttachmentCount > 0 && (- <ImportOption checked={importAttachments} onChange={setImportAttachments} label={t(`${tk}.ImportAttachmentsLabel`)} detail={t(`${tk}.AttachmentsDetected`, { 0: detectedAttachmentCount, 1: formatBytes(detectedAttachmentsTotalSize) })} />+ <ImportOption checked={importAttachments} onChange={setImportAttachments} label={t('importExport.serviceCard.importAttachmentsLabel')} detail={t('importExport.serviceCard.attachmentsDetected', { count: detectedAttachmentCount, size: formatBytes(detectedAttachmentsTotalSize) })} />)}</div>)}<div className="flex justify-end mt-6 space-x-2">- <Button onClick={handlePreviousStep} color="secondary" arrow="back">{t(`${tk}.BackButton`)}</Button>- {importedCredentials.length > 0 && <Button onClick={handleNextStep} color="primary" arrow="forward">{t(`${tk}.NextButton`)}</Button>}+ <Button onClick={handlePreviousStep} color="secondary" arrow="back">{t('common.back')}</Button>+ {importedCredentials.length > 0 && <Button onClick={handleNextStep} color="primary" arrow="forward">{t('common.next')}</Button>}</div></>);@@ -714,20 +714,20 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, descisExtractingFavicons ? (<div className="text-center"><LoadingIndicator />- <p className="mt-4 text-gray-700 dark:text-gray-300">{t(`${tk}.ExtractingFavicons`, { 0: faviconExtractionProgress, 1: totalFaviconsToExtract })}</p>+ <p className="mt-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.extractingFavicons', { current: faviconExtractionProgress, total: totalFaviconsToExtract })}</p><div className="mt-4">- <Button onClick={cancelFaviconExtraction} color="secondary">{t(`${tk}.CancelButton`)}</Button>+ <Button onClick={cancelFaviconExtraction} color="secondary">{t('common.cancel')}</Button></div></div>) : isSavingCredentials ? (<div className="text-center"><LoadingIndicator />- <p className="mt-4 text-gray-700 dark:text-gray-300">{t(`${tk}.SavingCredentials`, { 0: credentialSaveProgress, 1: totalCredentialsToSave })}</p>+ <p className="mt-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.savingCredentials', { current: credentialSaveProgress, total: totalCredentialsToSave })}</p></div>) : isSyncingVault ? (<div className="text-center"><LoadingIndicator />- <p className="mt-4 text-gray-700 dark:text-gray-300">{t(`${tk}.SyncingVault`)}</p>+ <p className="mt-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.syncingVault')}</p></div>) : (<LoadingIndicator />@@ -735,16 +735,16 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc) : (<><div className="mb-4">- <p className="mb-4 text-gray-700 dark:text-gray-300">{t(`${tk}.ConfirmImportText`, { 0: importedCredentials.length })}</p>+ <p className="mb-4 text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.confirmImportText', { count: importedCredentials.length })}</p>{extractFavicons && (<div className="p-4 mb-4 text-amber-700 bg-amber-100 rounded-lg dark:bg-amber-800/30 dark:text-amber-300" role="alert">- <p>{t(`${tk}.FaviconExtractionNote`)}</p>+ <p>{t('importExport.serviceCard.faviconExtractionNote')}</p></div>)}</div><div className="flex justify-end mt-6 space-x-2">- <Button onClick={handlePreviousStep} color="secondary" arrow="back">{t(`${tk}.BackButton`)}</Button>- <Button onClick={() => void handleModalConfirm()} color="primary">{t(`${tk}.ImportButton`)}</Button>+ <Button onClick={handlePreviousStep} color="secondary" arrow="back">{t('common.back')}</Button>+ <Button onClick={() => void handleModalConfirm()} color="primary">{t('importExport.serviceCard.importButton')}</Button></div></>)}@@ -759,7 +759,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc{logoUrl.length > 0 ? (<img src={logoUrl} alt={`${serviceName} logo`} className="w-full h-full object-contain" />) : (- <span className="text-gray-500 dark:text-gray-400 text-xs">{t(`${tk}.NoLogoText`)}</span>+ <span className="text-gray-500 dark:text-gray-400 text-xs">{t('importExport.serviceCard.noLogoText')}</span>)}</div><div>@@ -775,7 +775,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc<div className="flex justify-between items-center mb-4"><div className="flex"><img src={logoUrl} alt={`${serviceName} logo`} className="w-8 h-8 float-left mr-4" />- <h3 className="text-xl font-semibold dark:text-white">{t(`${tk}.ImportFromServiceTitle`, { 0: serviceName })}</h3>+ <h3 className="text-xl font-semibold dark:text-white">{t('importExport.serviceCard.importFromServiceTitle', { service: serviceName })}</h3></div><button type="button" onClick={closeModal} className="text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-300"><svg className="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">diff --git a/apps/web/src/components/settings/importexport/ImportServices.tsx b/apps/web/src/components/settings/importexport/ImportServices.tsxindex 9d0464759..3a252e756 100644--- a/apps/web/src/components/settings/importexport/ImportServices.tsx+++ b/apps/web/src/components/settings/importexport/ImportServices.tsx@@ -30,8 +30,6 @@ import { useNotifications } from '@/context/NotificationContext';import type { ImportedCredential } from '@aliasvault/client/transfer/import/models/ImportedCredential';import type { ImportFileResult } from '@aliasvault/client/transfer/import/models/ImportFileResult';-const tk = 'components.main.settings.importExport.importServices';-/*** One paragraph of a service's import instructions.*/@@ -87,8 +85,8 @@ const ImportServiceAliasVault: React.FC = () => {});return (- <ImportServiceCard serviceName="AliasVault" description={t(`${tk}.AliasVaultDescription`)} logoUrl="/img/logo.svg" acceptedFileExtensions={['.avex', '.avux', '.csv']} processFile={processFile}>- <Instruction>{t(`${tk}.AliasVaultInstructionsPart1`)}</Instruction>+ <ImportServiceCard serviceName="AliasVault" description={t('importExport.services.aliasVaultDescription')} logoUrl="/img/logo.svg" acceptedFileExtensions={['.avex', '.avux', '.csv']} processFile={processFile}>+ <Instruction>{t('importExport.services.aliasVaultInstructionsPart1')}</Instruction></ImportServiceCard>);};@@ -105,21 +103,21 @@ type FileImportService = {};const FILE_IMPORT_SERVICES: FileImportService[] = [- { serviceName: '1Password', logoUrl: '/img/importers/1password.svg', descriptionKey: 'OnePasswordDescription', instructionKeys: ['OnePasswordInstructionsPart1', 'OnePasswordInstructionsPart2'], parsers: { '.1pux': importOnePassword1pux, '.csv': csv(importOnePasswordCsv) } },- { serviceName: 'Bitwarden', logoUrl: '/img/importers/bitwarden.svg', descriptionKey: 'BitwardenDescription', instructionKeys: ['BitwardenInstructionsPart1', 'BitwardenInstructionsPart2'], parsers: { '.zip': importBitwardenZip, '.csv': csv(importBitwardenCsv) } },- { serviceName: 'Chrome', logoUrl: '/img/importers/chrome.svg', descriptionKey: 'ChromeDescription', instructionKeys: ['ChromeInstructionsPart1', 'ChromeInstructionsPart2'], parsers: { '.csv': csv(importChromeCsv) } },- { serviceName: 'Dashlane', logoUrl: '/img/importers/dashlane.svg', descriptionKey: 'DashlaneDescription', instructionKeys: ['DashlaneInstructionsPart1', 'DashlaneInstructionsPart2'], parsers: { '.csv': csv(importDashlaneCsv) } },- { serviceName: 'Dropbox Passwords', logoUrl: '/img/importers/dropbox.svg', descriptionKey: 'DropboxDescription', instructionKeys: ['DropboxInstructionsPart1', 'UploadFileInstructionCommon'], parsers: { '.csv': csv(importDropboxCsv) } },- { serviceName: 'Edge', logoUrl: '/img/importers/edge.svg', descriptionKey: 'EdgeDescription', instructionKeys: ['EdgeInstructionsPart1', 'EdgeInstructionsPart2'], parsers: { '.csv': csv(importEdgeCsv) } },- { serviceName: 'Enpass', logoUrl: '/img/importers/enpass.svg', descriptionKey: 'EnpassDescription', instructionKeys: ['EnpassInstructionsPart1', 'EnpassInstructionsPart2'], parsers: { '.csv': csv(importEnpassCsv) } },- { serviceName: 'Firefox', logoUrl: '/img/importers/firefox.svg', descriptionKey: 'FirefoxDescription', instructionKeys: ['FirefoxInstructionsPart1', 'FirefoxInstructionsPart2'], parsers: { '.csv': csv(importFirefoxCsv) } },- { serviceName: 'KeePass', logoUrl: '/img/importers/keepass.svg', descriptionKey: 'KeePassDescription', instructionKeys: ['KeePassInstructionsPart1', 'KeePassInstructionsPart2'], parsers: { '.csv': csv(importKeePassCsv) } },- { serviceName: 'KeePassXC', logoUrl: '/img/importers/keepassxc.svg', descriptionKey: 'KeePassXCDescription', instructionKeys: ['KeePassXCInstructionsPart1', 'KeePassXCInstructionsPart2'], parsers: { '.csv': csv(importKeePassXcCsv) } },- { serviceName: 'LastPass', logoUrl: '/img/importers/lastpass.svg', descriptionKey: 'LastPassDescription', instructionKeys: ['LastPassInstructionsPart1', 'LastPassInstructionsPart2'], parsers: { '.csv': csv(importLastPassCsv) } },- { serviceName: 'NordPass', logoUrl: '/img/importers/nordpass.svg', descriptionKey: 'NordPassDescription', instructionKeys: ['NordPassInstructionsPart1', 'NordPassInstructionsPart2'], parsers: { '.csv': csv(importNordPassCsv) } },- { serviceName: 'Proton Pass', logoUrl: '/img/importers/protonpass.svg', descriptionKey: 'ProtonPassDescription', instructionKeys: ['ProtonPassInstructionsPart1', 'ProtonPassInstructionsPart2'], parsers: { '.zip': importProtonPassZip, '.csv': csv(importProtonPassCsv) } },- { serviceName: 'RoboForm', logoUrl: '/img/importers/roboform.svg', descriptionKey: 'RoboformDescription', instructionKeys: ['RoboformInstructionsPart1', 'RoboformInstructionsPart2'], parsers: { '.csv': csv(importRoboformCsv) } },- { serviceName: 'Strongbox', logoUrl: '/img/importers/strongbox.svg', descriptionKey: 'StrongboxDescription', instructionKeys: ['StrongboxInstructionsPart1', 'StrongboxInstructionsPart2'], parsers: { '.csv': csv(importStrongboxCsv) } },+ { serviceName: '1Password', logoUrl: '/img/importers/1password.svg', descriptionKey: 'importExport.services.onePasswordDescription', instructionKeys: ['importExport.services.onePasswordInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.1pux': importOnePassword1pux, '.csv': csv(importOnePasswordCsv) } },+ { serviceName: 'Bitwarden', logoUrl: '/img/importers/bitwarden.svg', descriptionKey: 'importExport.services.bitwardenDescription', instructionKeys: ['importExport.services.bitwardenInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.zip': importBitwardenZip, '.csv': csv(importBitwardenCsv) } },+ { serviceName: 'Chrome', logoUrl: '/img/importers/chrome.svg', descriptionKey: 'importExport.services.chromeDescription', instructionKeys: ['importExport.services.chromeInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importChromeCsv) } },+ { serviceName: 'Dashlane', logoUrl: '/img/importers/dashlane.svg', descriptionKey: 'importExport.services.dashlaneDescription', instructionKeys: ['importExport.services.dashlaneInstructionsPart1', 'importExport.services.dashlaneInstructionsPart2'], parsers: { '.csv': csv(importDashlaneCsv) } },+ { serviceName: 'Dropbox Passwords', logoUrl: '/img/importers/dropbox.svg', descriptionKey: 'importExport.services.dropboxDescription', instructionKeys: ['importExport.services.dropboxInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importDropboxCsv) } },+ { serviceName: 'Edge', logoUrl: '/img/importers/edge.svg', descriptionKey: 'importExport.services.edgeDescription', instructionKeys: ['importExport.services.edgeInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importEdgeCsv) } },+ { serviceName: 'Enpass', logoUrl: '/img/importers/enpass.svg', descriptionKey: 'importExport.services.enpassDescription', instructionKeys: ['importExport.services.enpassInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importEnpassCsv) } },+ { serviceName: 'Firefox', logoUrl: '/img/importers/firefox.svg', descriptionKey: 'importExport.services.firefoxDescription', instructionKeys: ['importExport.services.firefoxInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importFirefoxCsv) } },+ { serviceName: 'KeePass', logoUrl: '/img/importers/keepass.svg', descriptionKey: 'importExport.services.keePassDescription', instructionKeys: ['importExport.services.keePassInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importKeePassCsv) } },+ { serviceName: 'KeePassXC', logoUrl: '/img/importers/keepassxc.svg', descriptionKey: 'importExport.services.keePassXCDescription', instructionKeys: ['importExport.services.keePassXCInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importKeePassXcCsv) } },+ { serviceName: 'LastPass', logoUrl: '/img/importers/lastpass.svg', descriptionKey: 'importExport.services.lastPassDescription', instructionKeys: ['importExport.services.lastPassInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importLastPassCsv) } },+ { serviceName: 'NordPass', logoUrl: '/img/importers/nordpass.svg', descriptionKey: 'importExport.services.nordPassDescription', instructionKeys: ['importExport.services.nordPassInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importNordPassCsv) } },+ { serviceName: 'Proton Pass', logoUrl: '/img/importers/protonpass.svg', descriptionKey: 'importExport.services.protonPassDescription', instructionKeys: ['importExport.services.protonPassInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.zip': importProtonPassZip, '.csv': csv(importProtonPassCsv) } },+ { serviceName: 'RoboForm', logoUrl: '/img/importers/roboform.svg', descriptionKey: 'importExport.services.roboformDescription', instructionKeys: ['importExport.services.roboformInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importRoboformCsv) } },+ { serviceName: 'Strongbox', logoUrl: '/img/importers/strongbox.svg', descriptionKey: 'importExport.services.strongboxDescription', instructionKeys: ['importExport.services.strongboxInstructionsPart1', 'importExport.services.uploadInstructions'], parsers: { '.csv': csv(importStrongboxCsv) } },];/**@@ -128,8 +126,8 @@ const FILE_IMPORT_SERVICES: FileImportService[] = [const ImportServiceFromFile: React.FC<{ service: FileImportService }> = ({ service }) => {const { t } = useTranslation();return (- <ImportServiceCard serviceName={service.serviceName} description={t(`${tk}.${service.descriptionKey}`)} logoUrl={service.logoUrl} acceptedFileExtensions={Object.keys(service.parsers)} processFile={parseByExtension(service.parsers)}>- {service.instructionKeys.map(key => <Instruction key={key}>{t(`${tk}.${key}`)}</Instruction>)}+ <ImportServiceCard serviceName={service.serviceName} description={t(service.descriptionKey)} logoUrl={service.logoUrl} acceptedFileExtensions={Object.keys(service.parsers)} processFile={parseByExtension(service.parsers)}>+ {service.instructionKeys.map(key => <Instruction key={key}>{t(key)}</Instruction>)}</ImportServiceCard>);};@@ -149,7 +147,7 @@ const ImportServiceGenericCsv: React.FC = () => {downloadBytes('aliasvault-import-template.csv', getGenericCsvTemplate(), 'text/csv');} catch (error) {console.error('[Import] Error downloading CSV template:', error);- notifications.addErrorMessage(t(`${tk}.GenericCsvTemplateDownloadError`), true);+ notifications.addErrorMessage(t('importExport.services.genericCsvTemplateDownloadError'), true);}};@@ -164,13 +162,13 @@ const ImportServiceGenericCsv: React.FC = () => {);return (- <ImportServiceCard serviceName="Generic CSV" description={t(`${tk}.GenericCsvDescription`)} logoUrl="/img/importers/generic-csv.svg" acceptedFileExtensions={['.csv']} processFile={parseByExtension({ '.csv': csv(importGenericCsv) })}>- <Instruction>{t(`${tk}.GenericCsvInstructionsPart1`)}</Instruction>+ <ImportServiceCard serviceName="Generic CSV" description={t('importExport.services.genericCsvDescription')} logoUrl="/img/importers/generic-csv.svg" acceptedFileExtensions={['.csv']} processFile={parseByExtension({ '.csv': csv(importGenericCsv) })}>+ <Instruction>{t('importExport.services.genericCsvInstructionsPart1')}</Instruction><ol className="text-sm text-gray-700 dark:text-gray-300 space-y-2 mb-4">- {step(1, <>{t(`${tk}.GenericCsvStep1`)} <button type="button" onClick={downloadTemplate} className="text-amber-600 dark:text-amber-400 hover:text-amber-800 dark:hover:text-amber-200 underline">template</button></>)}- {step(2, t(`${tk}.GenericCsvStep2`))}- {step(3, t(`${tk}.GenericCsvStep3`))}- {step(4, t(`${tk}.GenericCsvStep4`))}+ {step(1, <>{t('importExport.services.genericCsvStep1')} <button type="button" onClick={downloadTemplate} className="text-amber-600 dark:text-amber-400 hover:text-amber-800 dark:hover:text-amber-200 underline">{t('importExport.services.template')}</button></>)}+ {step(2, t('importExport.services.genericCsvStep2'))}+ {step(3, t('importExport.services.genericCsvStep3'))}+ {step(4, t('importExport.services.genericCsvStep4'))}</ol></ImportServiceCard>);diff --git a/apps/web/src/components/settings/importexport/ResetVaultSection.tsx b/apps/web/src/components/settings/importexport/ResetVaultSection.tsxindex b2167520f..774e7da86 100644--- a/apps/web/src/components/settings/importexport/ResetVaultSection.tsx+++ b/apps/web/src/components/settings/importexport/ResetVaultSection.tsx@@ -11,13 +11,12 @@ import Card from '@/components/shared/Card';const ResetVaultSection: React.FC = () => {const { t } = useTranslation();const navigate = useNavigate();- const tk = 'components.main.settings.importExport.resetVaultSection';return (<Card>- <h3 className="mb-2 text-lg font-medium text-gray-900 dark:text-white">{t(`${tk}.Title`)}</h3>- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.Description`)}</div>- <Button color="danger" onClick={() => navigate('/settings/import-export/reset-vault')}>{t(`${tk}.ResetVaultButton`)}</Button>+ <h3 className="mb-2 text-lg font-medium text-gray-900 dark:text-white">{t('settings.resetVault.pageTitle')}</h3>+ <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.resetVault.section.description')}</div>+ <Button color="danger" onClick={() => navigate('/settings/import-export/reset-vault')}>{t('settings.resetVault.pageTitle')}</Button></Card>);};diff --git a/apps/web/src/components/settings/security/ActiveSessionsSection.tsx b/apps/web/src/components/settings/security/ActiveSessionsSection.tsxindex 6184a9d21..bec4527dc 100644--- a/apps/web/src/components/settings/security/ActiveSessionsSection.tsx+++ b/apps/web/src/components/settings/security/ActiveSessionsSection.tsx@@ -18,7 +18,6 @@ const ActiveSessionsSection = forwardRef<SectionHandle, { onSessionsChanged: ()const notifications = useNotifications();const [isLoading, setIsLoading] = useState(true);const [sessions, setSessions] = useState<RefreshToken[]>([]);- const tk = 'components.main.settings.security.activeSessionsSection';const loadData = useCallback(async (): Promise<void> => {setIsLoading(true);@@ -36,27 +35,27 @@ const ActiveSessionsSection = forwardRef<SectionHandle, { onSessionsChanged: ()const revokeSession = async (id: string): Promise<void> => {try {await webApi.revokeSession(id);- notifications.addSuccessMessage(t(`${tk}.RevokeSuccessMessage`), true);+ notifications.addSuccessMessage(t('settings.securitySettings.activeSessions.revokeSuccessMessage'), true);await onSessionsChanged();} catch (error) {- notifications.addErrorMessage(t(`${tk}.RevokeExceptionMessage`, { 0: error instanceof Error ? error.message : String(error) }), true);+ notifications.addErrorMessage(t('settings.securitySettings.activeSessions.revokeExceptionMessage', { error: error instanceof Error ? error.message : String(error) }), true);}};return (- <SecuritySection title={t(`${tk}.Title`)}>- <p className="text-sm text-gray-600 dark:text-gray-400 mb-4">{t(`${tk}.Description`)}</p>+ <SecuritySection title={t('settings.securitySettings.activeSessionsTitle')}>+ <p className="text-sm text-gray-600 dark:text-gray-400 mb-4">{t('settings.securitySettings.activeSessions.headerText')}</p>{isLoading ? <LoadingIndicator /> : sessions.length === 0 ? (- <p className="text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.NoSessionsMessage`)}</p>+ <p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.activeSessions.noSessionsMessage')}</p>) : (<div className="overflow-x-auto"><table className="w-full text-sm text-left text-gray-500 dark:text-gray-400"><thead className="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400"><tr>- <th scope="col" className="px-6 py-3">{t(`${tk}.DeviceColumn`)}</th>- <th scope="col" className="px-6 py-3">{t(`${tk}.LastActiveColumn`)}</th>- <th scope="col" className="px-6 py-3">{t(`${tk}.ExpiresColumn`)}</th>- <th scope="col" className="px-6 py-3">{t(`${tk}.ActionColumn`)}</th>+ <th scope="col" className="px-6 py-3">{t('settings.securitySettings.authLogs.deviceColumn')}</th>+ <th scope="col" className="px-6 py-3">{t('settings.securitySettings.activeSessions.lastActive')}</th>+ <th scope="col" className="px-6 py-3">{t('settings.securitySettings.activeSessions.expires')}</th>+ <th scope="col" className="px-6 py-3">{t('settings.securitySettings.activeSessions.actionColumn')}</th></tr></thead><tbody>@@ -65,7 +64,7 @@ const ActiveSessionsSection = forwardRef<SectionHandle, { onSessionsChanged: ()<td className="px-6 py-4">{session.deviceIdentifier}</td><td className="px-6 py-4">{formatDateTime(session.createdAt)}</td><td className="px-6 py-4">{formatDateTime(session.expireDate)}</td>- <td className="px-6 py-4"><Button color="danger" onClick={() => void revokeSession(session.id)}>{t(`${tk}.RevokeButton`)}</Button></td>+ <td className="px-6 py-4"><Button color="danger" onClick={() => void revokeSession(session.id)}>{t('settings.securitySettings.activeSessions.revoke')}</Button></td></tr>))}</tbody>diff --git a/apps/web/src/components/settings/security/DeleteAccountSection.tsx b/apps/web/src/components/settings/security/DeleteAccountSection.tsxindex b8f82612a..72a629fe7 100644--- a/apps/web/src/components/settings/security/DeleteAccountSection.tsx+++ b/apps/web/src/components/settings/security/DeleteAccountSection.tsx@@ -11,11 +11,11 @@ import Button from '@/components/shared/Button';const DeleteAccountSection: React.FC = () => {const { t } = useTranslation();const navigate = useNavigate();- const tk = 'components.main.settings.security.deleteAccountSection';+return (- <SecuritySection title={t(`${tk}.Title`)}>- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.Description`)}</div>- <Button color="danger" onClick={() => navigate('/settings/security/delete-account')}>{t(`${tk}.DeleteButton`)}</Button>+ <SecuritySection title={t('settings.securitySettings.deleteAccount.deleteAccount')}>+ <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.deleteAccountSection.description')}</div>+ <Button color="danger" onClick={() => navigate('/settings/security/delete-account')}>{t('settings.securitySettings.deleteAccount.deleteAccount')}</Button></SecuritySection>);};diff --git a/apps/web/src/components/settings/security/PasswordChangeSection.tsx b/apps/web/src/components/settings/security/PasswordChangeSection.tsxindex 211d999d0..4fe5198f1 100644--- a/apps/web/src/components/settings/security/PasswordChangeSection.tsx+++ b/apps/web/src/components/settings/security/PasswordChangeSection.tsx@@ -11,11 +11,11 @@ import Button from '@/components/shared/Button';const PasswordChangeSection: React.FC = () => {const { t } = useTranslation();const navigate = useNavigate();- const tk = 'components.main.settings.security.passwordChangeSection';+return (- <SecuritySection title={t(`${tk}.Title`)}>- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.Description`)}</div>- <Button onClick={() => navigate('/settings/security/change-password')}>{t(`${tk}.ChangePasswordButton`)}</Button>+ <SecuritySection title={t('settings.securitySettings.changeMasterPassword')}>+ <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.changePassword.headerText')}</div>+ <Button onClick={() => navigate('/settings/security/change-password')}>{t('settings.securitySettings.changePassword.changePassword')}</Button></SecuritySection>);};diff --git a/apps/web/src/components/settings/security/QuickVaultUnlockSection.tsx b/apps/web/src/components/settings/security/QuickVaultUnlockSection.tsxindex 3f41671f6..653303164 100644--- a/apps/web/src/components/settings/security/QuickVaultUnlockSection.tsx+++ b/apps/web/src/components/settings/security/QuickVaultUnlockSection.tsx@@ -16,7 +16,6 @@ const QuickVaultUnlockSection = forwardRef<SectionHandle>((_, ref) => {const auth = useAuth();const notifications = useNotifications();const [enabled, setEnabled] = useState(() => WebAuthnService.isEnabled());- const tk = 'components.main.settings.security.quickVaultUnlockSection';const loadData = useCallback(async (): Promise<void> => {setEnabled(WebAuthnService.isEnabled());@@ -29,13 +28,13 @@ const QuickVaultUnlockSection = forwardRef<SectionHandle>((_, ref) => {const enable = async (): Promise<void> => {try {await WebAuthnService.enable(auth.username ?? '');- notifications.addSuccessMessage(t(`${tk}.SuccessEnabledMessage`), true);+ notifications.addSuccessMessage(t('settings.securitySettings.passkeyUnlock.successEnabledMessage'), true);} catch (error) {if (error instanceof WebAuthnNotSupportedError) {- notifications.addErrorMessage(t(`${tk}.WebAuthnNotSupportedError`), true);+ notifications.addErrorMessage(t('settings.securitySettings.passkeyUnlock.webAuthnNotSupportedError'), true);} else {console.info('An error occurred while trying to enable WebAuthn.', error);- notifications.addErrorMessage(t(`${tk}.EnableErrorMessage`), true);+ notifications.addErrorMessage(t('settings.securitySettings.passkeyUnlock.enableErrorMessage'), true);}return;}@@ -47,22 +46,22 @@ const QuickVaultUnlockSection = forwardRef<SectionHandle>((_, ref) => {*/const disable = async (): Promise<void> => {WebAuthnService.disable();- notifications.addSuccessMessage(t(`${tk}.SuccessDisabledMessage`), true);+ notifications.addSuccessMessage(t('settings.securitySettings.passkeyUnlock.successDisabledMessage'), true);await loadData();};return (- <SecuritySection title={t(`${tk}.Title`)}>+ <SecuritySection title={t('settings.securitySettings.passkeyUnlock.title')}>{enabled ? (<>- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.EnabledDescription`)}</div>- <Button color="danger" onClick={() => void disable()}>{t(`${tk}.DisableButton`)}</Button>+ <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.passkeyUnlock.enabledDescription')}</div>+ <Button color="danger" onClick={() => void disable()}>{t('settings.securitySettings.passkeyUnlock.disableButton')}</Button></>) : (<>- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.DisabledDescription`)}</div>- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.ExperimentalWarning`)}</div>- <Button color="success" onClick={() => void enable()}>{t(`${tk}.EnableButton`)}</Button>+ <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.passkeyUnlock.disabledDescription')}</div>+ <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.passkeyUnlock.experimentalWarning')}</div>+ <Button color="success" onClick={() => void enable()}>{t('settings.securitySettings.passkeyUnlock.enableButton')}</Button></>)}</SecuritySection>diff --git a/apps/web/src/components/settings/security/RecentAuthLogsSection.tsx b/apps/web/src/components/settings/security/RecentAuthLogsSection.tsxindex 65556278f..0cfe4fde7 100644--- a/apps/web/src/components/settings/security/RecentAuthLogsSection.tsx+++ b/apps/web/src/components/settings/security/RecentAuthLogsSection.tsx@@ -20,7 +20,6 @@ const RecentAuthLogsSection = forwardRef<SectionHandle>((_, ref) => {const webApi = useWebApi();const [isLoading, setIsLoading] = useState(true);const [logs, setLogs] = useState<AuthLogModel[]>([]);- const tk = 'components.main.settings.security.recentAuthLogsSection';const loadData = useCallback(async (): Promise<void> => {setIsLoading(true);@@ -34,20 +33,20 @@ const RecentAuthLogsSection = forwardRef<SectionHandle>((_, ref) => {useImperativeHandle(ref, () => ({ loadData }), [loadData]);return (- <SecuritySection title={t(`${tk}.Title`)}>- <p className="text-sm text-gray-600 dark:text-gray-400 mb-4">{t(`${tk}.Description`)}</p>+ <SecuritySection title={t('settings.securitySettings.recentAuthLogs')}>+ <p className="text-sm text-gray-600 dark:text-gray-400 mb-4">{t('settings.securitySettings.authLogs.headerText')}</p>{isLoading ? <LoadingIndicator /> : logs.length === 0 ? (- <p className="text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.NoLogsMessage`)}</p>+ <p className="text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.authLogs.noLogsMessage')}</p>) : (<div className="overflow-x-auto"><table className="w-full text-sm text-left text-gray-500 dark:text-gray-400"><thead className="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400"><tr>- <th scope="col" className="px-6 py-3">{t(`${tk}.TimestampColumn`)}</th>- <th scope="col" className="px-6 py-3">{t(`${tk}.EventTypeColumn`)}</th>- <th scope="col" className="px-6 py-3">{t(`${tk}.ClientColumn`)}</th>- <th scope="col" className="px-6 py-3">{t(`${tk}.IpAddressColumn`)}</th>- <th scope="col" className="px-6 py-3">{t(`${tk}.SuccessColumn`)}</th>+ <th scope="col" className="px-6 py-3">{t('settings.securitySettings.authLogs.timestampColumn')}</th>+ <th scope="col" className="px-6 py-3">{t('settings.securitySettings.authLogs.eventTypeColumn')}</th>+ <th scope="col" className="px-6 py-3">{t('settings.securitySettings.authLogs.client')}</th>+ <th scope="col" className="px-6 py-3">{t('settings.securitySettings.authLogs.ipAddress')}</th>+ <th scope="col" className="px-6 py-3">{t('settings.securitySettings.authLogs.success')}</th></tr></thead><tbody>@@ -57,7 +56,7 @@ const RecentAuthLogsSection = forwardRef<SectionHandle>((_, ref) => {<td className="px-6 py-4">{AuthEventType[log.eventType] ?? log.eventType}</td><td className="px-6 py-4">{log.client}</td><td className="px-6 py-4">{log.ipAddress}</td>- <td className="px-4 py-4"><StatusPill enabled={log.isSuccess} textTrue={t(`${tk}.SuccessStatus`)} textFalse={t(`${tk}.FailedStatus`)} /></td>+ <td className="px-4 py-4"><StatusPill enabled={log.isSuccess} textTrue={t('settings.securitySettings.authLogs.success')} textFalse={t('settings.securitySettings.authLogs.failed')} /></td></tr>))}</tbody>diff --git a/apps/web/src/components/settings/security/TwoFactorAuthenticationSection.tsx b/apps/web/src/components/settings/security/TwoFactorAuthenticationSection.tsxindex 3ed113b3a..b6e34bef2 100644--- a/apps/web/src/components/settings/security/TwoFactorAuthenticationSection.tsx+++ b/apps/web/src/components/settings/security/TwoFactorAuthenticationSection.tsx@@ -16,7 +16,6 @@ const TwoFactorAuthenticationSection = forwardRef<SectionHandle>((_, ref) => {const webApi = useWebApi();const [isLoading, setIsLoading] = useState(true);const [enabled, setEnabled] = useState(false);- const tk = 'components.main.settings.security.twoFactorAuthenticationSection';const loadData = useCallback(async (): Promise<void> => {setIsLoading(true);@@ -30,16 +29,16 @@ const TwoFactorAuthenticationSection = forwardRef<SectionHandle>((_, ref) => {useImperativeHandle(ref, () => ({ loadData }), [loadData]);return (- <SecuritySection title={t(`${tk}.Title`)}>+ <SecuritySection title={t('common.twoFactorAuthentication')}>{isLoading ? <LoadingIndicator /> : enabled ? (<>- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.EnabledMessage`)}</div>- <Button color="danger" onClick={() => navigate('/settings/security/disable-2fa')}>{t(`${tk}.DisableButton`)}</Button>+ <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.twoFactor.enabledMessage')}</div>+ <Button color="danger" onClick={() => navigate('/settings/security/disable-2fa')}>{t('settings.securitySettings.disable2fa.pageTitle')}</Button></>) : (<>- <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.DisabledMessage`)}</div>- <Button color="success" onClick={() => navigate('/settings/security/enable-2fa')}>{t(`${tk}.EnableButton`)}</Button>+ <div className="mb-3 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.twoFactor.disabledMessage')}</div>+ <Button color="success" onClick={() => navigate('/settings/security/enable-2fa')}>{t('settings.securitySettings.enable2fa.pageTitle')}</Button></>)}</SecuritySection>diff --git a/apps/web/src/components/shared/FormModal.tsx b/apps/web/src/components/shared/FormModal.tsxindex fd3900b5a..e39dc7013 100644--- a/apps/web/src/components/shared/FormModal.tsx+++ b/apps/web/src/components/shared/FormModal.tsx@@ -109,13 +109,13 @@ const FormModal: React.FC<FormModalProps> = ({<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>)}- {confirmText ?? t('sharedResources.Confirm')}+ {confirmText ?? t('common.confirm')}</button><buttontype="button"onClick={onClose}className="mt-3 inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:mt-0 sm:w-auto dark:bg-gray-700 dark:text-white dark:ring-gray-600 dark:hover:bg-gray-600">- {cancelText ?? t('sharedResources.Cancel')}+ {cancelText ?? t('common.cancel')}</button></div>)}diff --git a/apps/web/src/components/shared/PageHeader.tsx b/apps/web/src/components/shared/PageHeader.tsxindex ae1d22122..f53c1db5b 100644--- a/apps/web/src/components/shared/PageHeader.tsx+++ b/apps/web/src/components/shared/PageHeader.tsx@@ -18,7 +18,7 @@ type PageHeaderProps = {*/const PageHeader: React.FC<PageHeaderProps> = ({ breadcrumbItems = [], title, description = '', titleActions, titleSuffix, customActions }) => {const { t } = useTranslation();- const items: BreadcrumbItem[] = [{ displayName: t('sharedResources.Home'), url: '/', showHomeIcon: true }, ...breadcrumbItems];+ const items: BreadcrumbItem[] = [{ displayName: t('common.home'), url: '/', showHomeIcon: true }, ...breadcrumbItems];return (<div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900">diff --git a/apps/web/src/components/shared/PasswordConfirmationModal.tsx b/apps/web/src/components/shared/PasswordConfirmationModal.tsxindex d2ad259c1..9a86a8d82 100644--- a/apps/web/src/components/shared/PasswordConfirmationModal.tsx+++ b/apps/web/src/components/shared/PasswordConfirmationModal.tsx@@ -19,7 +19,7 @@ type PasswordConfirmationModalProps = {*/const PasswordConfirmationModal: React.FC<PasswordConfirmationModalProps> = ({ isOpen, title, description, errorMessage = '', onPasswordSubmitted, onClose }) => {const { t } = useTranslation();- const tk = 'components.main.shared.passwordConfirmationModal';+const [password, setPassword] = useState('');// Start empty every time the modal opens.@@ -53,8 +53,8 @@ const PasswordConfirmationModal: React.FC<PasswordConfirmationModalProps> = ({ iisOpen={isOpen}title={title}maxWidth="sm"- confirmText={t(`${tk}.ConfirmButton`)}- cancelText={t('sharedResources.Cancel')}+ confirmText={t('common.confirm')}+ cancelText={t('common.cancel')}confirmDisabled={password.length === 0}onConfirm={handleConfirm}onClose={handleClose}@@ -70,8 +70,8 @@ const PasswordConfirmationModal: React.FC<PasswordConfirmationModalProps> = ({ i{errorMessage.length > 0 && <AlertMessageError message={errorMessage} hasTopMargin={false} />}<div className="mt-4">- <label htmlFor="password-confirm" className="block text-sm font-medium text-gray-900 dark:text-white mb-2">{t('sharedResources.Password')}</label>- <PasswordInputField id="password-confirm" value={password} onValueChange={setPassword} placeholder={t(`${tk}.EnterPasswordPlaceholder`)} autoFocus={true} />+ <label htmlFor="password-confirm" className="block text-sm font-medium text-gray-900 dark:text-white mb-2">{t('common.password')}</label>+ <PasswordInputField id="password-confirm" value={password} onValueChange={setPassword} placeholder={t('auth.passwordPlaceholder')} autoFocus={true} /></div></FormModal>);diff --git a/apps/web/src/components/shared/PasswordStrengthIndicator.tsx b/apps/web/src/components/shared/PasswordStrengthIndicator.tsxindex fc21f6172..abf2d08f7 100644--- a/apps/web/src/components/shared/PasswordStrengthIndicator.tsx+++ b/apps/web/src/components/shared/PasswordStrengthIndicator.tsx@@ -2,7 +2,7 @@ import { getPasswordStrength } from '@aliasvault/client/utilities/PasswordStrengimport React from 'react';import { useTranslation } from 'react-i18next';-const LABEL_KEYS = ['StrengthVeryWeak', 'StrengthWeak', 'StrengthFair', 'StrengthGood', 'StrengthStrong'];+const LABEL_KEYS = ['veryWeak', 'weak', 'fair', 'good', 'strong'];const BAR_CLASSES = ['bg-orange-400 dark:bg-orange-500', 'bg-yellow-500 dark:bg-yellow-600', 'bg-green-500 dark:bg-green-600', 'bg-green-600 dark:bg-green-700', 'bg-green-700 dark:bg-green-800'];const TEXT_CLASSES = ['text-orange-600 dark:text-orange-400', 'text-yellow-600 dark:text-yellow-400', 'text-green-600 dark:text-green-400', 'text-green-700 dark:text-green-300', 'text-green-800 dark:text-green-200'];@@ -19,8 +19,8 @@ const PasswordStrengthIndicator: React.FC<{ password: string }> = ({ password })return (<div className="mt-3"><div className="flex items-center justify-between mb-2">- <span className="text-xs font-medium text-gray-700 dark:text-gray-300">{t('components.main.shared.passwordStrengthIndicator.PasswordStrength')}</span>- <span className={`text-xs font-semibold ${TEXT_CLASSES[strength]}`}>{t(`components.main.shared.passwordStrengthIndicator.${LABEL_KEYS[strength]}`)}</span>+ <span className="text-xs font-medium text-gray-700 dark:text-gray-300">{t('common.passwordStrength.title')}</span>+ <span className={`text-xs font-semibold ${TEXT_CLASSES[strength]}`}>{t(`common.passwordStrength.${LABEL_KEYS[strength]}`)}</span></div><div className="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-2.5 overflow-hidden shadow-inner"><div className={`h-2.5 rounded-full transition-all duration-500 ease-out ${BAR_CLASSES[strength]}`} style={{ width: `${(strength + 1) * 20}%` }}></div>diff --git a/apps/web/src/components/shared/ResponsivePaginator.tsx b/apps/web/src/components/shared/ResponsivePaginator.tsxindex a8c631cd6..7290ce016 100644--- a/apps/web/src/components/shared/ResponsivePaginator.tsx+++ b/apps/web/src/components/shared/ResponsivePaginator.tsx@@ -1,4 +1,5 @@import React from 'react';+import { useTranslation } from 'react-i18next';type ResponsivePaginatorProps = {currentPage: number;@@ -11,6 +12,7 @@ type ResponsivePaginatorProps = {* Paginator with numbered pages on desktop and prev/next on mobile.*/const ResponsivePaginator: React.FC<ResponsivePaginatorProps> = ({ currentPage, pageSize, totalRecords, onPageChanged }) => {+ const { t } = useTranslation();const pageCount = Math.ceil(totalRecords / pageSize);if (totalRecords <= pageSize) {@@ -30,12 +32,12 @@ const ResponsivePaginator: React.FC<ResponsivePaginatorProps> = ({ currentPage,return (<><div className="hidden md:block">- <nav aria-label="Page navigation" className="mt-4 flex justify-end mb-5">+ <nav aria-label={t('common.pageNavigation')} className="mt-4 flex justify-end mb-5"><ul className="flex space-x-2"><li className={currentPage === 1 ? 'opacity-50 cursor-not-allowed' : ''}><a className={pillClasses} href="#" onClick={(e) => {e.preventDefault(); setPage(currentPage - 1);- }}>Previous</a>+ }}>{t('common.previous')}</a></li>{pages.map(pageNum => (<li key={pageNum}>@@ -47,14 +49,14 @@ const ResponsivePaginator: React.FC<ResponsivePaginatorProps> = ({ currentPage,<li className={currentPage === pageCount ? 'opacity-50 cursor-not-allowed' : ''}><a className={pillClasses} href="#" onClick={(e) => {e.preventDefault(); setPage(currentPage + 1);- }}>Next</a>+ }}>{t('common.next')}</a></li></ul></nav></div><div className="block md:hidden">- <nav aria-label="Page navigation" className="mt-4 flex justify-center mb-5">+ <nav aria-label={t('common.pageNavigation')} className="mt-4 flex justify-center mb-5"><ul className="flex items-center space-x-2"><li className={currentPage === 1 ? 'opacity-50 cursor-not-allowed' : ''}><button onClick={() => setPage(currentPage - 1)} disabled={currentPage === 1} className={`${pillClasses} disabled:opacity-50 disabled:cursor-not-allowed`}>diff --git a/apps/web/src/components/totp/TotpCodes.tsx b/apps/web/src/components/totp/TotpCodes.tsxindex f300d2980..18b641c9a 100644--- a/apps/web/src/components/totp/TotpCodes.tsx+++ b/apps/web/src/components/totp/TotpCodes.tsx@@ -74,7 +74,6 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, canconst [editSecret, setEditSecret] = useState('');const [showQrCode, setShowQrCode] = useState(false);const [qrCodeDataUrl, setQrCodeDataUrl] = useState<string | null>(null);- const tk = 'components.main.components.totpCodes.totpCodes';/*** Show an empty add form.@@ -92,11 +91,11 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can*/const addTotpCode = (): void => {if (newSecret.trim().length === 0) {- setSecretError(t('validationMessages.SecretKeyRequired'));+ setSecretError(t('validation.secretKeyRequired'));return;}try {- const sanitized = sanitizeSecretKey(newSecret, newName, t('sharedResources.ErrorSecretKeyRequired'));+ const sanitized = sanitizeSecretKey(newSecret, newName, t('validation.secretKeyRequired'));const code: TotpCode = { Id: crypto.randomUUID(), Name: sanitized.name, SecretKey: sanitized.secretKey, Algorithm: sanitized.algorithm, Digits: sanitized.digits, Period: sanitized.period, ItemId: '' };onTotpCodesChange([...totpCodes, code]);setIsAddFormVisible(false);@@ -109,7 +108,7 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can* Delete a code after confirmation: original codes are soft deleted, new ones dropped.*/const deleteTotpCode = async (code: TotpCode): Promise<void> => {- const confirmed = await showConfirmation(t(`${tk}.DeleteTotpCodeTitle`), t(`${tk}.DeleteTotpCodeConfirmation`), t('sharedResources.Confirm'), t('sharedResources.Cancel'));+ const confirmed = await showConfirmation(t('totp.deleteCodeTitle'), t('totp.deleteCodeConfirmation'), t('common.confirm'), t('common.cancel'));if (!confirmed) {return;}@@ -168,18 +167,18 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can<Card variant="section" className="relative"><div className="flex justify-between items-start"><div>- <SectionTitle className="">{t(`${tk}.TwoFactorAuthenticationTitle`)}</SectionTitle>+ <SectionTitle className="">{t('common.twoFactorAuthentication')}</SectionTitle></div><div className="flex items-center gap-2">{visibleCodes.length > 0 && !isAddFormVisible && (- <button id="add-totp-code" onClick={showAddForm} type="button" className="text-primary-700 hover:text-white border border-primary-700 hover:bg-primary-800 focus:ring-2 focus:outline-none focus:ring-primary-300 font-medium rounded-lg text-xs w-8 h-8 flex items-center justify-center dark:border-primary-500 dark:text-primary-500 dark:hover:text-white dark:hover:bg-primary-600 dark:focus:ring-primary-800" title={t(`${tk}.AddTotpCodeDescription`)}>+ <button id="add-totp-code" onClick={showAddForm} type="button" className="text-primary-700 hover:text-white border border-primary-700 hover:bg-primary-800 focus:ring-2 focus:outline-none focus:ring-primary-300 font-medium rounded-lg text-xs w-8 h-8 flex items-center justify-center dark:border-primary-500 dark:text-primary-500 dark:hover:text-white dark:hover:bg-primary-600 dark:focus:ring-primary-800" title={t('totp.addTotpCodeDescription')}><svg className="w-4 h-4" fill="none" stroke="currentColor" strokeWidth="2.5" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" d="M12 4.5v15m7.5-7.5h-15" /></svg></button>)}{canRemove && (- <button type="button" onClick={onRemove} className="text-gray-400 hover:text-red-500 transition-colors w-6 h-6 flex items-center justify-center" title={t('sharedResources.Delete')}>+ <button type="button" onClick={onRemove} className="text-gray-400 hover:text-red-500 transition-colors w-6 h-6 flex items-center justify-center" title={t('common.delete')}><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12" /></svg>@@ -197,33 +196,33 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can}}}><div className="flex justify-between items-center mb-4">- <h4 className="text-lg font-medium text-gray-900 dark:text-white">{t(`${tk}.AddTotpCodeModalTitle`)}</h4>+ <h4 className="text-lg font-medium text-gray-900 dark:text-white">{t('totp.addTotpCodeModalTitle')}</h4>{visibleCodes.length > 0 && (<button onClick={() => setIsAddFormVisible(false)} type="button" className="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"><svg className="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 14"><path stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6" /></svg>- <span className="sr-only">{t(`${tk}.CloseFormButton`)}</span>+ <span className="sr-only">{t('totp.closeFormButton')}</span></button>)}</div>- <p className="mb-4 text-sm text-gray-500 dark:text-gray-400">{t(`${tk}.TotpInstructions`)}</p>+ <p className="mb-4 text-sm text-gray-500 dark:text-gray-400">{t('totp.totpInstructions')}</p><div className="mb-4">- <FormLabel htmlFor="totp-secret">{t(`${tk}.SecretKeyLabel`)}</FormLabel>+ <FormLabel htmlFor="totp-secret">{t('totp.secretKey')}</FormLabel><input id="totp-secret" type="text" value={newSecret} onChange={(e) => {setNewSecret(e.target.value);setSecretError('');- }} className={INPUT_CLASSES} placeholder={t(`${tk}.SecretKeyPlaceholder`)} />+ }} className={INPUT_CLASSES} placeholder={t('totp.secretKeyPlaceholder')} />{secretError.length > 0 && <div className="text-red-600 dark:text-red-400 text-sm mt-1">{secretError}</div>}</div>{showNameField ? (<div className="mb-4"><div className="flex items-center justify-between mb-2">- <label htmlFor="totp-name" className="text-sm font-medium text-gray-900 dark:text-white">{t(`${tk}.NameOptionalLabel`)}</label>+ <label htmlFor="totp-name" className="text-sm font-medium text-gray-900 dark:text-white">{t('totp.nameOptional')}</label><button id="remove-totp-name" type="button" onClick={() => {setNewName('');setShowNameField(false);- }} className="w-5 h-5 flex items-center justify-center text-gray-300 hover:text-red-400 dark:text-gray-500 dark:hover:text-red-400 transition-colors" title={t('sharedResources.Remove')}>+ }} className="w-5 h-5 flex items-center justify-center text-gray-300 hover:text-red-400 dark:text-gray-500 dark:hover:text-red-400 transition-colors" title={t('common.remove')}>{removeIcon}</button></div>@@ -232,12 +231,12 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can) : (<div className="mb-4"><button id="add-totp-name" type="button" onClick={() => setShowNameField(true)} className="text-sm font-medium text-primary-700 hover:text-primary-800 dark:text-primary-500 dark:hover:text-primary-400">- {t(`${tk}.AddNameButton`)}+ {t('totp.addName')}</button></div>)}<div className="flex justify-end">- <button id="save-totp-code" type="button" onClick={addTotpCode} className={SAVE_BUTTON_CLASSES}>{t(`${tk}.SaveButton`)}</button>+ <button id="save-totp-code" type="button" onClick={addTotpCode} className={SAVE_BUTTON_CLASSES}>{t('common.save')}</button></div></div></div>@@ -248,13 +247,13 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can<div key={code.Id} className="p-2 ps-3 pe-3 bg-gray-50 border border-gray-200 rounded-lg dark:bg-gray-700 dark:border-gray-600"><div className="flex justify-between items-center gap-2"><div className="flex items-center flex-1">- <h4 className="text-sm font-medium text-gray-900 dark:text-white">{code.Name.length > 0 ? code.Name : t('sharedResources.TotpDefaultName')}</h4>+ <h4 className="text-sm font-medium text-gray-900 dark:text-white">{code.Name.length > 0 ? code.Name : t('totp.defaultName')}</h4></div><div className="flex items-center gap-2"><div className="flex flex-col items-end">- <div className="text-sm text-gray-500 dark:text-gray-400">{t(`${tk}.SaveToViewCodeMessage`)}</div>+ <div className="text-sm text-gray-500 dark:text-gray-400">{t('totp.saveToViewCode')}</div></div>- <button type="button" onClick={() => showEditModal(code)} className="edit-totp-code text-gray-400 hover:text-gray-600 dark:hover:text-gray-300" title={t('sharedResources.Edit')}>+ <button type="button" onClick={() => showEditModal(code)} className="edit-totp-code text-gray-400 hover:text-gray-600 dark:hover:text-gray-300" title={t('common.edit')}><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path></svg>@@ -271,23 +270,23 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can</div></Card>- <FormModal isOpen={editingCode !== null} title={t('sharedResources.Edit')} showDefaultFooter={false} maxWidth="lg" onClose={() => setEditingCode(null)} submitOnEnter={false}>+ <FormModal isOpen={editingCode !== null} title={t('common.edit')} showDefaultFooter={false} maxWidth="lg" onClose={() => setEditingCode(null)} submitOnEnter={false}><div className="space-y-4">{editingCode && (<div className="space-y-3"><div><div className="flex items-center justify-between mb-2">- <label className="text-sm font-medium text-gray-900 dark:text-white">{t(`${tk}.SecretKeyLabel`)}</label>- <button type="button" onClick={() => setShowQrCode(v => !v)} className="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 p-1" title={`${showQrCode ? t('sharedResources.Hide') : t('sharedResources.Show')} QR Code`}>+ <label className="text-sm font-medium text-gray-900 dark:text-white">{t('totp.secretKey')}</label>+ <button type="button" onClick={() => setShowQrCode(v => !v)} className="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 p-1" title={`${showQrCode ? t('common.hide') : t('common.show')} QR Code`}><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 4v1m6 11h2m-6 0h-2v4m0-11v3m0 0h.01M12 12h4.01M16 20h4M4 12h4m12 0h.01M5 8h2a1 1 0 001-1V5a1 1 0 00-1-1H5a1 1 0 00-1 1v2a1 1 0 001 1zm12 0h2a1 1 0 001-1V5a1 1 0 00-1-1h-2a1 1 0 00-1 1v2a1 1 0 001 1zM5 20h2a1 1 0 001-1v-2a1 1 0 00-1-1H5a1 1 0 00-1 1v2a1 1 0 001 1z" /></svg></button></div>- <input type="text" value={editSecret} onChange={e => setEditSecret(e.target.value)} className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:text-white font-mono" placeholder={t(`${tk}.SecretKeyLabel`)} />+ <input type="text" value={editSecret} onChange={e => setEditSecret(e.target.value)} className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:text-white font-mono" placeholder={t('totp.secretKey')} />{showQrCode && qrCodeDataUrl && (<div className="flex justify-center mt-3">- <img src={qrCodeDataUrl} alt="QR code" className="w-64 h-64" />+ <img src={qrCodeDataUrl} alt={t('common.qrCode')} className="w-64 h-64" /></div>)}</div>@@ -295,23 +294,23 @@ const TotpCodes: React.FC<TotpCodesProps> = ({ totpCodes, onTotpCodesChange, can{showEditNameField ? (<div><div className="flex items-center justify-between mb-2">- <label className="text-sm font-medium text-gray-900 dark:text-white">{t(`${tk}.NameOptionalLabel`)}</label>+ <label className="text-sm font-medium text-gray-900 dark:text-white">{t('totp.nameOptional')}</label><button type="button" onClick={() => {setEditName('');setShowEditNameField(false);- }} className="w-5 h-5 flex items-center justify-center text-gray-300 hover:text-red-400 dark:text-gray-500 dark:hover:text-red-400 transition-colors" title={t('sharedResources.Remove')}>+ }} className="w-5 h-5 flex items-center justify-center text-gray-300 hover:text-red-400 dark:text-gray-500 dark:hover:text-red-400 transition-colors" title={t('common.remove')}>{removeIcon}</button></div>- <input type="text" value={editName} onChange={e => setEditName(e.target.value)} className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:text-white" placeholder={t(`${tk}.NameOptionalLabel`)} />+ <input type="text" value={editName} onChange={e => setEditName(e.target.value)} className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:text-white" placeholder={t('totp.nameOptional')} /></div>) : (<button type="button" onClick={() => setShowEditNameField(true)} className="text-sm font-medium text-primary-700 hover:text-primary-800 dark:text-primary-500 dark:hover:text-primary-400">- {t(`${tk}.AddNameButton`)}+ {t('totp.addName')}</button>)}- <button type="button" onClick={saveEditedTotpCode} className={`w-full ${SAVE_BUTTON_CLASSES}`}>{t('sharedResources.Save')}</button>+ <button type="button" onClick={saveEditedTotpCode} className={`w-full ${SAVE_BUTTON_CLASSES}`}>{t('common.save')}</button></div>)}</div>diff --git a/apps/web/src/components/totp/TotpViewer.tsx b/apps/web/src/components/totp/TotpViewer.tsxindex a31f4b4f1..384b5652b 100644--- a/apps/web/src/components/totp/TotpViewer.tsx+++ b/apps/web/src/components/totp/TotpViewer.tsx@@ -35,7 +35,7 @@ const TotpRow: React.FC<{ totpCode: TotpCode; item: ItemRef; tick: number }> = (<button type="button" onClick={() => void copyToClipboard(code)} className="group w-full text-left p-2 ps-3 pe-3 bg-gray-50 border border-gray-200 rounded-lg cursor-pointer hover:bg-gray-100 transition-colors dark:bg-gray-700 dark:border-gray-600 dark:hover:bg-gray-600"><div className="flex justify-between items-center gap-2"><div className="flex items-center flex-1">- <span className="text-sm font-medium text-gray-900 dark:text-white">{totpCode.Name.length > 0 ? totpCode.Name : t('sharedResources.TotpDefaultName')}</span>+ <span className="text-sm font-medium text-gray-900 dark:text-white">{totpCode.Name.length > 0 ? totpCode.Name : t('totp.defaultName')}</span></div><div className="flex items-center gap-2"><div className="flex flex-col items-end">@@ -44,7 +44,7 @@ const TotpRow: React.FC<{ totpCode: TotpCode; item: ItemRef; tick: number }> = (</div><div className="text-xs">{copied- ? <span className="text-green-600 dark:text-green-400">{t('components.main.components.totpCodes.totpViewer.CopiedMessage')}</span>+ ? <span className="text-green-600 dark:text-green-400">{t('common.copiedShort')}</span>: <span className="text-gray-500 dark:text-gray-400">{remaining}s</span>}</div></div>@@ -73,13 +73,13 @@ const TotpViewer: React.FC<TotpViewerProps> = ({ totpCodes, item }) => {<Card variant="section"><div className="flex justify-between"><div>- <SectionTitle>{t('components.main.components.totpCodes.totpViewer.TwoFactorAuthenticationTitle')}</SectionTitle>+ <SectionTitle>{t('common.twoFactorAuthentication')}</SectionTitle></div></div>{totpCodes.length === 0 ? (<div className="flex flex-col justify-center">- <p className="text-gray-500 dark:text-gray-400">{t('components.main.components.totpCodes.totpViewer.NoTotpCodesMessage')}</p>+ <p className="text-gray-500 dark:text-gray-400">{t('totp.viewer.noTotpCodesMessage')}</p></div>) : (<div className="grid grid-cols-1 gap-4 mt-4">diff --git a/apps/web/src/hooks/useEmailBody.ts b/apps/web/src/hooks/useEmailBody.tsindex e8e844b71..80338ad21 100644--- a/apps/web/src/hooks/useEmailBody.ts+++ b/apps/web/src/hooks/useEmailBody.ts@@ -40,7 +40,7 @@ export function useEmailBody(email: EmailViewModel | null, onBodyLoading?: (loadconst [viewMode, setViewMode] = useState<EmailViewMode>('html');const renderedEmailId = useRef<number | null>(null);const sequence = useRef(0);- const noBody = t('components.main.email.emailModal.NoEmailBody');+ const noBody = t('emails.modal.noEmailBody');/*** Render the body in a format.@@ -107,7 +107,7 @@ export function useEmailBody(email: EmailViewModel | null, onBodyLoading?: (load});}, [applyViewMode, availableModes, email, viewMode]);- const formatLabel = viewMode === 'html' ? t('sharedResources.EmailFormatHtml') : viewMode === 'plain' ? t('sharedResources.EmailFormatPlain') : t('sharedResources.EmailFormatSource');+ const formatLabel = viewMode === 'html' ? t('emails.formatHtml') : viewMode === 'plain' ? t('itemTypes.fieldTypes.text') : t('emails.formatSource');return { emailBody, viewMode, availableModes, formatLabel, cycleViewMode };}diff --git a/apps/web/src/hooks/useVaultMutate.ts b/apps/web/src/hooks/useVaultMutate.tsindex 7552f4496..aae6fb47b 100644--- a/apps/web/src/hooks/useVaultMutate.ts+++ b/apps/web/src/hooks/useVaultMutate.ts@@ -91,7 +91,7 @@ export function useVaultMutate(): {} catch (error) {console.error('[VaultMutate] Sync after mutation failed:', error);if (notifyFailure) {- notifications.addErrorMessage(t('sharedResources.VaultSaveError'), true);+ notifications.addErrorMessage(t('common.vaultSaveError'), true);}return false;}@@ -108,7 +108,7 @@ export function useVaultMutate(): {await auth.logout({ errorMessage: syncErrorMessage(result, t) });} else if (notifyFailure && (result.wasOffline || !hasSyncError(result))) {// A sync error with details already shows in the sync error dialog (see VaultStore.fullVaultSync).- notifications.addErrorMessage(t(result.wasOffline ? 'common.errors.serverNotAvailable' : 'sharedResources.VaultSaveError'), true);+ notifications.addErrorMessage(t(result.wasOffline ? 'common.errors.serverNotAvailable' : 'common.vaultSaveError'), true);}return false;}, [auth, dbContext, notifications, t]);diff --git a/apps/web/src/layouts/MainLayout.tsx b/apps/web/src/layouts/MainLayout.tsxindex c402803f0..2e5be3c84 100644--- a/apps/web/src/layouts/MainLayout.tsx+++ b/apps/web/src/layouts/MainLayout.tsx@@ -95,7 +95,7 @@ const MainLayout: React.FC = () => {</div><Footer />{syncError && (- <ConfirmModal title={t('sharedResources.Error')} message={syncError} confirmText={t('sharedResources.Close')} onClose={() => void clearSyncError()} />+ <ConfirmModal title={t('common.error')} message={syncError} confirmText={t('common.close')} onClose={() => void clearSyncError()} />)}</>);diff --git a/apps/web/src/pages/NotFound.tsx b/apps/web/src/pages/NotFound.tsxindex c5cc0fd79..055217007 100644--- a/apps/web/src/pages/NotFound.tsx+++ b/apps/web/src/pages/NotFound.tsx@@ -1,17 +1,21 @@import React from 'react';+import { useTranslation } from 'react-i18next';import Logo from '@/components/auth/Logo';/*** Fallback for unknown routes.*/-const NotFound: React.FC = () => (- <div className="flex flex-col items-center justify-center px-6 pt-8 pb-8 mx-auto md:h-screen pt:mt-0 relative">- <Logo />- <div className="w-full max-w-xl p-6 sm:p-8 bg-white rounded-lg shadow dark:bg-gray-800">- <p className="text-gray-500 dark:text-gray-400">Sorry, there's nothing at this address.</p>+const NotFound: React.FC = () => {+ const { t } = useTranslation();+ return (+ <div className="flex flex-col items-center justify-center px-6 pt-8 pb-8 mx-auto md:h-screen pt:mt-0 relative">+ <Logo />+ <div className="w-full max-w-xl p-6 sm:p-8 bg-white rounded-lg shadow dark:bg-gray-800">+ <p className="text-gray-500 dark:text-gray-400">{t('app.notFound.message')}</p>+ </div></div>- </div>-);+ );+};export default NotFound;diff --git a/apps/web/src/pages/Welcome.tsx b/apps/web/src/pages/Welcome.tsxindex 4c8ef9588..b3b567d9f 100644--- a/apps/web/src/pages/Welcome.tsx+++ b/apps/web/src/pages/Welcome.tsx@@ -37,8 +37,8 @@ const Welcome: React.FC = () => {const dbContext = useDb();const { showLoading, hideLoading } = useLoading();const { executeVaultMutationInBackground } = useVaultMutate();- const tk = 'pages.main.welcome';- usePageTitle(t(`${tk}.TutorialStepTitle`));++ usePageTitle(t('web.welcome.tutorialStepTitle'));const [step, setStep] = useState<TutorialStep>('welcome');const stepIndex = STEPS.indexOf(step);@@ -55,10 +55,10 @@ const Welcome: React.FC = () => {*/const stepTitle = (): string => {switch (step) {- case 'welcome': return t(`${tk}.WelcomeStepTitle`);- case 'howAliasVaultWorks': return t(`${tk}.HowAliasVaultWorksStepTitle`);- case 'tips': return t(`${tk}.TipsStepTitle`);- default: return t(`${tk}.GetStartedStepTitle`);+ case 'welcome': return t('items.welcomeTitle');+ case 'howAliasVaultWorks': return t('web.welcome.howAliasVaultWorksStepTitle');+ case 'tips': return t('web.welcome.tipsStepTitle');+ default: return t('web.welcome.getStartedButton');}};@@ -78,7 +78,7 @@ const Welcome: React.FC = () => {if (!client) {return;}- showLoading(t(`${tk}.FinishingTutorialMessage`));+ showLoading(t('web.welcome.finishingTutorialMessage'));try {await executeVaultMutationInBackground(async () => {client.settings.updateSetting('TutorialDone', 'True');@@ -114,19 +114,19 @@ const Welcome: React.FC = () => {<svg className="w-5 h-5 mt-0.5 flex-shrink-0 text-green-600 dark:text-green-400" fill="currentColor" viewBox="0 0 20 20" aria-hidden="true"><path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" /></svg>- <span>{t(`${tk}.WelcomeMessage`)}</span>+ <span>{t('web.welcome.welcomeMessage')}</span></p></div>)}{step === 'howAliasVaultWorks' && (<div className="space-y-4">- <p className="text-gray-600 dark:text-gray-400">{t(`${tk}.HowItWorksIntro`)}</p>+ <p className="text-gray-600 dark:text-gray-400">{t('web.welcome.howItWorksIntro')}</p><ol className="list-decimal list-inside space-y-2 text-gray-600 dark:text-gray-400">- <li>{t(`${tk}.HowItWorksStep1`)}</li>- <li>{t(`${tk}.HowItWorksStep2`)}</li>- <li>{t(`${tk}.HowItWorksStep3`)}</li>- <li>{t(`${tk}.HowItWorksStep4`)}</li>+ <li>{t('web.welcome.howItWorksStep1')}</li>+ <li>{t('web.welcome.howItWorksStep2')}</li>+ <li>{t('web.welcome.howItWorksStep3')}</li>+ <li>{t('web.welcome.howItWorksStep4')}</li></ol></div>)}@@ -135,19 +135,19 @@ const Welcome: React.FC = () => {<div className="space-y-4"><div className="space-y-3"><div className="p-4 bg-gray-50 dark:bg-gray-700 rounded-lg">- <h4 className="font-semibold text-gray-900 dark:text-white">{t(`${tk}.MasterPasswordTipTitle`)}</h4>- <p className="text-gray-600 dark:text-gray-400">{t(`${tk}.MasterPasswordTipContent`)}</p>+ <h4 className="font-semibold text-gray-900 dark:text-white">{t('web.welcome.masterPasswordTipTitle')}</h4>+ <p className="text-gray-600 dark:text-gray-400">{t('web.welcome.masterPasswordTipContent')}</p></div><div className="p-4 bg-gray-50 dark:bg-gray-700 rounded-lg">- <h4 className="font-semibold text-gray-900 dark:text-white">{t(`${tk}.TwoFactorTipTitle`)}</h4>- <p className="text-gray-600 dark:text-gray-400">{t(`${tk}.TwoFactorTipContent`)}</p>+ <h4 className="font-semibold text-gray-900 dark:text-white">{t('web.welcome.twoFactorTipTitle')}</h4>+ <p className="text-gray-600 dark:text-gray-400">{t('web.welcome.twoFactorTipContent')}</p></div><div className="p-4 bg-gray-50 dark:bg-gray-700 rounded-lg">- <h4 className="font-semibold text-gray-900 dark:text-white">{t(`${tk}.ExtensionsAppsTipTitle`)}</h4>- <p className="text-gray-600 dark:text-gray-400 mb-4">{t(`${tk}.ExtensionsAppsTipContent`)}</p>+ <h4 className="font-semibold text-gray-900 dark:text-white">{t('web.welcome.extensionsAppsTipTitle')}</h4>+ <p className="text-gray-600 dark:text-gray-400 mb-4">{t('web.welcome.extensionsAppsTipContent')}</p><div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-5 gap-3">- {BROWSER_EXTENSIONS.map(app => <AppTile key={app.name} app={app} unavailableLabel={t(`${tk}.ComingSoonLabel`)} />)}- {MOBILE_APPS.map(app => <AppTile key={app.name} app={app} unavailableLabel={`${app.name} ${t(`${tk}.SoonSuffix`)}`} />)}+ {BROWSER_EXTENSIONS.map(app => <AppTile key={app.name} app={app} unavailableLabel={t('settings.apps.comingSoonText')} />)}+ {MOBILE_APPS.map(app => <AppTile key={app.name} app={app} unavailableLabel={`${app.name} ${t('web.welcome.soonSuffix')}`} />)}</div></div></div>@@ -156,11 +156,11 @@ const Welcome: React.FC = () => {{step === 'createFirstIdentity' && (<div className="space-y-4">- <h3 className="text-2xl font-bold text-gray-900 dark:text-white">{t(`${tk}.ReadyToStartTitle`)}</h3>- <p className="text-gray-600 dark:text-gray-400">{t(`${tk}.ReadyToStartMessage`)}</p>+ <h3 className="text-2xl font-bold text-gray-900 dark:text-white">{t('web.welcome.readyToStartTitle')}</h3>+ <p className="text-gray-600 dark:text-gray-400">{t('web.welcome.readyToStartMessage')}</p><div className="mt-4"><button type="button" onClick={() => navigate('/items/create')} className="w-full bg-primary-600 hover:bg-primary-700 text-white font-semibold py-3 px-4 rounded-lg transition duration-300">- {t(`${tk}.CreateFirstIdentityButton`)}+ {t('web.welcome.createFirstIdentityButton')}</button></div></div>@@ -170,11 +170,11 @@ const Welcome: React.FC = () => {<div className="fixed lg:relative bottom-0 left-0 right-0 p-4 bg-gray-100 dark:bg-gray-900 border-t border-gray-200 dark:border-gray-700 lg:bg-transparent lg:dark:bg-transparent lg:border-0">{step !== 'tips' ? (<button type="button" onClick={goNext} className="w-full py-3 px-4 bg-primary-600 hover:bg-primary-700 text-white font-semibold rounded-lg transition duration-300">- <ButtonLabel arrow="forward">{t(`${tk}.ContinueButton`)}</ButtonLabel>+ <ButtonLabel arrow="forward">{t('common.continue')}</ButtonLabel></button>) : (<button type="button" onClick={() => void finishTutorial()} className="w-full py-3 px-4 bg-green-600 hover:bg-green-700 text-white font-semibold rounded-lg transition duration-300">- {t(`${tk}.GetStartedButton`)}+ {t('web.welcome.getStartedButton')}</button>)}</div>diff --git a/apps/web/src/pages/auth/ForgotPassword.tsx b/apps/web/src/pages/auth/ForgotPassword.tsxindex 281707861..b9abf5128 100644--- a/apps/web/src/pages/auth/ForgotPassword.tsx+++ b/apps/web/src/pages/auth/ForgotPassword.tsx@@ -12,22 +12,22 @@ const EMAIL_MARKER = '%%EMAIL%%';*/const ForgotPassword: React.FC = () => {const { t } = useTranslation();- const tk = 'pages.auth.forgotPassword';- usePageTitle(t(`${tk}.LostPasswordTitle`));++ usePageTitle(t('auth.forgotPassword.lostPasswordTitle'));const supportEmail = getAppConfig().supportEmail;- const [before, after] = t(`${tk}.ContactSupportWithEmail`, { 0: EMAIL_MARKER }).split(EMAIL_MARKER);+ const [before, after] = t('auth.forgotPassword.contactSupportWithEmail', { email: EMAIL_MARKER }).split(EMAIL_MARKER);return (<>- <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-2">{t(`${tk}.LostPasswordTitle`)}</h2>+ <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-2">{t('auth.forgotPassword.lostPasswordTitle')}</h2><div className="text-sm space-y-4 text-gray-500 dark:text-gray-400">- <p>{t(`${tk}.NoRecoveryExplanation`)}</p>- <p>{t(`${tk}.NewAccountRequired`)}</p>+ <p>{t('auth.forgotPassword.noRecoveryExplanation')}</p>+ <p>{t('auth.forgotPassword.newAccountRequired')}</p><div>- <h3 className="font-medium mb-2 text-gray-900 dark:text-white">{t(`${tk}.RecentlyChangedPasswordTitle`)}</h3>+ <h3 className="font-medium mb-2 text-gray-900 dark:text-white">{t('auth.forgotPassword.recentlyChangedPasswordTitle')}</h3>{supportEmail.length > 0? <p>{before}<a href={`mailto:${supportEmail}`} className="text-primary-600 hover:underline dark:text-primary-400">{supportEmail}</a>{after ?? ''}</p>- : <p>{t(`${tk}.ContactAdministrator`)}</p>}+ : <p>{t('auth.forgotPassword.contactAdministrator')}</p>}</div></div></>diff --git a/apps/web/src/pages/auth/Login.tsx b/apps/web/src/pages/auth/Login.tsxindex 01f7a61cd..d80355e22 100644--- a/apps/web/src/pages/auth/Login.tsx+++ b/apps/web/src/pages/auth/Login.tsx@@ -46,7 +46,7 @@ const Login: React.FC = () => {const notifications = useNotifications();const { showLoading, hideLoading } = useLoading();const srpUtil = useMemo(() => new SrpLoginService(webApi), [webApi]);- usePageTitle(t('components.auth.login.PageTitle'));+ usePageTitle(t('auth.loginTitle'));const [step, setStep] = useState<LoginStep>('credentials');const [username, setUsername] = useState('');@@ -110,7 +110,7 @@ const Login: React.FC = () => {return [t('common.errors.serverVersionNotSupported')];}if (apiErrorCodeOf(err)) {- return [apiErrorMessage(err, t, t('components.auth.login.LoginErrorMessage'))];+ return [apiErrorMessage(err, t, t('auth.loginForm.loginErrorMessage'))];}const codedError = translateCodedError(err, t);if (codedError) {@@ -119,7 +119,7 @@ const Login: React.FC = () => {if (import.meta.env.DEV && err instanceof Error) {return [err.message];}- return [t('components.auth.login.LoginErrorMessage')];+ return [t('auth.loginForm.loginErrorMessage')];};/**@@ -153,7 +153,7 @@ const Login: React.FC = () => {*/const processLoginVerify = async (validateLoginResponse: ValidateLoginResponse, hashBase64: string, response: LoginResponse): Promise<void> => {if (!validateLoginResponse.token) {- throw new Error(t('components.auth.login.LoginRequestErrorMessage'));+ throw new Error(t('auth.loginForm.loginRequestErrorMessage'));}const params = { salt: response.salt, encryptionType: response.encryptionType, encryptionSettings: response.encryptionSettings };await completeLogin(username, validateLoginResponse.token.token, validateLoginResponse.token.refreshToken, hashBase64, params);@@ -163,7 +163,7 @@ const Login: React.FC = () => {* Finish a login the mobile app approved: the mobile app sends the unlock key.*/const handleMobileLoginSuccess = async (result: MobileLoginResult): Promise<void> => {- showLoading(t('components.auth.login.LoggingInMessage'));+ showLoading(t('auth.loggingIn'));setErrors([]);setShowMobileLoginModal(false);@@ -182,7 +182,7 @@ const Login: React.FC = () => {*/const handleLogin = async (e: React.FormEvent): Promise<void> => {e.preventDefault();- showLoading(t('components.auth.login.LoggingInMessage'));+ showLoading(t('auth.loggingIn'));setErrors([]);try {@@ -215,12 +215,12 @@ const Login: React.FC = () => {*/const handle2Fa = async (e: React.FormEvent): Promise<void> => {e.preventDefault();- showLoading(t('components.auth.login.VerifyingTwoFactorCodeMessage'));+ showLoading(t('auth.loginForm.verifyingTwoFactorCodeMessage'));setErrors([]);try {if (!loginResponse || !passwordHashString || !passwordHashBase64) {- throw new Error(t('components.auth.login.LoginRequestErrorMessage'));+ throw new Error(t('auth.loginForm.loginRequestErrorMessage'));}const code = twoFactorCode.trim();if (!/^\d{6}$/.test(code)) {@@ -240,12 +240,12 @@ const Login: React.FC = () => {*/const handleRecoveryCode = async (e: React.FormEvent): Promise<void> => {e.preventDefault();- showLoading(t('components.auth.login.VerifyingRecoveryCodeMessage'));+ showLoading(t('auth.loginForm.verifyingRecoveryCodeMessage'));setErrors([]);try {if (!loginResponse || !passwordHashString || !passwordHashBase64) {- throw new Error(t('components.auth.login.LoginRequestErrorMessage'));+ throw new Error(t('auth.loginForm.loginRequestErrorMessage'));}const validateLoginResponse = await srpUtil.validateLoginRecoveryCode(username, passwordHashString, rememberMe, loginResponse, recoveryCode.trim());await processLoginVerify(validateLoginResponse, passwordHashBase64, loginResponse);@@ -276,16 +276,16 @@ const Login: React.FC = () => {return (<><h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">- {t('components.auth.login.TwoFactorAuthenticationTitle')}+ {t('common.twoFactorAuthentication')}</h2><ServerValidationErrors errors={errors} className="mb-4" />- <p className="text-gray-700 dark:text-gray-300 mb-6">{t('components.auth.login.TwoFactorAuthenticationDescription')}</p>+ <p className="text-gray-700 dark:text-gray-300 mb-6">{t('auth.loginForm.twoFactorAuthenticationDescription')}</p><div className="w-full"><form onSubmit={handle2Fa} className="space-y-6" av-enable="true" av-suppress-save="true"><div>- <FormLabel htmlFor="two-factor-code">{t('components.auth.login.AuthenticatorCodeLabel')}</FormLabel>+ <FormLabel htmlFor="two-factor-code">{t('auth.loginForm.authenticatorCodeLabel')}</FormLabel><input ref={twoFactorRef} id="two-factor-code" type="number" value={twoFactorCode} onChange={(e) => setTwoFactorCode(e.target.value)} className={inputClass} autoComplete="one-time-code" /></div><div className="flex items-start">@@ -293,19 +293,19 @@ const Login: React.FC = () => {<input id="remember-machine" type="checkbox" checked={rememberMachine} onChange={(e) => setRememberMachine(e.target.checked)} className="w-4 h-4 border border-gray-300 rounded bg-gray-50 focus:ring-3 focus:ring-primary-300 dark:bg-gray-700 dark:border-gray-600 dark:focus:ring-primary-600 dark:ring-offset-gray-800" /></div><div className="ml-3 text-sm">- <label htmlFor="remember-machine" className="font-medium text-gray-900 dark:text-white">{t('components.auth.login.RememberMachineLabel')}</label>+ <label htmlFor="remember-machine" className="font-medium text-gray-900 dark:text-white">{t('auth.loginForm.rememberMachineLabel')}</label></div></div>- <button type="submit" className={submitClass}>{t('components.auth.login.LoginButton')}</button>+ <button type="submit" className={submitClass}>{t('auth.login')}</button></form></div><p className="mt-6 text-sm text-gray-700 dark:text-gray-300">- {t('components.auth.login.DontHaveAuthenticatorText')}+ {t('auth.loginForm.dontHaveAuthenticatorText')}</p><p className="text-sm text-gray-700 dark:text-gray-300"><button onClick={() => {setErrors([]); setStep('recovery-code');- }} className="text-primary-600 hover:underline dark:text-primary-500">{t('components.auth.login.LoginWithRecoveryCodeLink')}</button>+ }} className="text-primary-600 hover:underline dark:text-primary-500">{t('auth.loginForm.loginWithRecoveryCodeLink')}</button></p><FooterLogin /></>@@ -316,30 +316,30 @@ const Login: React.FC = () => {return (<><h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-4">- {t('components.auth.login.RecoveryCodeVerificationTitle')}+ {t('auth.loginForm.recoveryCodeVerificationTitle')}</h2><ServerValidationErrors errors={errors} className="mb-4" /><p className="text-gray-700 dark:text-gray-300 mb-6">- {t('components.auth.login.RecoveryCodeDescription')}+ {t('auth.loginForm.recoveryCodeDescription')}</p><div className="w-full"><form onSubmit={handleRecoveryCode} className="space-y-6"><div>- <FormLabel htmlFor="recovery-code">{t('components.auth.login.RecoveryCodeLabel')}</FormLabel>+ <FormLabel htmlFor="recovery-code">{t('auth.loginForm.recoveryCodeLabel')}</FormLabel><input id="recovery-code" type="text" value={recoveryCode} onChange={(e) => setRecoveryCode(e.target.value)} className={inputClass} autoComplete="off" /></div>- <button type="submit" className={submitClass}>{t('components.auth.login.LoginButton')}</button>+ <button type="submit" className={submitClass}>{t('auth.login')}</button></form></div><p className="mt-6 text-sm text-gray-700 dark:text-gray-300">- {t('components.auth.login.RegainedAccessText')}+ {t('auth.loginForm.regainedAccessText')}</p><p className="text-sm text-gray-700 dark:text-gray-300"><button onClick={() => {setErrors([]); setStep('two-factor');- }} className="text-primary-600 hover:underline dark:text-primary-500">{t('components.auth.login.LoginWithAuthenticatorLink')}</button>+ }} className="text-primary-600 hover:underline dark:text-primary-500">{t('auth.loginForm.loginWithAuthenticatorLink')}</button></p><FooterLogin /></>@@ -349,18 +349,18 @@ const Login: React.FC = () => {return (<><h2 className="text-2xl font-bold text-gray-900 dark:text-white">- {t('components.auth.login.PageTitle')}+ {t('auth.loginTitle')}</h2><form onSubmit={handleLogin} className="mt-4 space-y-6" av-enable="true" av-suppress-save="true"><ServerValidationErrors errors={errors} /><div>- <FormLabel htmlFor="email">{t('components.auth.login.UsernameOrEmailLabel')}</FormLabel>- <InputTextField ref={usernameRef} id="email" value={username} onValueChange={setUsername} type="text" placeholder={t('components.auth.login.UsernamePlaceholder')} autoCapitalize="off" autoCorrect="off" required />+ <FormLabel htmlFor="email">{t('auth.register.usernameOrEmailLabel')}</FormLabel>+ <InputTextField ref={usernameRef} id="email" value={username} onValueChange={setUsername} type="text" placeholder={t('auth.usernamePlaceholder')} autoCapitalize="off" autoCorrect="off" required /></div><div>- <FormLabel htmlFor="password">{t('components.auth.login.PasswordLabel')}</FormLabel>- <PasswordInputField id="password" value={password} onValueChange={setPassword} placeholder={t('components.auth.login.PasswordPlaceholder')} />+ <FormLabel htmlFor="password">{t('auth.register.passwordLabel')}</FormLabel>+ <PasswordInputField id="password" value={password} onValueChange={setPassword} placeholder={t('auth.register.passwordPlaceholder')} /></div><div className="flex items-start">@@ -368,26 +368,26 @@ const Login: React.FC = () => {<input id="remember" type="checkbox" checked={rememberMe} onChange={(e) => setRememberMe(e.target.checked)} className="w-4 h-4 border-gray-300 rounded bg-gray-50 focus:ring-3 focus:ring-primary-300 dark:focus:ring-primary-600 dark:ring-offset-gray-800 dark:bg-gray-700 dark:border-gray-600" /></div><div className="ml-3 text-sm">- <label htmlFor="remember" className="font-medium text-gray-900 dark:text-white">{t('components.auth.login.RememberMeLabel')}</label>+ <label htmlFor="remember" className="font-medium text-gray-900 dark:text-white">{t('auth.rememberMe')}</label></div>- <Link to="/user/forgot-password" className="ml-auto text-sm text-primary-700 hover:underline dark:text-primary-500">{t('components.auth.login.LostPasswordLink')}</Link>+ <Link to="/user/forgot-password" className="ml-auto text-sm text-primary-700 hover:underline dark:text-primary-500">{t('auth.loginForm.lostPasswordLink')}</Link></div><div className="flex flex-col gap-4"><button type="submit" id="login-button" className="w-full px-5 py-2 text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800 flex items-center justify-center gap-2">- {t('components.auth.login.LoginButton')}+ {t('auth.login')}</button><button type="button" id="mobile-login-button" onClick={() => setShowMobileLoginModal(true)} className="hidden md:flex w-full px-5 py-2 text-base font-medium text-center text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-100 focus:ring-4 focus:ring-gray-200 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:ring-gray-700 items-center justify-center gap-2"><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 18h.01M8 21h8a2 2 0 002-2V5a2 2 0 00-2-2H8a2 2 0 00-2 2v14a2 2 0 002 2z"></path></svg>- {t('components.auth.login.MobileDeviceLink')}+ {t('auth.loginWithMobile')}</button></div>{getAppConfig().publicRegistrationEnabled && (<div className="text-sm font-medium text-gray-500 dark:text-gray-400 text-center">- {t('components.auth.login.NoAccountYetText')} <Link to="/user/setup" className="text-primary-700 hover:underline dark:text-primary-500">{t('components.auth.login.CreateNewVaultLink')}</Link>+ {t('auth.noAccountYet')} <Link to="/user/setup" className="text-primary-700 hover:underline dark:text-primary-500">{t('auth.createNewVault')}</Link></div>)}</form>diff --git a/apps/web/src/pages/auth/Logout.tsx b/apps/web/src/pages/auth/Logout.tsxindex 8cb99690b..8e0b527d7 100644--- a/apps/web/src/pages/auth/Logout.tsx+++ b/apps/web/src/pages/auth/Logout.tsx@@ -18,7 +18,7 @@ const Logout: React.FC = () => {const auth = useAuth();const notifications = useNotifications();const hasStarted = useRef(false);- usePageTitle(t('pages.auth.logout.LoggingOutTitle'));+ usePageTitle(t('logout.loggingOutTitle'));useEffect(() => {if (hasStarted.current) {@@ -45,9 +45,9 @@ const Logout: React.FC = () => {<div className="text-center"><div className="space-y-4"><BoldLoadingIndicator />- <h2 className="text-xl font-semibold text-gray-900 dark:text-white">{t('pages.auth.logout.LoggingOutTitle')}</h2>+ <h2 className="text-xl font-semibold text-gray-900 dark:text-white">{t('logout.loggingOutTitle')}</h2><p className="text-sm text-gray-500 dark:text-gray-400">- {t('pages.auth.logout.LoggingOutDescription')}+ {t('logout.loggingOutDescription')}</p></div></div>diff --git a/apps/web/src/pages/auth/Setup.tsx b/apps/web/src/pages/auth/Setup.tsxindex 8f248f1ca..9da6a0991 100644--- a/apps/web/src/pages/auth/Setup.tsx+++ b/apps/web/src/pages/auth/Setup.tsx@@ -18,8 +18,8 @@ type SetupStep = typeof STEPS[number];const Setup: React.FC = () => {const { t } = useTranslation();const navigate = useNavigate();- const tk = 'pages.auth.setup.setup';- usePageTitle(t(`${tk}.SetupStepTitle`));++ usePageTitle(t('auth.setup.setupStepTitle'));const [step, setStep] = useState<SetupStep>('terms');const [agreedToTerms, setAgreedToTerms] = useState(false);@@ -41,10 +41,10 @@ const Setup: React.FC = () => {*/const stepTitle = (): string => {switch (step) {- case 'terms': return t(`${tk}.TermsAndConditionsStepTitle`);- case 'username': return t(`${tk}.UsernameStepTitle`);- case 'password': return t(`${tk}.PasswordStepTitle`);- default: return t(`${tk}.CreatingStepTitle`);+ case 'terms': return t('auth.setup.termsAndConditionsStepTitle');+ case 'username': return t('auth.setup.usernameStepTitle');+ case 'password': return t('auth.setup.passwordStepTitle');+ default: return t('auth.setup.creatingStepTitle');}};@@ -115,11 +115,11 @@ const Setup: React.FC = () => {<div className="fixed lg:relative bottom-0 left-0 right-0 p-4 bg-gray-100 dark:bg-gray-900 border-t border-gray-200 dark:border-gray-700 lg:bg-transparent lg:dark:bg-transparent lg:border-0">{step === 'password' && password.trim().length > 0 ? (<button type="button" onClick={goNext} className="w-full py-3 px-4 bg-green-600 hover:bg-green-700 text-white font-semibold rounded-lg transition duration-300 ease-in-out">- {t(`${tk}.CreateAccountButton`)}+ {t('auth.setup.createAccountButton')}</button>) : step !== 'creating' && (<button type="button" onClick={goNext} disabled={!isNextEnabled} className={`w-full py-3 px-4 bg-primary-600 hover:bg-primary-700 text-white font-semibold rounded-lg transition duration-300 ease-in-out ${isNextEnabled ? '' : 'opacity-50 cursor-not-allowed'}`}>- <ButtonLabel arrow="forward">{t(`${tk}.ContinueButton`)}</ButtonLabel>+ <ButtonLabel arrow="forward">{t('common.continue')}</ButtonLabel></button>)}</div>diff --git a/apps/web/src/pages/auth/Start.tsx b/apps/web/src/pages/auth/Start.tsxindex fcaa4a123..166324930 100644--- a/apps/web/src/pages/auth/Start.tsx+++ b/apps/web/src/pages/auth/Start.tsx@@ -55,24 +55,24 @@ const Start: React.FC = () => {<div className="w-full max-w-xl space-y-4"><Logo /><h2 className="text-3xl font-semibold text-gray-800 dark:text-gray-200 mb-6">- {t('pages.auth.start.MainTitle')}+ {t('auth.start.mainTitle')}</h2><p className="text-lg text-gray-600 dark:text-gray-300 mb-8">- {t('pages.auth.start.TaglineText')}+ {t('auth.start.taglineText')}</p>{isHttpWarning && (- <MessageInfo title={t('pages.auth.start.HttpsWarningTitle')}>- {t('pages.auth.start.HttpsWarningMessage')}+ <MessageInfo title={t('auth.start.httpsWarningTitle')}>+ {t('auth.start.httpsWarningMessage')}</MessageInfo>)}<div className="space-y-4">{getAppConfig().publicRegistrationEnabled && (<Link to="/user/setup" className="block w-full py-3 px-4 bg-primary-600 hover:bg-primary-700 text-white font-semibold rounded-lg transition duration-300 ease-in-out text-center">- {t('pages.auth.start.CreateNewVaultButton')}+ {t('auth.createNewVault')}</Link>)}<Link to="/user/login" className="block w-full py-3 px-4 bg-gray-200 hover:bg-gray-300 dark:bg-gray-700 dark:hover:bg-gray-800 text-gray-800 dark:text-white font-semibold rounded-lg transition duration-300 ease-in-out text-center">- {t('pages.auth.start.LoginExistingAccountButton')}+ {t('auth.start.loginExistingAccountButton')}</Link></div></div>diff --git a/apps/web/src/pages/auth/Unlock.tsx b/apps/web/src/pages/auth/Unlock.tsxindex 859e8659d..a9070ddbd 100644--- a/apps/web/src/pages/auth/Unlock.tsx+++ b/apps/web/src/pages/auth/Unlock.tsx@@ -39,7 +39,7 @@ const Unlock: React.FC = () => {const notifications = useNotifications();const { showLoading, hideLoading } = useLoading();const srpUtil = useMemo(() => new SrpLoginService(webApi), [webApi]);- usePageTitle(t('pages.auth.unlock.UnlockButton'));+ usePageTitle(t('auth.unlockPage.unlockButton'));const { skipWebAuthn } = useParams<{ skipWebAuthn?: string }>();const [isLoading, setIsLoading] = useState(true);@@ -66,7 +66,7 @@ const Unlock: React.FC = () => {navigate('/sync', { replace: true });} catch (err) {if (err instanceof WebAuthnNotSupportedError) {- notifications.addErrorMessage(t('pages.auth.unlock.WebAuthnNotSupportedError'), true);+ notifications.addErrorMessage(t('auth.unlockPage.webAuthnNotSupportedError'), true);} else if (!(err instanceof DOMException && err.name === 'NotAllowedError')) {console.error('An error occurred while trying to unlock the vault with WebAuthn.', err);}@@ -88,7 +88,7 @@ const Unlock: React.FC = () => {*/const statusCheck = async (): Promise<void> => {if (!auth.isLoggedIn) {- notifications.addErrorMessage(t('pages.auth.unlock.SessionTimedOutError'));+ notifications.addErrorMessage(t('auth.unlockPage.sessionTimedOutError'));navigate('/user/login', { replace: true });return;}@@ -110,7 +110,7 @@ const Unlock: React.FC = () => {await auth.logout({ errorMessage: t('common.errors.clientVersionNotSupported') });return;}- setErrors([t('pages.auth.unlock.ConnectionFailedError')]);+ setErrors([t('auth.unlockPage.connectionFailedError')]);}setIsLoading(false);@@ -146,7 +146,7 @@ const Unlock: React.FC = () => {if (!username) {return;}- showLoading(t('pages.auth.unlock.UnlockingVaultMessage'));+ showLoading(t('app.status.unlockingVault'));setErrors([]);try {@@ -154,7 +154,7 @@ const Unlock: React.FC = () => {if (dbContext.getIsOffline()) {const params = await MasterPasswordService.getStoredDerivationParams();if (!params) {- throw new Error(t('pages.auth.unlock.ConnectionFailedError'));+ throw new Error(t('auth.unlockPage.connectionFailedError'));}const prepared = await SrpAuthService.prepareCredentials(password, params.salt, params.encryptionSettings);unlockKey = prepared.passwordHashBase64;@@ -175,14 +175,14 @@ const Unlock: React.FC = () => {console.error('Unlock error:', err);const code = err instanceof Error ? extractErrorCode(err.message) : null;if (await VaultKeyService.isWrongUnlockKey(code)) {- setErrors([t('pages.auth.unlock.IncorrectPasswordError')]);+ setErrors([t('auth.unlockPage.incorrectPasswordError')]);} else if (code) {// A coded failure keeps its code, so the user can report it.- setErrors([translateCodedError(err, t) ?? t('pages.auth.unlock.GenericUnlockError')]);+ setErrors([translateCodedError(err, t) ?? t('auth.loginForm.loginErrorMessage')]);} else if (import.meta.env.DEV && err instanceof Error) {setErrors([err.message]);} else {- setErrors([t('pages.auth.unlock.GenericUnlockError')]);+ setErrors([t('auth.loginForm.loginErrorMessage')]);}} finally {hideLoading();@@ -193,7 +193,7 @@ const Unlock: React.FC = () => {* Replace the session with the one the mobile app approved and open the vault with the unlock key it sent.*/const handleMobileUnlockSuccess = async (result: MobileLoginResult): Promise<void> => {- showLoading(t('pages.auth.unlock.UnlockingVaultMessage'));+ showLoading(t('app.status.unlockingVault'));setErrors([]);setShowMobileUnlockModal(false);@@ -224,7 +224,7 @@ const Unlock: React.FC = () => {} else if (import.meta.env.DEV && err instanceof Error) {setErrors([err.message]);} else {- setErrors([t('pages.auth.unlock.GenericUnlockError')]);+ setErrors([t('auth.loginForm.loginErrorMessage')]);}} finally {hideLoading();@@ -245,7 +245,7 @@ const Unlock: React.FC = () => {<><ServerValidationErrors errors={errors} /><BoldLoadingIndicator />- <p className="mt-6 text-center font-normal text-gray-500 dark:text-gray-400">{t('pages.auth.unlock.LoggingInWithWebAuthn')}</p>+ <p className="mt-6 text-center font-normal text-gray-500 dark:text-gray-400">{t('auth.unlockPage.loggingInWithWebAuthn')}</p></>);}@@ -253,7 +253,7 @@ const Unlock: React.FC = () => {// A coded error is critical: it replaces the form.const criticalError = errors.find(error => extractErrorCode(error) !== null);if (criticalError) {- const logoutLink = <>{t('pages.auth.unlock.SwitchAccountsText')} <Link to="/user/logout" className="text-primary-700 hover:underline dark:text-primary-500">{t('pages.auth.unlock.LogOutLink')}</Link></>;+ const logoutLink = <>{t('auth.switchAccounts')} <Link to="/user/logout" className="text-primary-700 hover:underline dark:text-primary-500">{t('web.topMenu.logOut')}</Link></>;return <CriticalErrorPanel report={criticalError} onBack={() => setErrors([])} footer={logoutLink} />;}@@ -270,36 +270,36 @@ const Unlock: React.FC = () => {{showWebAuthnButton ? (<div className="mb-6">- <p className="text-base font-normal text-gray-500 dark:text-gray-400 mb-4">{t('pages.auth.unlock.QuickUnlockDescription')}</p>+ <p className="text-base font-normal text-gray-500 dark:text-gray-400 mb-4">{t('auth.unlockPage.quickUnlockDescription')}</p><ServerValidationErrors errors={errors} className="mb-4" /><div className="flex space-x-4"><button type="button" onClick={() => void unlockWithWebAuthn()} className="flex-grow inline-flex items-center justify-center px-5 py-2 text-base font-medium text-center text-white rounded-lg bg-primary-700 hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"><svg className="w-5 h-5 mr-2 -ml-1" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M17.414 2.586a2 2 0 00-2.828 0L7 10.172V13h2.828l7.586-7.586a2 2 0 000-2.828z"></path><path fillRule="evenodd" d="M2 6a2 2 0 012-2h4a1 1 0 010 2H4v10h10v-4a1 1 0 112 0v4a2 2 0 01-2 2H4a2 2 0 01-2-2V6z" clipRule="evenodd"></path></svg>- {t('pages.auth.unlock.UnlockWithWebAuthn')}+ {t('auth.unlockPage.unlockWithWebAuthn')}</button><button type="button" onClick={showPasswordUnlock} className="inline-flex items-center justify-center px-5 py-2 text-base font-medium text-center text-gray-900 rounded-lg border border-gray-300 hover:bg-gray-100 focus:ring-4 focus:ring-gray-100 dark:text-white dark:border-gray-700 dark:hover:bg-gray-700 dark:focus:ring-gray-800">- {t('pages.auth.unlock.UnlockWithPassword')}+ {t('auth.unlockWithPassword')}</button></div></div>) : (<><p className="text-base font-normal text-gray-500 dark:text-gray-400 mb-4">- {t('pages.auth.unlock.EnterMasterPasswordDescription')}+ {t('auth.unlockPage.enterMasterPasswordDescription')}</p><ServerValidationErrors errors={errors} /><form onSubmit={unlockSubmit} className="mt-4 space-y-6" av-enable="true" av-suppress-save="true"><div>- <FormLabel htmlFor="password">{t('pages.auth.unlock.YourPasswordLabel')}</FormLabel>+ <FormLabel htmlFor="password">{t('auth.register.passwordLabel')}</FormLabel><PasswordInputField ref={passwordRef} id="password" value={password} onValueChange={setPassword} placeholder="••••••••" /></div><button type="submit" id="unlock-button" className="w-full px-5 py-2 text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800 flex items-center justify-center gap-2">- {t('pages.auth.unlock.UnlockButton')}+ {t('auth.unlockPage.unlockButton')}</button></form></>@@ -310,12 +310,12 @@ const Unlock: React.FC = () => {<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 18h.01M8 21h8a2 2 0 002-2V5a2 2 0 00-2-2H8a2 2 0 00-2 2v14a2 2 0 002 2z"></path></svg>- {t('pages.auth.unlock.UnlockWithMobileButton')}+ {t('auth.unlockPage.unlockWithMobileButton')}</button>)}<div className="text-sm text-center font-medium text-gray-500 dark:text-gray-400 mt-6">- {t('pages.auth.unlock.SwitchAccountsText')} <Link to="/user/logout" className="text-primary-700 hover:underline dark:text-primary-500">{t('pages.auth.unlock.LogOutLink')}</Link>+ {t('auth.switchAccounts')} <Link to="/user/logout" className="text-primary-700 hover:underline dark:text-primary-500">{t('web.topMenu.logOut')}</Link></div><FooterLogin />diff --git a/apps/web/src/pages/emails/Home.tsx b/apps/web/src/pages/emails/Home.tsxindex 5705fc072..f7e0165a9 100644--- a/apps/web/src/pages/emails/Home.tsx+++ b/apps/web/src/pages/emails/Home.tsx@@ -65,7 +65,7 @@ const EmailsHome: React.FC = () => {const webApi = useWebApi();const notifications = useNotifications();const { showConfirmation } = useConfirmModal();- usePageTitle(t('pages.main.emails.home.PageTitle'));+ usePageTitle(t('emails.title'));const [isLoading, setIsLoading] = useMinDurationLoading(true, 300);const [emailList, setEmailList] = useState<MailListEntry[]>([]);@@ -151,7 +151,7 @@ const EmailsHome: React.FC = () => {if (!dbContext.isSyncing && !await hasUnsyncedUserChanges()) {const apiError = error as { apiError?: ApiErrorResponse };if (apiError.apiError?.code === 'CLAIM_DOES_NOT_EXIST') {- notifications.addErrorMessage(t('pages.main.emails.home.ClaimDoesNotExistError'), true);+ notifications.addErrorMessage(t('emails.home.claimDoesNotExistError'), true);} else {notifications.addErrorMessage(error instanceof Error ? error.message : t('common.errors.unknownError'), true);}@@ -363,10 +363,10 @@ const EmailsHome: React.FC = () => {return;}const confirmed = await showConfirmation(- t('pages.main.emails.home.BulkDeleteEmailTitle'),- t('pages.main.emails.home.BulkDeleteEmailConfirmation', { 0: checkedEmailIds.size }),- t('sharedResources.Confirm'),- t('sharedResources.Cancel'),+ t('emails.home.bulkDeleteEmailTitle'),+ t('emails.home.bulkDeleteEmailConfirmation', { count: checkedEmailIds.size }),+ t('common.confirm'),+ t('common.cancel'),);if (!confirmed) {return;@@ -379,7 +379,7 @@ const EmailsHome: React.FC = () => {body: JSON.stringify({ ids: [...checkedEmailIds] }),});const deletedIds = response?.successfulEmailIds ?? [];- notifications.addSuccessMessage(t('pages.main.emails.home.BulkDeleteEmailSuccess', { 0: deletedIds.length }), true);+ notifications.addSuccessMessage(t('emails.home.bulkDeleteEmailSuccess', { count: deletedIds.length }), true);handleEmailsDeleted(deletedIds);} catch (error) {notifications.addErrorMessage(error instanceof Error ? error.message : t('common.errors.unknownError'), true);@@ -425,16 +425,16 @@ const EmailsHome: React.FC = () => {)}<PageHeader- title={t('pages.main.emails.home.PageTitle')}- description={t('pages.main.emails.home.PageDescription')}+ title={t('emails.title')}+ description={t('emails.home.pageDescription')}customActions={(<>{autoRefreshEnabled && currentPage === 1 && (- <div className="w-3 h-3 mr-2 rounded-full bg-primary-300 border-2 border-primary-100 animate-pulse" title={t('pages.main.emails.home.AutoRefreshEnabledTooltip')}></div>+ <div className="w-3 h-3 mr-2 rounded-full bg-primary-300 border-2 border-primary-100 animate-pulse" title={t('emails.home.autoRefreshEnabledTooltip')}></div>)}- <RefreshButton onClick={() => refreshData()} buttonText={t('pages.main.emails.home.RefreshButton')} />+ <RefreshButton onClick={() => refreshData()} buttonText={t('common.refresh')} />{checkedEmailIds.size > 0 && (- <DeleteAllSelectedButton onClick={showBulkDeleteConfirmation} buttonText={t('pages.main.emails.home.DeleteSelectedEmails', { 0: checkedEmailIds.size })} />+ <DeleteAllSelectedButton onClick={showBulkDeleteConfirmation} buttonText={t('emails.home.deleteSelectedEmails', { count: checkedEmailIds.size })} />)}</>)} />@@ -465,7 +465,7 @@ const EmailsHome: React.FC = () => {) : noEmailClaims ? (<div className="p-4 mx-4 mt-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800"><div className="px-4 py-2 text-gray-400 rounded">- <p className="text-gray-500 dark:text-gray-400">{t('pages.main.emails.home.NoEmailClaimsMessage')}</p>+ <p className="text-gray-500 dark:text-gray-400">{t('emails.home.noEmailClaimsMessage')}</p></div></div>) : (@@ -477,7 +477,7 @@ const EmailsHome: React.FC = () => {<ul className="divide-y divide-gray-200 dark:divide-gray-600">{emailList.length === 0 ? (<li className="p-4 text-center text-gray-500 dark:text-gray-300">- {t('pages.main.emails.home.NoEmailsReceivedMessage')}+ {t('emails.home.noEmailsReceivedMessage')}</li>) : renderRows(emailId => void openEmailModal(emailId), false)}</ul>@@ -488,7 +488,7 @@ const EmailsHome: React.FC = () => {{emailList.length === 0 ? (<div className="w-full bg-white border rounded-lg dark:bg-gray-800 dark:border-gray-700 overflow-hidden"><div className="p-4 text-center text-gray-500 dark:text-gray-300">- {t('pages.main.emails.home.NoEmailsReceivedMessage')}+ {t('emails.home.noEmailsReceivedMessage')}</div></div>) : (@@ -509,10 +509,10 @@ const EmailsHome: React.FC = () => {<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle><path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>- {t('pages.main.emails.home.LoadingText')}+ {t('common.loading')}</span>) : (- <span>{t('pages.main.emails.home.LoadMoreButtonText', { 0: totalRecords - emailList.length })}</span>+ <span>{t('emails.loadMore', { count: totalRecords - emailList.length })}</span>)}</button></li>diff --git a/apps/web/src/pages/items/AddEdit.tsx b/apps/web/src/pages/items/AddEdit.tsxindex 3c3b8730b..086df94f2 100644--- a/apps/web/src/pages/items/AddEdit.tsx+++ b/apps/web/src/pages/items/AddEdit.tsx@@ -79,8 +79,8 @@ const ItemAddEditForm: React.FC = () => {const { saveItem } = useSaveItem();const webApi = useWebApi();const editMode = id !== undefined;- const tk = 'pages.main.items.addEdit';- usePageTitle(editMode ? t(`${tk}.EditItemTitle`) : t(`${tk}.AddItemTitle`));++ usePageTitle(editMode ? t('items.editItem') : t('items.addItem'));const [loading, setLoading] = useState(true);const initializedFor = useRef<string | null>(null);@@ -201,7 +201,7 @@ const ItemAddEditForm: React.FC = () => {const ref = { Id: id, ManifestId: manifestId };const item = client.items.getById(ref);if (!item) {- notifications.addErrorMessage(t(`${tk}.ItemNotExistError`));+ notifications.addErrorMessage(t('items.view.itemNotFoundError'));navigate('/items', { replace: true });return;}@@ -220,8 +220,8 @@ const ItemAddEditForm: React.FC = () => {loaded = setFieldValue(loaded, FieldKey.LoginUrl, DEFAULT_SERVICE_URL);}const crumbs = loaded.FolderId ? buildFolderBreadcrumbs({ Id: loaded.FolderId, ManifestId: loaded.ManifestId }, allFolders) : [];- crumbs.push({ displayName: t(`${tk}.ViewItemBreadcrumb`), url: itemRoute(ref) });- crumbs.push({ displayName: t(`${tk}.EditItemBreadcrumb`) });+ crumbs.push({ displayName: t('items.view.viewItemTitle'), url: itemRoute(ref) });+ crumbs.push({ displayName: t('items.editItem') });if (!cancelled) {initializedFor.current = routeKey;setEdit(loaded);@@ -253,7 +253,7 @@ const ItemAddEditForm: React.FC = () => {setShow2FA(false);setShowAttachments(false);const crumbs = folder ? buildFolderBreadcrumbs(folder, allFolders) : [];- crumbs.push({ displayName: t(`${tk}.AddNewItemBreadcrumb`) });+ crumbs.push({ displayName: t('items.addNewItem') });if (!cancelled) {initializedFor.current = routeKey;setEdit(created);@@ -402,24 +402,24 @@ const ItemAddEditForm: React.FC = () => {return;}if (edit.ServiceName.trim().length === 0) {- setNameError(t('validationMessages.ServiceNameRequired'));+ setNameError(t('validation.serviceNameRequired'));return;}setNameError('');setIsSaving(true);- showLoading(t(`${tk}.SavingVaultMessage`));+ showLoading(t('items.addEdit.savingVaultMessage'));const startedAt = Date.now();try {const saved = await saveItem(edit, { original: editMode && manifestId ? { Id: edit.Id, ManifestId: manifestId } : undefined, originalAttachmentIds: originalAttachmentIds.current, originalTotpCodeIds: originalTotpCodeIds.current, deletePasskeys: passkeyMarkedForDeletion, logoSelection, resolvedFaviconSource, resolvedFaviconBytes: logoBytes });// Keep the saving indicator up for a moment: a save that completes instantly reads as a flicker.await waitForMinimumDuration(startedAt, MIN_SAVE_INDICATOR_MS);- notifications.addSuccessMessage(editMode ? t(`${tk}.ItemUpdatedSuccess`) : t(`${tk}.ItemCreatedSuccess`));+ notifications.addSuccessMessage(editMode ? t('items.toasts.itemUpdated') : t('items.toasts.itemCreated'));navigate(itemRoute(saved));} catch (error) {console.error('Error saving item:', error);// Failed push (e.g. server not reachable).if (!(error instanceof VaultPushFailedError)) {- notifications.addErrorMessage(t(`${tk}.ErrorSavingItem`), true);+ notifications.addErrorMessage(t('items.addEdit.errorSavingItem'), true);}} finally {hideLoading();@@ -465,11 +465,11 @@ const ItemAddEditForm: React.FC = () => {);const usernameField = (- <EditUsernameFormRow id="username" label={t(`${tk}.UsernameLabel`)} value={getFieldValue(edit, FieldKey.LoginUsername)} onChange={value => update(current => setFieldValue(current, FieldKey.LoginUsername, value))} onGenerateNewUsername={() => void onGenerateUsername()} />+ <EditUsernameFormRow id="username" label={t('common.username')} value={getFieldValue(edit, FieldKey.LoginUsername)} onChange={value => update(current => setFieldValue(current, FieldKey.LoginUsername, value))} onGenerateNewUsername={() => void onGenerateUsername()} />);const passwordField = (- <EditPasswordFormRow id="password" label={t(`${tk}.PasswordLabel`)} value={getFieldValue(edit, FieldKey.LoginPassword)} onChange={value => update(current => setFieldValue(current, FieldKey.LoginPassword, value))} showPassword={isPasswordVisible} />+ <EditPasswordFormRow id="password" label={t('common.password')} value={getFieldValue(edit, FieldKey.LoginPassword)} onChange={value => update(current => setFieldValue(current, FieldKey.LoginPassword, value))} showPassword={isPasswordVisible} />);/**@@ -490,8 +490,8 @@ const ItemAddEditForm: React.FC = () => {<><PageHeaderbreadcrumbItems={breadcrumbItems}- title={editMode ? t(`${tk}.EditItemTitle`) : t(`${tk}.AddItemTitle`)}- description={editMode ? t(`${tk}.EditItemDescription`) : t(`${tk}.AddItemDescription`)}+ title={editMode ? t('items.editItem') : t('items.addItem')}+ description={editMode ? t('items.addEdit.editItemDescription') : t('items.addEdit.addItemDescription')}titleSuffix={!loading && (<ItemTypeSelector selectedType={edit.ItemType} onSelectedTypeChange={(type) => {void handleItemTypeChange(edit, type).then(setEdit);@@ -499,8 +499,8 @@ const ItemAddEditForm: React.FC = () => {)}customActions={(<>- <Button color="success" onClick={() => void save()}>{t(`${tk}.SaveItemButton`)}</Button>- <Button color="danger" onClick={cancel}>{t('sharedResources.Cancel')}</Button>+ <Button color="success" onClick={() => void save()}>{t('items.saveItem')}</Button>+ <Button color="danger" onClick={cancel}>{t('common.cancel')}</Button></>)}/>@@ -516,7 +516,7 @@ const ItemAddEditForm: React.FC = () => {<Card variant="section"><div className="grid gap-4"><div className="col-span-6 sm:col-span-3">- <FormLabel htmlFor="service-name">{t(`${tk}.ServiceNameLabel`)}</FormLabel>+ <FormLabel htmlFor="service-name">{t('items.itemName')}</FormLabel><div className="flex items-start gap-4"><ItemLogoPickeritem={logoPreviewItem}@@ -528,7 +528,7 @@ const ItemAddEditForm: React.FC = () => {onFetchFromWebsite={() => void fetchLogoFromWebsite()}/><div className="flex-1 min-w-0">- <input type="text" id="service-name" autoComplete="off" className={EDIT_INPUT_CLASSES} value={edit.ServiceName} placeholder={t(`${tk}.ServiceNamePlaceholder`)} autoCapitalize="off" autoCorrect="off" onChange={(e) => {+ <input type="text" id="service-name" autoComplete="off" className={EDIT_INPUT_CLASSES} value={edit.ServiceName} placeholder={t('items.addEdit.serviceNamePlaceholder')} autoCapitalize="off" autoCorrect="off" onChange={(e) => {setNameError('');update(current => ({ ...current, ServiceName: e.target.value }));}} />@@ -539,7 +539,7 @@ const ItemAddEditForm: React.FC = () => {</div>{shouldShowField(FieldKey.LoginUrl) && (<div className="col-span-6 sm:col-span-3">- <MultiValueFormRow id="service-url" label={t(`${tk}.ServiceUrlLabel`)} values={getFieldValues(edit, FieldKey.LoginUrl)} onChange={values => update(current => setFieldValues(current, FieldKey.LoginUrl, values))} onFocus={onFocusUrlInput} />+ <MultiValueFormRow id="service-url" label={t('fieldLabels.login.url')} values={getFieldValues(edit, FieldKey.LoginUrl)} onChange={values => update(current => setFieldValues(current, FieldKey.LoginUrl, values))} onFocus={onFocusUrlInput} /></div>)}</div>@@ -562,7 +562,7 @@ const ItemAddEditForm: React.FC = () => {<div className="col-span-1 md:col-span-1 lg:col-span-1"><RemovableSection canRemove={canRemoveField(FieldKey.NotesContent)} onRemove={() => removeOptionalField(FieldKey.NotesContent)}><div className="col-span-6 sm:col-span-3">- <EditFormRow type="textarea" id="notes" label={t(`${tk}.NotesLabel`)} labelStyle="header" value={getFieldValue(edit, FieldKey.NotesContent)} onChange={value => update(current => setFieldValue(current, FieldKey.NotesContent, value))} />+ <EditFormRow type="textarea" id="notes" label={t('common.notes')} labelStyle="header" value={getFieldValue(edit, FieldKey.NotesContent)} onChange={value => update(current => setFieldValue(current, FieldKey.NotesContent, value))} /></div></RemovableSection></div>@@ -570,7 +570,7 @@ const ItemAddEditForm: React.FC = () => {{showAttachments && (<div className="col-span-1 md:col-span-1 lg:col-span-1">- <RemovableSection title={t(`${tk}.AttachmentsSectionHeader`)} canRemove onRemove={removeAttachmentsSection}>+ <RemovableSection title={t('common.attachments')} canRemove onRemove={removeAttachmentsSection}><div className="col-span-6 sm:col-span-3"><AttachmentUploader attachments={edit.Attachments} onAttachmentsChange={attachments => update(current => ({ ...current, Attachments: attachments }))} /></div>@@ -585,14 +585,14 @@ const ItemAddEditForm: React.FC = () => {{hasLoginFields && (<Section className="overflow-visible" title={(<>- <span>{t(`${tk}.LoginDetailsSectionHeader`)}</span>+ <span>{t('items.loginCredentials')}</span>{edit.ItemType === ItemTypes.Login && !shouldShowField(FieldKey.LoginEmail) && (<button type="button" onClick={() => addOptionalField(FieldKey.LoginEmail)} className="inline-flex items-center gap-1 px-2 py-0.5 text-xs rounded-full transition-colors focus:outline-none text-gray-500 dark:text-gray-400 hover:text-primary-600 dark:hover:text-primary-400 border border-dashed border-gray-300 dark:border-gray-600 hover:border-primary-400 dark:hover:border-primary-500"><svg className="w-2.5 h-2.5 -ml-0.5" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5"><line x1="12" y1="5" x2="12" y2="19" /><line x1="5" y1="12" x2="19" y2="12" /></svg>- <span>{t('sharedResources.Email')}</span>+ <span>{t('common.email')}</span></button>)}</>@@ -607,8 +607,8 @@ const ItemAddEditForm: React.FC = () => {<PasskeyIcon className="w-5 h-5 text-gray-600 dark:text-gray-400 mt-0.5 flex-shrink-0" /><div className="flex-1"><div className="mb-1 flex items-center justify-between">- <span className="text-sm font-semibold text-gray-900 dark:text-white">{t(`${tk}.PasskeyLabel`)}</span>- <button type="button" onClick={() => setPasskeyMarkedForDeletion(true)} className="text-red-600 dark:text-red-400 hover:text-red-700 dark:hover:text-red-300" title={t(`${tk}.DeletePasskeyButton`)}>+ <span className="text-sm font-semibold text-gray-900 dark:text-white">{t('passkeys.passkey')}</span>+ <button type="button" onClick={() => setPasskeyMarkedForDeletion(true)} className="text-red-600 dark:text-red-400 hover:text-red-700 dark:hover:text-red-300" title={t('items.addEdit.deletePasskeyButton')}><svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><polyline points="3 6 5 6 21 6" /><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2" />@@ -620,18 +620,18 @@ const ItemAddEditForm: React.FC = () => {<div className="space-y-1 mb-2">{passkey.RpId.trim().length > 0 && (<div>- <span className="text-xs text-gray-500 dark:text-gray-400">{t(`${tk}.PasskeySiteLabel`)}: </span>+ <span className="text-xs text-gray-500 dark:text-gray-400">{t('passkeys.site')}: </span><span className="text-sm text-gray-900 dark:text-white">{passkey.RpId}</span></div>)}{(passkey.DisplayName ?? '').trim().length > 0 && (<div>- <span className="text-xs text-gray-500 dark:text-gray-400">{t(`${tk}.PasskeyDisplayNameLabel`)}: </span>+ <span className="text-xs text-gray-500 dark:text-gray-400">{t('items.itemName')}: </span><span className="text-sm text-gray-900 dark:text-white">{passkey.DisplayName}</span></div>)}</div>- <p className="text-xs text-gray-600 dark:text-gray-400">{t(`${tk}.PasskeyHelpText`)}</p>+ <p className="text-xs text-gray-600 dark:text-gray-400">{t('items.addEdit.passkeyHelpText')}</p></div></div></div>@@ -643,15 +643,15 @@ const ItemAddEditForm: React.FC = () => {<PasskeyIcon className="w-5 h-5 text-red-600 dark:text-red-400 mt-0.5 flex-shrink-0" /><div className="flex-1"><div className="mb-1 flex items-center justify-between">- <span className="text-sm font-semibold text-red-900 dark:text-red-100">{t(`${tk}.PasskeyMarkedForDeletion`)}</span>- <button type="button" onClick={() => setPasskeyMarkedForDeletion(false)} className="text-gray-600 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300" title={t(`${tk}.UndoButton`)}>+ <span className="text-sm font-semibold text-red-900 dark:text-red-100">{t('passkeys.passkeyMarkedForDeletion')}</span>+ <button type="button" onClick={() => setPasskeyMarkedForDeletion(false)} className="text-gray-600 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300" title={t('common.undo')}><svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><path d="M3 7v6h6" /><path d="M21 17a9 9 0 00-9-9 9 9 0 00-6 2.3L3 13" /></svg></button></div>- <p className="text-xs text-red-800 dark:text-red-200">{t(`${tk}.PasskeyWillBeDeleted`)}</p>+ <p className="text-xs text-red-800 dark:text-red-200">{t('items.addEdit.passkeyWillBeDeleted')}</p></div></div></div>@@ -674,8 +674,8 @@ const ItemAddEditForm: React.FC = () => {<div className="col-span-1 md:col-span-1 lg:col-span-2"><Card variant="section"><SectionTitle className="mb-3 flex items-center justify-between gap-2">- <span>{t(`${tk}.AliasSectionHeader`)}</span>- <button type="button" id="generate-random-alias" onClick={() => void onGenerateRandomAlias()} className="p-1.5 text-gray-400 hover:text-primary-500 transition-colors focus:outline-none" title={t('sharedResources.Generate')}>+ <span>{t('common.alias')}</span>+ <button type="button" id="generate-random-alias" onClick={() => void onGenerateRandomAlias()} className="p-1.5 text-gray-400 hover:text-primary-500 transition-colors focus:outline-none" title={t('common.generate')}><svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><path d="M23 4v6h-6" /><path d="M20.49 15a9 9 0 1 1-2.12-9.36L23 10" />@@ -683,10 +683,10 @@ const ItemAddEditForm: React.FC = () => {</button></SectionTitle><div className="grid gap-4">- <div className="col-span-6 sm:col-span-3">{textField(FieldKey.AliasFirstName, 'first-name', t(`${tk}.FirstNameLabel`))}</div>- <div className="col-span-6 sm:col-span-3">{textField(FieldKey.AliasLastName, 'last-name', t(`${tk}.LastNameLabel`))}</div>- <div className="col-span-6 sm:col-span-3">{textField(FieldKey.AliasGender, 'gender', t(`${tk}.GenderLabel`))}</div>- <div className="col-span-6 sm:col-span-3">{textField(FieldKey.AliasBirthdate, 'birthdate', t(`${tk}.BirthDateLabel`))}</div>+ <div className="col-span-6 sm:col-span-3">{textField(FieldKey.AliasFirstName, 'first-name', t('fieldLabels.alias.first_name'))}</div>+ <div className="col-span-6 sm:col-span-3">{textField(FieldKey.AliasLastName, 'last-name', t('fieldLabels.alias.last_name'))}</div>+ <div className="col-span-6 sm:col-span-3">{textField(FieldKey.AliasGender, 'gender', t('fieldLabels.alias.gender'))}</div>+ <div className="col-span-6 sm:col-span-3">{textField(FieldKey.AliasBirthdate, 'birthdate', t('fieldLabels.alias.birthdate'))}</div></div></Card></div>@@ -694,17 +694,17 @@ const ItemAddEditForm: React.FC = () => {{edit.ItemType === ItemTypes.CreditCard && (<div className="col-span-1 md:col-span-1 lg:col-span-2">- <Section title={t(`${tk}.CardDetailsSectionHeader`)}>- <div className="col-span-6">{textField(FieldKey.CardCardholderName, 'cardholder-name', t(`${tk}.CardholderNameLabel`))}</div>- <div className="col-span-6">{secretField(FieldKey.CardNumber, 'card-number', t(`${tk}.CardNumberLabel`))}</div>- <div className="col-span-3">{textField(FieldKey.CardExpiryMonth, 'expiry-month', t(`${tk}.ExpiryMonthLabel`), 'MM')}</div>- <div className="col-span-3">{textField(FieldKey.CardExpiryYear, 'expiry-year', t(`${tk}.ExpiryYearLabel`), 'YYYY')}</div>- <div className="col-span-6 sm:col-span-3">{secretField(FieldKey.CardCvv, 'cvv', t(`${tk}.CardCvvLabel`))}</div>+ <Section title={t('items.view.cardSection')}>+ <div className="col-span-6">{textField(FieldKey.CardCardholderName, 'cardholder-name', t('fieldLabels.card.cardholder_name'))}</div>+ <div className="col-span-6">{secretField(FieldKey.CardNumber, 'card-number', t('fieldLabels.card.number'))}</div>+ <div className="col-span-3">{textField(FieldKey.CardExpiryMonth, 'expiry-month', t('fieldLabels.card.expiry_month'), 'MM')}</div>+ <div className="col-span-3">{textField(FieldKey.CardExpiryYear, 'expiry-year', t('fieldLabels.card.expiry_year'), 'YYYY')}</div>+ <div className="col-span-6 sm:col-span-3">{secretField(FieldKey.CardCvv, 'cvv', t('fieldLabels.card.cvv'))}</div>{shouldShowField(FieldKey.CardPin) && (<div className="col-span-6 sm:col-span-3 relative">- {secretField(FieldKey.CardPin, 'pin', t(`${tk}.CardPinLabel`))}+ {secretField(FieldKey.CardPin, 'pin', t('fieldLabels.card.pin'))}{canRemoveField(FieldKey.CardPin) && (- <button type="button" onClick={() => removeOptionalField(FieldKey.CardPin)} className="absolute top-0 right-0 text-gray-400 hover:text-red-500 transition-colors" title={t(`${tk}.RemoveField`)}>+ <button type="button" onClick={() => removeOptionalField(FieldKey.CardPin)} className="absolute top-0 right-0 text-gray-400 hover:text-red-500 transition-colors" title={t('items.addEdit.removeField')}><svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12" /></svg>@@ -718,7 +718,7 @@ const ItemAddEditForm: React.FC = () => {{edit.ItemType === ItemTypes.Note && (<div className="col-span-1 md:col-span-1 lg:col-span-2">- <Section title={t(`${tk}.NotesLabel`)}>+ <Section title={t('common.notes')}><div className="col-span-6"><EditFormRow type="textarea" id="notes" label="" value={getFieldValue(edit, FieldKey.NotesContent)} onChange={value => update(current => setFieldValue(current, FieldKey.NotesContent, value))} /></div>@@ -729,7 +729,7 @@ const ItemAddEditForm: React.FC = () => {{customFields.length > 0 && (<div className="col-span-1 md:col-span-1 lg:col-span-2"><Card variant="section">- <SectionTitle>{t(`${tk}.CustomFieldsSectionHeader`)}</SectionTitle>+ <SectionTitle>{t('common.customFields')}</SectionTitle><DraggableCustomFieldsListcustomFields={customFields}onReorder={reordered => update(current => reorderCustomFields(current, reordered))}@@ -744,12 +744,12 @@ const ItemAddEditForm: React.FC = () => {<div className="col-span-1 md:col-span-1 lg:col-span-2 mb-4">{addFieldMenu}</div></div></div>- <button type="submit" className="hidden">{t(`${tk}.SaveItemButton`)}</button>+ <button type="submit" className="hidden">{t('items.saveItem')}</button></form><StickyActionBar>- <Button color="success" onClick={() => void save()}>{t(`${tk}.SaveItemButton`)}</Button>- <Button color="danger" onClick={cancel}>{t('sharedResources.Cancel')}</Button>+ <Button color="success" onClick={() => void save()}>{t('items.saveItem')}</Button>+ <Button color="danger" onClick={cancel}>{t('common.cancel')}</Button></StickyActionBar></PageContent>)}diff --git a/apps/web/src/pages/items/Home.tsx b/apps/web/src/pages/items/Home.tsxindex 4d2312a4f..5cc1bdf8f 100644--- a/apps/web/src/pages/items/Home.tsx+++ b/apps/web/src/pages/items/Home.tsx@@ -153,7 +153,7 @@ const ItemsHome: React.FC = () => {syncTableSortWithSortOrder(order);} catch (error) {console.error('Failed to load items:', error);- notifications.addErrorMessage(t('pages.main.items.home.FailedToLoadItemsMessage'), true);+ notifications.addErrorMessage(t('items.home.failedToLoadItemsMessage'), true);} finally {setIsLoading(false);}@@ -288,15 +288,15 @@ const ItemsHome: React.FC = () => {*/const getFilterTitle = (): string => {switch (filterType) {- case ItemFilter.Passkeys: return t('pages.main.items.home.FilterPasskeysOption');- case ItemFilter.Attachments: return t('pages.main.items.home.FilterAttachmentsOption');- case ItemFilter.Totp: return t('pages.main.items.home.FilterTotpOption');- case ItemFilter.Login: return t('components.main.items.itemTypeSelector.TypeLogin');- case ItemFilter.Alias: return t('components.main.items.itemTypeSelector.TypeAlias');- case ItemFilter.CreditCard: return t('components.main.items.itemTypeSelector.TypeCreditCard');- case ItemFilter.Note: return t('components.main.items.itemTypeSelector.TypeNote');+ case ItemFilter.Passkeys: return t('common.passkeys');+ case ItemFilter.Attachments: return t('common.attachments');+ case ItemFilter.Totp: return t('items.filters.totp');+ case ItemFilter.Login: return t('itemTypes.login.title');+ case ItemFilter.Alias: return t('itemTypes.alias.title');+ case ItemFilter.CreditCard: return t('itemTypes.creditCard.title');+ case ItemFilter.Note: return t('itemTypes.secureNote');default:- return isInFolder && currentFolderName ? currentFolderName : t('pages.main.items.home.PageTitle');+ return isInFolder && currentFolderName ? currentFolderName : t('navigation.vault');}};@@ -379,7 +379,7 @@ const ItemsHome: React.FC = () => {console.error('Failed to create folder:', error);// Failed push (e.g. server not reachable).if (!(error instanceof VaultPushFailedError)) {- notifications.addErrorMessage(t('pages.main.items.home.FailedToCreateFolder'), true);+ notifications.addErrorMessage(t('items.home.failedToCreateFolder'), true);}}};@@ -400,7 +400,7 @@ const ItemsHome: React.FC = () => {} catch (error) {console.error('Failed to rename folder:', error);if (!(error instanceof VaultPushFailedError)) {- notifications.addErrorMessage(t('sharedResources.ErrorGeneric'), true);+ notifications.addErrorMessage(t('common.errorGeneric'), true);}}};@@ -426,7 +426,7 @@ const ItemsHome: React.FC = () => {} catch (error) {console.error('Failed to delete folder:', error);if (!(error instanceof VaultPushFailedError)) {- notifications.addErrorMessage(t('pages.main.items.home.FailedToDeleteFolder'), true);+ notifications.addErrorMessage(t('items.home.failedToDeleteFolder'), true);}}};@@ -436,7 +436,7 @@ const ItemsHome: React.FC = () => {<PageHeaderbreadcrumbItems={breadcrumbItems}title={getFilterTitle()}- description={t('pages.main.items.home.PageDescription')}+ description={t('items.home.pageDescription')}titleActions={(<ItemFilterDropdowntitle={getFilterTitle()}@@ -450,12 +450,12 @@ const ItemsHome: React.FC = () => {onToggleShowFolders={toggleShowFolders}titleActions={isInFolder && !currentFolderIsVirtual ? (<>- <button onClick={() => setShowEditFolderModal(true)} title={t('pages.main.items.home.EditFolder')} className="p-1.5 text-gray-400 hover:text-orange-500 dark:text-gray-500 dark:hover:text-orange-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors">+ <button onClick={() => setShowEditFolderModal(true)} title={t('items.folders.editFolder')} className="p-1.5 text-gray-400 hover:text-orange-500 dark:text-gray-500 dark:hover:text-orange-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" /></svg></button>- <button onClick={() => setShowDeleteFolderModal(true)} title={t('pages.main.items.home.DeleteFolder')} className="p-1.5 text-gray-400 hover:text-red-500 dark:text-gray-500 dark:hover:text-red-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors">+ <button onClick={() => setShowDeleteFolderModal(true)} title={t('items.folders.deleteFolder')} className="p-1.5 text-gray-400 hover:text-red-500 dark:text-gray-500 dark:hover:text-red-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6" /><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2" />@@ -477,29 +477,29 @@ const ItemsHome: React.FC = () => {<div ref={settingsDropdownRef} id="settingsDropdown" className="absolute right-0 z-10 mt-2 min-w-[220px] origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none dark:bg-gray-700"><div className="p-4"><div className="mb-4">- <FormLabel>{t('pages.main.items.home.ViewModeLabel')}</FormLabel>+ <FormLabel>{t('items.home.viewModeLabel')}</FormLabel><Select value={viewMode} onChange={(e) => {setViewMode(e.target.value as ViewMode); closeSettingsPopup();}}>- <option value="grid">{t('pages.main.items.home.GridViewOption')}</option>- <option value="table">{t('pages.main.items.home.TableViewOption')}</option>+ <option value="grid">{t('items.home.gridViewOption')}</option>+ <option value="table">{t('items.home.tableViewOption')}</option></Select></div><div className="mb-4">- <FormLabel>{t('pages.main.items.home.SortOrderLabel')}</FormLabel>+ <FormLabel>{t('items.home.sortOrderLabel')}</FormLabel><Select value={sortOrder} onChange={(e) => {setSortOrder(e.target.value as CredentialSortOrder); closeSettingsPopup();}}>- <option value={CredentialSortOrder.OldestFirst}>{t('pages.main.items.home.OldestFirstOption')}</option>- <option value={CredentialSortOrder.NewestFirst}>{t('pages.main.items.home.NewestFirstOption')}</option>- <option value={CredentialSortOrder.Alphabetical}>{t('pages.main.items.home.AlphabeticalOption')}</option>+ <option value={CredentialSortOrder.OldestFirst}>{t('items.sort.oldestFirst')}</option>+ <option value={CredentialSortOrder.NewestFirst}>{t('items.sort.newestFirst')}</option>+ <option value={CredentialSortOrder.Alphabetical}>{t('items.home.alphabeticalOption')}</option></Select></div></div></div>)}</div>- <RefreshButton onClick={refreshVault} buttonText={t('sharedResources.Refresh')} />+ <RefreshButton onClick={refreshVault} buttonText={t('common.refresh')} /></>)} />@@ -509,7 +509,7 @@ const ItemsHome: React.FC = () => {<PageContent className="px-4 mb-4">{filterType !== ItemFilter.All && (<div className="flex flex-wrap items-center gap-2 mb-4">- <span className="text-sm text-gray-500 dark:text-gray-400">{t('pages.main.items.home.FilteringBy')}</span>+ <span className="text-sm text-gray-500 dark:text-gray-400">{t('items.home.filteringBy')}</span><button onClick={() => setFilter(ItemFilter.All)} className="inline-flex items-center gap-1 px-3 py-1.5 text-sm bg-orange-100 dark:bg-orange-900/30 hover:bg-orange-200 dark:hover:bg-orange-900/50 text-orange-700 dark:text-orange-300 rounded-lg transition-colors"><span>{getFilterTitle()}</span><svg className="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">@@ -536,7 +536,7 @@ const ItemsHome: React.FC = () => {<line x1="12" y1="5" x2="12" y2="19" /><line x1="5" y1="12" x2="19" y2="12" /></svg>- {currentLevelFolders.length === 0 && <span>{t('pages.main.items.home.NewFolder')}</span>}+ {currentLevelFolders.length === 0 && <span>{t('items.folders.newFolder')}</span>}</button>)}</div>@@ -549,20 +549,20 @@ const ItemsHome: React.FC = () => {{items.length === 0 && !isInFolder ? (<div className="credential-card col-span-full p-4 space-y-2 bg-amber-50 border border-primary-500 rounded-lg shadow-sm dark:border-primary-700 dark:bg-gray-800"><div className="px-4 py-6 text-gray-700 dark:text-gray-200 rounded text-center flex flex-col items-center">- <p className="mb-2 text-lg font-semibold text-primary-700 dark:text-primary-400">{t('pages.main.items.home.NoItemsTitle')}</p>+ <p className="mb-2 text-lg font-semibold text-primary-700 dark:text-primary-400">{t('items.home.noItemsTitle')}</p><div className="max-w-md mx-auto"><div className="mb-6">- <p className="text-sm mb-2">{t('pages.main.items.home.CreateFirstItemText')} <span className="hidden md:inline">{t('pages.main.items.home.NewAliasButtonText')}</span><span className="md:hidden">{t('pages.main.items.home.NewAliasButtonTextMobile')}</span> {t('pages.main.items.home.ButtonLocationText')}</p>+ <p className="text-sm mb-2">{t('items.home.createFirstItemText')} <span className="hidden md:inline">{t('items.home.newAliasButtonText')}</span><span className="md:hidden">{t('items.home.newAliasButtonTextMobile')}</span> {t('items.home.buttonLocationText')}</p></div><div className="flex items-center my-6"><div className="flex-1 h-px bg-gray-300 dark:bg-gray-600"></div>- <span className="px-4 text-sm text-gray-500 dark:text-gray-400">{t('pages.main.items.home.OrText')}</span>+ <span className="px-4 text-sm text-gray-500 dark:text-gray-400">{t('common.or')}</span><div className="flex-1 h-px bg-gray-300 dark:bg-gray-600"></div></div><div>- <p className="text-sm mb-2">{t('pages.main.items.home.ImportItemsText')}</p>+ <p className="text-sm mb-2">{t('items.home.importItemsText')}</p><Link to="/settings/import-export" className="inline-block text-sm px-4 py-2 bg-primary-600 text-white rounded-lg hover:bg-primary-700 transition-colors dark:bg-primary-700 dark:hover:bg-primary-600">- {t('pages.main.items.home.ImportButtonText')}+ {t('items.home.importButtonText')}</Link></div></div>@@ -572,13 +572,13 @@ const ItemsHome: React.FC = () => {<div className="credential-card col-span-full p-4 space-y-2 bg-amber-50 border border-primary-500 rounded-lg shadow-sm dark:border-primary-700 dark:bg-gray-800"><div className="px-4 py-6 text-gray-700 dark:text-gray-200 rounded text-center">{filterType !== ItemFilter.All ? (- <p>{t('pages.main.items.home.NoItemsFound')}</p>+ <p>{t('items.noMatchingItems')}</p>) : isInFolder ? (- <p>{t('pages.main.items.home.EmptyFolderMessage')}</p>+ <p>{t('items.home.emptyFolderMessage')}</p>) : hasItemsInFoldersOnly ? (- <p>{t('pages.main.items.home.AllItemsInFoldersMessage')}</p>+ <p>{t('items.allItemsInFoldersClick')}</p>) : (- <p>{t('pages.main.items.home.NoItemsFound')}</p>+ <p>{t('items.noMatchingItems')}</p>)}</div></div>@@ -597,7 +597,7 @@ const ItemsHome: React.FC = () => {<circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle><path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>- <span>{t('pages.main.items.home.LoadingMore')}</span>+ <span>{t('items.home.loadingMore')}</span></div>)}</div>diff --git a/apps/web/src/pages/items/RecentlyDeleted.tsx b/apps/web/src/pages/items/RecentlyDeleted.tsxindex f77eadf76..4c5474c08 100644--- a/apps/web/src/pages/items/RecentlyDeleted.tsx+++ b/apps/web/src/pages/items/RecentlyDeleted.tsx@@ -20,8 +20,6 @@ import type { ItemRef } from '@aliasvault/client/database/ItemRef';import type { ItemWithDeletedAt } from '@aliasvault/client/database/mappers/ItemMapper';import type { ItemFilterType } from '@aliasvault/client/items/ItemFilters';-const tk = 'pages.main.items.recentlyDeleted';-const DAY_MS = 24 * 60 * 60 * 1000;/**@@ -54,7 +52,7 @@ const RecentlyDeleted: React.FC = () => {const dbContext = useDb();const notifications = useNotifications();const { executeVaultMutationAsync } = useVaultMutate();- usePageTitle(t(`${tk}.PageTitle`));+ usePageTitle(t('items.recentlyDeleted.title'));const [items, setItems] = useState<ItemWithDeletedAt[]>([]);const [isLoading, setIsLoading] = useState(true);@@ -91,11 +89,11 @@ const RecentlyDeleted: React.FC = () => {await executeVaultMutationAsync(async () => {await client.items.restore(item);});- notifications.addSuccessMessage(t(`${tk}.RestoreSuccess`));+ notifications.addSuccessMessage(t('items.trash.restoreSuccess'));navigate('/items');} catch (error) {console.error('Failed to restore item:', error);- notifications.addErrorMessage(t(`${tk}.RestoreFailed`), true);+ notifications.addErrorMessage(t('items.trash.restoreFailed'), true);} finally {setIsBusy(false);}@@ -114,10 +112,10 @@ const RecentlyDeleted: React.FC = () => {await executeVaultMutationAsync(async () => {await client.items.permanentlyDelete(itemToDelete);});- notifications.addSuccessMessage(t(`${tk}.DeleteSuccess`));+ notifications.addSuccessMessage(t('items.recentlyDeleted.itemDeleted'));} catch (error) {console.error('Failed to delete item:', error);- notifications.addErrorMessage(t(`${tk}.DeleteFailed`), true);+ notifications.addErrorMessage(t('items.trash.deleteFailed'), true);} finally {setIsBusy(false);setItemToDelete(null);@@ -147,13 +145,13 @@ const RecentlyDeleted: React.FC = () => {}});if (failed > 0) {- notifications.addErrorMessage(t(`${tk}.EmptyAllPartialFailed`, { 0: failed }), true);+ notifications.addErrorMessage(t('items.trash.emptyAllPartialFailed', { count: failed }), true);} else {- notifications.addSuccessMessage(t(`${tk}.EmptyAllSuccess`));+ notifications.addSuccessMessage(t('items.recentlyDeleted.allItemsDeleted'));}} catch (error) {console.error('Failed to empty the trash:', error);- notifications.addErrorMessage(t(`${tk}.DeleteFailed`), true);+ notifications.addErrorMessage(t('items.trash.deleteFailed'), true);} finally {setIsBusy(false);setShowEmptyAllModal(false);@@ -164,12 +162,12 @@ const RecentlyDeleted: React.FC = () => {return (<><PageHeader- breadcrumbItems={[{ displayName: t('pages.main.items.home.PageTitle'), url: '/items' }, { displayName: t(`${tk}.PageTitle`) }]}- title={t(`${tk}.PageTitle`)}- description={t(`${tk}.PageDescription`)}+ breadcrumbItems={[{ displayName: t('navigation.vault'), url: '/items' }, { displayName: t('items.recentlyDeleted.title') }]}+ title={t('items.recentlyDeleted.title')}+ description={t('items.trash.pageDescription')}titleActions={(<ItemFilterDropdown- title={t(`${tk}.PageTitle`)}+ title={t('items.recentlyDeleted.title')}count={items.length}activeFilter={null}isRecentlyDeletedActive={true}@@ -183,7 +181,7 @@ const RecentlyDeleted: React.FC = () => {)}customActions={items.length > 0 && (<button type="button" onClick={() => setShowEmptyAllModal(true)} className="text-sm text-red-600 dark:text-red-400 hover:text-red-700 dark:hover:text-red-300">- {t(`${tk}.EmptyAll`)}+ {t('items.trash.emptyAll')}</button>)}/>@@ -194,10 +192,10 @@ const RecentlyDeleted: React.FC = () => {<PageContent className="mx-4"><div className="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 dark:bg-gray-800">{items.length === 0 ? (- <p className="text-gray-500 dark:text-gray-400">{t(`${tk}.NoItems`)}</p>+ <p className="text-gray-500 dark:text-gray-400">{t('items.trash.noItems')}</p>) : (<>- <p className="text-sm text-gray-500 dark:text-gray-400 mb-4">{t(`${tk}.Description`)}</p>+ <p className="text-sm text-gray-500 dark:text-gray-400 mb-4">{t('items.trash.description')}</p><ul className="space-y-2">{items.map(item => {const daysRemaining = getDaysRemaining(item.DeletedAt);@@ -208,19 +206,19 @@ const RecentlyDeleted: React.FC = () => {<div className="flex-1 min-w-0"><div className="flex items-center gap-2"><ItemIcon item={item} sizeClass="w-6 h-6" />- <span data-item-name className="font-medium text-gray-900 dark:text-white truncate">{item.Name || t(`${tk}.Untitled`)}</span>+ <span data-item-name className="font-medium text-gray-900 dark:text-white truncate">{item.Name || t('items.untitled')}</span></div><div className="text-xs text-gray-500 dark:text-gray-400 mt-1">- {daysRemaining > 0 ? t(`${tk}.DaysRemaining`, { 0: daysRemaining }) : <span className="text-red-500">{t(`${tk}.ExpiringSoon`)}</span>}+ {daysRemaining > 0 ? t('items.trash.daysRemaining', { days: daysRemaining }) : <span className="text-red-500">{t('items.recentlyDeleted.expiringSoon')}</span>}</div></div><div className="flex items-center gap-2"><button type="button" data-action="restore" disabled={isBusy} onClick={() => void restoreItem(item)} className="px-3 py-1 text-sm bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 rounded hover:bg-green-200 dark:hover:bg-green-900/50 disabled:opacity-50">- {t(`${tk}.Restore`)}+ {t('items.recentlyDeleted.restore')}</button><button type="button" data-action="delete" disabled={isBusy} onClick={() => setItemToDelete({ Id: item.Id, ManifestId: item.ManifestId })} className="px-3 py-1 text-sm bg-red-100 dark:bg-red-900/30 text-red-700 dark:text-red-400 rounded hover:bg-red-200 dark:hover:bg-red-900/50 disabled:opacity-50">- {t('sharedResources.Delete')}+ {t('common.delete')}</button></div></div>@@ -237,30 +235,30 @@ const RecentlyDeleted: React.FC = () => {<FormModalisOpen={itemToDelete !== null}- title={t(`${tk}.ConfirmDeleteTitle`)}+ title={t('items.trash.confirmDeleteTitle')}icon={<DeleteIcon />}iconBackgroundClass="bg-red-100 dark:bg-red-900/30"- confirmText={t(`${tk}.DeletePermanently`)}- cancelText={t('sharedResources.Cancel')}+ confirmText={t('items.recentlyDeleted.deletePermanently')}+ cancelText={t('common.cancel')}confirmButtonClass="bg-red-600 hover:bg-red-700"isLoading={isBusy}onConfirm={() => void confirmDelete()}onClose={() => !isBusy && setItemToDelete(null)}>- <p className="text-sm text-gray-500 dark:text-gray-400">{t(`${tk}.ConfirmDeleteMessage`)}</p>+ <p className="text-sm text-gray-500 dark:text-gray-400">{t('items.trash.confirmDeleteMessage')}</p></FormModal><FormModalisOpen={showEmptyAllModal}- title={t(`${tk}.ConfirmEmptyAllTitle`)}+ title={t('items.trash.confirmEmptyAllTitle')}icon={<DeleteIcon />}iconBackgroundClass="bg-red-100 dark:bg-red-900/30"- confirmText={t(`${tk}.EmptyAll`)}- cancelText={t('sharedResources.Cancel')}+ confirmText={t('items.trash.emptyAll')}+ cancelText={t('common.cancel')}confirmButtonClass="bg-red-600 hover:bg-red-700"isLoading={isBusy}onConfirm={() => void confirmEmptyAll()}onClose={() => !isBusy && setShowEmptyAllModal(false)}>- <p className="text-sm text-gray-500 dark:text-gray-400">{t(`${tk}.ConfirmEmptyAllMessage`, { 0: items.length })}</p>+ <p className="text-sm text-gray-500 dark:text-gray-400">{t('items.trash.confirmEmptyAllMessage', { count: items.length })}</p></FormModal></>);diff --git a/apps/web/src/pages/items/View.tsx b/apps/web/src/pages/items/View.tsxindex af7ac139a..b5077c8ba 100644--- a/apps/web/src/pages/items/View.tsx+++ b/apps/web/src/pages/items/View.tsx@@ -69,7 +69,7 @@ const ItemView: React.FC = () => {const notifications = useNotifications();const domains = useEmailDomains();const { executeVaultMutationAsync } = useVaultMutate();- usePageTitle(t('pages.main.items.view.ViewItemPageTitle'));+ usePageTitle(t('items.view.viewItemTitle'));const [isLoading, setIsLoading] = useState(true);const [item, setItem] = useState<Item | null>(null);@@ -94,7 +94,7 @@ const ItemView: React.FC = () => {const ref = { Id: id, ManifestId: manifestId };const loaded = client.items.getById(ref);if (!loaded) {- notifications.addErrorMessage(t('pages.main.items.view.ItemNotFoundError'));+ notifications.addErrorMessage(t('items.view.itemNotFoundError'));navigate('/items', { replace: true });return;}@@ -103,7 +103,7 @@ const ItemView: React.FC = () => {const folderRef = loaded.FolderId ? { Id: loaded.FolderId, ManifestId: loaded.ManifestId } : null;const itemFolder = folderRef ? allFolders.find(f => f.Id === folderRef.Id && f.ManifestId === folderRef.ManifestId) ?? null : null;const crumbs = folderRef ? buildFolderBreadcrumbs(folderRef, allFolders) : [];- crumbs.push({ displayName: t('pages.main.items.view.ViewItemBreadcrumb') });+ crumbs.push({ displayName: t('items.view.viewItemTitle') });setItem(loaded);setFolder(itemFolder);@@ -136,7 +136,7 @@ const ItemView: React.FC = () => {return;}if (!item) {- notifications.addErrorMessage(t('pages.main.items.delete.DeleteItemNotFoundError'), true);+ notifications.addErrorMessage(t('items.delete.deleteItemNotFoundError'), true);setShowDeleteModal(false);return;}@@ -146,7 +146,7 @@ const ItemView: React.FC = () => {await executeVaultMutationAsync(async () => {await dbContext.sqliteClient?.items.trash(item);});- notifications.addSuccessMessage(t('pages.main.items.delete.DeleteSuccessMessage'));+ notifications.addSuccessMessage(t('items.delete.deleteSuccessMessage'));navigate('/items');} finally {setIsDeleting(false);@@ -172,14 +172,14 @@ const ItemView: React.FC = () => {<><PageHeaderbreadcrumbItems={breadcrumbItems}- title={t('pages.main.items.view.ViewItemTitle')}+ title={t('items.view.viewItemTitle')}titleSuffix={<ItemTypePill itemType={item.ItemType} />}customActions={(<>- <LinkButton smallText={t('pages.main.items.view.EditButtonMobile')} text={t('pages.main.items.view.EditButtonDesktop')} href={itemRoute(item, true)} color="primary" />+ <LinkButton smallText={t('common.edit')} text={t('items.editItem')} href={itemRoute(item, true)} color="primary" /><Button color="danger" onClick={() => setShowDeleteModal(true)}>- <span className="md:hidden">{t('pages.main.items.view.DeleteButtonMobile')}</span>- <span className="hidden md:inline">{t('pages.main.items.view.DeleteButtonDesktop')}</span>+ <span className="md:hidden">{t('common.delete')}</span>+ <span className="hidden md:inline">{t('items.deleteItem')}</span></Button></>)}@@ -192,7 +192,7 @@ const ItemView: React.FC = () => {<div className="items-center flex space-x-4"><ItemIcon item={item} altText={item.Name ?? 'Item'} sizeClass="w-14 h-14" /><div className="flex-1 min-w-0">- <h3 className="mb-1 text-xl font-bold text-gray-900 dark:text-white truncate">{item.Name ?? t('pages.main.items.view.Untitled')}</h3>+ <h3 className="mb-1 text-xl font-bold text-gray-900 dark:text-white truncate">{item.Name ?? t('items.untitled')}</h3>{urlValues.map((url) => (<div key={url} className="text-sm truncate">{/^https?:\/\//i.test(url)@@ -215,7 +215,7 @@ const ItemView: React.FC = () => {{totpCodes.length > 0 && <TotpViewer totpCodes={totpCodes} item={item} />}{item.ItemType !== ItemTypes.Note && notesFields.length > 0 && (- <Section title={t('pages.main.items.view.NotesSection')}>+ <Section title={t('common.notes')}><FieldGrid fields={notesFields} item={item} hideLabel withForm={false} /></Section>)}@@ -226,9 +226,9 @@ const ItemView: React.FC = () => {<div className="col-span-1 md:col-span-2 lg:col-span-2">{isLoginLike && loginFields.length > 0 && (<Card variant="section">- <SectionTitle className="mb-2">{t('pages.main.items.view.LoginDetailsSection')}</SectionTitle>+ <SectionTitle className="mb-2">{t('items.view.loginDetailsSection')}</SectionTitle><p className="mb-4 text-sm text-gray-600 dark:text-gray-400">- <span>{domains.isAliasVaultSupportedDomain(emailAddress) ? t('pages.main.items.view.GeneratedItemDescription') : t('pages.main.items.view.StoredItemDescription')}</span>+ <span>{domains.isAliasVaultSupportedDomain(emailAddress) ? t('items.view.generatedItemDescription') : t('items.view.storedItemDescription')}</span></p>{passkey && (@@ -239,23 +239,23 @@ const ItemView: React.FC = () => {</svg><div className="flex-1"><div className="mb-1">- <span className="text-sm font-semibold text-gray-900 dark:text-white">{t('pages.main.items.view.PasskeyLabel')}</span>+ <span className="text-sm font-semibold text-gray-900 dark:text-white">{t('passkeys.passkey')}</span></div><div className="space-y-1 mb-2">{passkey.RpId.trim().length > 0 && (<div>- <span className="text-xs text-gray-500 dark:text-gray-400">{t('pages.main.items.view.PasskeySiteLabel')}: </span>+ <span className="text-xs text-gray-500 dark:text-gray-400">{t('passkeys.site')}: </span><span className="text-sm text-gray-900 dark:text-white">{passkey.RpId}</span></div>)}{(passkey.DisplayName ?? '').trim().length > 0 && (<div>- <span className="text-xs text-gray-500 dark:text-gray-400">{t('pages.main.items.view.PasskeyDisplayNameLabel')}: </span>+ <span className="text-xs text-gray-500 dark:text-gray-400">{t('items.itemName')}: </span><span className="text-sm text-gray-900 dark:text-white">{passkey.DisplayName}</span></div>)}</div>- <p className="text-xs text-gray-600 dark:text-gray-400">{t('pages.main.items.view.PasskeyHelpText')}</p>+ <p className="text-xs text-gray-600 dark:text-gray-400">{t('items.view.passkeyHelpText')}</p></div></div></div>@@ -266,12 +266,12 @@ const ItemView: React.FC = () => {)}{item.ItemType === ItemTypes.Alias && aliasFields.length > 0 && (- <Section title={t('pages.main.items.view.AliasSection')}>+ <Section title={t('common.alias')}><form action="#"><div className="grid grid-cols-6 gap-6">{firstName.trim().length > 0 && lastName.trim().length > 0 && (<div className="col-span-6">- <CopyPasteFormRow id="alias-full-name" label={t('pages.main.items.view.FullNameLabel')} value={`${firstName} ${lastName}`} item={item} />+ <CopyPasteFormRow id="alias-full-name" label={t('items.fullName')} value={`${firstName} ${lastName}`} item={item} /></div>)}{aliasFields.map((field, index) => (@@ -283,13 +283,13 @@ const ItemView: React.FC = () => {)}{item.ItemType === ItemTypes.CreditCard && cardFields.length > 0 && (- <Section title={t('pages.main.items.view.CardSection')}>+ <Section title={t('items.view.cardSection')}><FieldGrid fields={cardFields} item={item} fullWidth={f => shouldBeFullWidth(f, cardFields)} /></Section>)}{item.ItemType === ItemTypes.Note && notesFields.length > 0 && (- <Section title={t('pages.main.items.view.NotesSection')}>+ <Section title={t('common.notes')}><FieldGrid fields={notesFields} item={item} hideLabel withForm={false} /></Section>)}@@ -305,10 +305,10 @@ const ItemView: React.FC = () => {<FormModalisOpen={showDeleteModal}- title={t('pages.main.items.delete.DeleteItemTitle')}+ title={t('items.deleteItem')}iconBackgroundClass="bg-red-100 dark:bg-red-900/30"- confirmText={t('pages.main.items.delete.YesImSureButton')}- cancelText={t('pages.main.items.delete.NoCancelButton')}+ confirmText={t('items.delete.yesImSureButton')}+ cancelText={t('items.delete.noCancelButton')}confirmButtonClass="bg-red-600 hover:bg-red-700"isLoading={isDeleting}onConfirm={() => void confirmDelete()}@@ -323,7 +323,7 @@ const ItemView: React.FC = () => {</svg>)}>- <p className="text-sm text-gray-500 dark:text-gray-400 mb-3">{t('pages.main.items.delete.DeleteItemDescription', { 0: TRASH_RETENTION_DEFAULT_DAYS })}</p>+ <p className="text-sm text-gray-500 dark:text-gray-400 mb-3">{t('items.delete.deleteItemDescription', { days: TRASH_RETENTION_DEFAULT_DAYS })}</p><div className="bg-gray-50 dark:bg-gray-700/50 rounded-md p-3"><p className="text-sm font-medium text-gray-900 dark:text-white break-all">{item.Name ?? ''}</p></div>diff --git a/apps/web/src/pages/settings/Apps.tsx b/apps/web/src/pages/settings/Apps.tsxindex 38555a530..24beadd47 100644--- a/apps/web/src/pages/settings/Apps.tsx+++ b/apps/web/src/pages/settings/Apps.tsx@@ -31,33 +31,33 @@ const AppRow: React.FC<{ app: AppInfo; buttonText: string; comingSoonText: strin*/const AppsSettings: React.FC = () => {const { t } = useTranslation();- const tk = 'pages.main.settings.apps';- usePageTitle(t(`${tk}.PageTitle`));++ usePageTitle(t('settings.apps.pageTitle'));return (<>- <PageHeader breadcrumbItems={[{ displayName: t(`${tk}.BreadcrumbTitle`) }]} title={t(`${tk}.PageTitle`)} description={t(`${tk}.PageDescription`)} />+ <PageHeader breadcrumbItems={[{ displayName: t('settings.apps.pageTitle') }]} title={t('settings.apps.pageTitle')} description={t('settings.apps.pageDescription')} /><PageContent><Card><div className="mb-6">- <h3 className="text-lg font-medium text-gray-900 dark:text-white mb-2">{t(`${tk}.BrowserExtensionsTitle`)}</h3>- <p className="text-gray-600 dark:text-gray-400">{t(`${tk}.BrowserExtensionsDescription`)}</p>+ <h3 className="text-lg font-medium text-gray-900 dark:text-white mb-2">{t('settings.apps.browserExtensionsTitle')}</h3>+ <p className="text-gray-600 dark:text-gray-400">{t('settings.apps.browserExtensionsDescription')}</p></div><div className="mb-8"><div className="grid grid-cols-1 lg:grid-cols-2 gap-4">- {BROWSER_EXTENSIONS.map(app => <AppRow key={app.name} app={app} buttonText={t(`${tk}.InstallButton`)} comingSoonText={t(`${tk}.ComingSoonText`)} />)}+ {BROWSER_EXTENSIONS.map(app => <AppRow key={app.name} app={app} buttonText={t('settings.apps.installButton')} comingSoonText={t('settings.apps.comingSoonText')} />)}</div></div><div className="mb-6">- <h3 className="text-lg font-medium text-gray-900 dark:text-white mb-2">{t(`${tk}.MobileAppsTitle`)}</h3>- <p className="text-gray-600 dark:text-gray-400 mb-4">{t(`${tk}.MobileAppsDescription`)}</p>+ <h3 className="text-lg font-medium text-gray-900 dark:text-white mb-2">{t('settings.apps.mobileAppsTitle')}</h3>+ <p className="text-gray-600 dark:text-gray-400 mb-4">{t('settings.apps.mobileAppsDescription')}</p></div><div className="grid grid-cols-1 lg:grid-cols-2 gap-4">- {MOBILE_APPS.map(app => <AppRow key={app.name} app={app} buttonText={t(`${tk}.DownloadButton`)} comingSoonText={t(`${tk}.ComingSoonText`)} />)}+ {MOBILE_APPS.map(app => <AppRow key={app.name} app={app} buttonText={t('settings.apps.downloadButton')} comingSoonText={t('settings.apps.comingSoonText')} />)}</div></Card></PageContent>diff --git a/apps/web/src/pages/settings/FamilySharing.tsx b/apps/web/src/pages/settings/FamilySharing.tsxindex f4e4ba2fb..2ea807f73 100644--- a/apps/web/src/pages/settings/FamilySharing.tsx+++ b/apps/web/src/pages/settings/FamilySharing.tsx@@ -269,8 +269,8 @@ const FamilySharing: React.FC = () => {const removeAccess = async (group: GroupInfo, manifest: SharedManifestInfo, member: GroupMemberInfo, isSelf: boolean): Promise<void> => {const vault = vaultLabel(manifest);const confirmed = isSelf- ? await showConfirmation(familySharingText.leaveVault, familySharingText.leaveVaultConfirm(vault), familySharingText.leaveVault, t('sharedResources.Cancel'))- : await showConfirmation(familySharingText.revoke, `${familySharingText.revokeAccessConfirm(member.username, vault)}\n\n${familySharingText.revokeAccessWarning}`, familySharingText.revoke, t('sharedResources.Cancel'));+ ? await showConfirmation(familySharingText.leaveVault, familySharingText.leaveVaultConfirm(vault), familySharingText.leaveVault, t('common.cancel'))+ : await showConfirmation(familySharingText.revoke, `${familySharingText.revokeAccessConfirm(member.username, vault)}\n\n${familySharingText.revokeAccessWarning}`, familySharingText.revoke, t('common.cancel'));if (!confirmed) {return;}@@ -286,7 +286,7 @@ const FamilySharing: React.FC = () => {* @param target - the shared manifest to delete.*/const startVaultDelete = async (target: ManifestTarget): Promise<void> => {- const confirmed = await showConfirmation(familySharingText.deleteVault, familySharingText.deleteVaultConfirm(vaultLabel(target.manifest)), t('sharedResources.Delete'), t('sharedResources.Cancel'));+ const confirmed = await showConfirmation(familySharingText.deleteVault, familySharingText.deleteVaultConfirm(vaultLabel(target.manifest)), t('common.delete'), t('common.cancel'));if (confirmed) {setDeletePasswordError('');setPendingVaultDelete(target);@@ -351,7 +351,7 @@ const FamilySharing: React.FC = () => {breadcrumbItems={[{ displayName: familySharingText.title }]}title={familySharingText.title}description={familySharingText.description}- customActions={<RefreshButton onClick={refresh} buttonText={t('sharedResources.Refresh')} />}+ customActions={<RefreshButton onClick={refresh} buttonText={t('common.refresh')} />}titleSuffix={<span className="px-2 py-0.5 text-xs font-semibold rounded-full bg-primary-100 dark:bg-primary-900 text-primary-700 dark:text-primary-300 uppercase tracking-wide">{familySharingText.beta}</span>}/>@@ -451,7 +451,7 @@ const FamilySharing: React.FC = () => {<buttondisabled={busy}onClick={() => setOpenVaultMenuId(previous => (previous === manifest.manifestId ? null : manifest.manifestId))}- aria-label={t('sharedResources.Edit')}+ aria-label={t('common.edit')}className="p-1.5 rounded-md text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-700 disabled:opacity-50"><svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">@@ -473,7 +473,7 @@ const FamilySharing: React.FC = () => {}}className="w-full px-4 py-2 text-left text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-600">- {t('components.folders.folderModal.EditFolderTitle')}+ {t('items.folders.editFolder')}</button>)}<buttondiff --git a/apps/web/src/pages/settings/General.tsx b/apps/web/src/pages/settings/General.tsxindex 08246866d..bd99e0f0f 100644--- a/apps/web/src/pages/settings/General.tsx+++ b/apps/web/src/pages/settings/General.tsx@@ -29,8 +29,8 @@ const GeneralSettings: React.FC = () => {const { t, i18n } = useTranslation();const dbContext = useDb();const { executeVaultMutationInBackground } = useVaultMutate();- const tk = 'pages.main.settings.general';- usePageTitle(t(`${tk}.PageTitle`));++ usePageTitle(t('settings.general.pageTitle'));const [privateDomains, setPrivateDomains] = useState<string[]>([]);const [publicDomains, setPublicDomains] = useState<string[]>([]);@@ -115,39 +115,39 @@ const GeneralSettings: React.FC = () => {return (<>- <PageHeader breadcrumbItems={[{ displayName: t(`${tk}.BreadcrumbTitle`) }]} title={t(`${tk}.PageTitle`)} description={t(`${tk}.PageDescription`)} />+ <PageHeader breadcrumbItems={[{ displayName: t('settings.general.pageTitle') }]} title={t('settings.general.pageTitle')} description={t('settings.general.pageDescription')} /><PageContent><Card>- <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t(`${tk}.AppLanguageTitle`)}</h3>+ <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t('settings.general.appLanguageTitle')}</h3><div className="mb-4">- <FormLabel htmlFor="appLanguage">{t(`${tk}.AppLanguageLabel`)}</FormLabel>+ <FormLabel htmlFor="appLanguage">{t('settings.language')}</FormLabel><Select id="appLanguage" value={appLanguage} onChange={e => void updateAppLanguage(e.target.value)}>{AVAILABLE_LANGUAGES.map(language => <option key={language.code} value={language.code}>{language.flag} {language.nativeName}</option>)}</Select>- <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t(`${tk}.AppLanguageDescription`)}</span>+ <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t('settings.general.appLanguageDescription')}</span></div></Card><Card>- <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t(`${tk}.EmailSettingsTitle`)}</h3>+ <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t('settings.general.emailSettingsTitle')}</h3><div className="mb-4">- <FormLabel htmlFor="defaultEmailDomain">{t(`${tk}.DefaultEmailDomainLabel`)}</FormLabel>+ <FormLabel htmlFor="defaultEmailDomain">{t('settings.general.defaultEmailDomainLabel')}</FormLabel><Select id="defaultEmailDomain" value={defaultEmailDomain} onChange={(e) => {setDefaultEmailDomain(e.target.value);void updateSetting('DefaultEmailDomain', e.target.value);}}>- <optgroup label={t(`${tk}.PrivateDomainsLabel`)}>+ <optgroup label={t('settings.general.privateDomainsLabel')}>{hasValidPrivateDomains(privateDomains)? privateDomains.map(domain => <option key={domain} value={domain}>{domain}</option>)- : <option disabled value="_">{t(`${tk}.PrivateDomainsDisabledLabel`)}</option>}+ : <option disabled value="_">{t('settings.general.privateDomainsDisabledLabel')}</option>}</optgroup>- <optgroup label={t(`${tk}.PublicDomainsLabel`)}>+ <optgroup label={t('settings.general.publicDomainsLabel')}>{publicDomains.map(domain => <option key={domain} value={domain}>{domain}</option>)}</optgroup></Select><span className="block text-sm font-normal text-gray-500 dark:text-gray-400 mt-2">- {t(`${tk}.DefaultEmailDomainDescription`)} {t(`${tk}.DefaultEmailDomainDescriptionNote`)} <a href="https://docs.aliasvault.com/misc/private-vs-public-email.html" className="text-primary-500 hover:text-primary-700 hover:underline" target="_blank" rel="noopener noreferrer">{t(`${tk}.DefaultEmailDomainLearnMore`)}</a>.+ {t('settings.general.defaultEmailDomainDescription')} {t('settings.general.defaultEmailDomainDescriptionNote')} <a href="https://docs.aliasvault.com/misc/private-vs-public-email.html" className="text-primary-500 hover:text-primary-700 hover:underline" target="_blank" rel="noopener noreferrer">{t('settings.general.defaultEmailDomainLearnMore')}</a>.</span></div>@@ -156,71 +156,71 @@ const GeneralSettings: React.FC = () => {setAutoEmailRefresh(e.target.checked);void updateSetting('AutoEmailRefresh', e.target.checked ? 'True' : 'False');}} className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600" />- <label htmlFor="autoEmailRefresh" className="ml-2 text-sm font-medium text-gray-900 dark:text-gray-300">{t(`${tk}.AutoEmailRefreshLabel`)}</label>+ <label htmlFor="autoEmailRefresh" className="ml-2 text-sm font-medium text-gray-900 dark:text-gray-300">{t('settings.general.autoEmailRefreshLabel')}</label></div></Card><Card>- <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t(`${tk}.AliasSettingsTitle`)}</h3>+ <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t('settings.general.aliasSettingsTitle')}</h3><div className="mb-4">- <FormLabel htmlFor="defaultIdentityLanguage">{t(`${tk}.AliasGenerationLanguageLabel`)}</FormLabel>+ <FormLabel htmlFor="defaultIdentityLanguage">{t('settings.language')}</FormLabel><Select id="defaultIdentityLanguage" value={identityLanguage} onChange={(e) => {setIdentityLanguage(e.target.value);void updateSetting('DefaultIdentityLanguage', e.target.value);}}>{identityLanguages.map(code => <option key={code} value={code}>{getLanguageInfo(code).flag} {getLanguageInfo(code).label}</option>)}</Select>- <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t(`${tk}.AliasGenerationLanguageDescription`)}</span>+ <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t('settings.general.aliasGenerationLanguageDescription')}</span></div><div className="mb-4">- <FormLabel htmlFor="defaultIdentityGender">{t(`${tk}.AliasGenerationGenderLabel`)}</FormLabel>+ <FormLabel htmlFor="defaultIdentityGender">{t('fieldLabels.alias.gender')}</FormLabel><Select id="defaultIdentityGender" value={identityGender} onChange={(e) => {setIdentityGender(e.target.value);void updateSetting('DefaultIdentityGender', e.target.value);}}>- <option value="random">{t(`${tk}.RandomOption`)}</option>- <option value="male">{t(`${tk}.MaleOption`)}</option>- <option value="female">{t(`${tk}.FemaleOption`)}</option>+ <option value="random">{t('settings.identityGeneratorSettings.genderOptions.random')}</option>+ <option value="male">{t('settings.identityGeneratorSettings.genderOptions.male')}</option>+ <option value="female">{t('settings.identityGeneratorSettings.genderOptions.female')}</option></Select>- <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t(`${tk}.AliasGenerationGenderDescription`)}</span>+ <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t('settings.general.aliasGenerationGenderDescription')}</span></div><div className="mb-4">- <FormLabel htmlFor="defaultIdentityAgeRange">{t(`${tk}.AliasGenerationAgeRangeLabel`)}</FormLabel>+ <FormLabel htmlFor="defaultIdentityAgeRange">{t('settings.identityGeneratorSettings.ageRangeSection')}</FormLabel><Select id="defaultIdentityAgeRange" value={identityAgeRange} onChange={(e) => {setIdentityAgeRange(e.target.value);void updateSetting('DefaultIdentityAgeRange', e.target.value);}}>- {ageRanges.map(range => <option key={range} value={range}>{range === 'random' ? t(`${tk}.RandomOption`) : range}</option>)}+ {ageRanges.map(range => <option key={range} value={range}>{range === 'random' ? t('settings.identityGeneratorSettings.genderOptions.random') : range}</option>)}</Select>- <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t(`${tk}.AliasGenerationAgeRangeDescription`)}</span>+ <span className="block text-sm font-normal text-gray-500 truncate dark:text-gray-400">{t('settings.general.aliasGenerationAgeRangeDescription')}</span></div></Card><Card>- <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t(`${tk}.ClipboardSettingsTitle`)}</h3>+ <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t('settings.clipboardSettings')}</h3><div className="mb-4">- <FormLabel htmlFor="clipboardClearSeconds">{t(`${tk}.ClipboardClearSecondsLabel`)}</FormLabel>+ <FormLabel htmlFor="clipboardClearSeconds">{t('settings.general.clipboardClearSecondsLabel')}</FormLabel><Select id="clipboardClearSeconds" value={clipboardClearSeconds} onChange={(e) => {setClipboardClearSeconds(e.target.value);void updateSetting('ClipboardClearSeconds', e.target.value);}}>- <option value="0">{t(`${tk}.ClipboardClearDisabledOption`)}</option>- <option value="5">{t(`${tk}.ClipboardClear5SecondsOption`)}</option>- <option value="10">{t(`${tk}.ClipboardClear10SecondsOption`)}</option>- <option value="15">{t(`${tk}.ClipboardClear15SecondsOption`)}</option>+ <option value="0">{t('common.disabled')}</option>+ <option value="5">{t('common.duration.5seconds')}</option>+ <option value="10">{t('settings.clipboardClearOptions.10seconds')}</option>+ <option value="15">{t('common.duration.15seconds')}</option></Select>- <span className="block text-sm font-normal text-gray-500 dark:text-gray-400">{t(`${tk}.ClipboardClearSecondsDescription`)}</span>+ <span className="block text-sm font-normal text-gray-500 dark:text-gray-400">{t('settings.general.clipboardClearSecondsDescription')}</span><div className="mt-2 p-3 bg-yellow-50 border border-yellow-200 rounded-lg dark:bg-yellow-900/20 dark:border-yellow-800">- <p className="text-sm text-yellow-800 dark:text-yellow-200">{t(`${tk}.ClipboardClearLimitationNote`)}</p>+ <p className="text-sm text-yellow-800 dark:text-yellow-200">{t('settings.general.clipboardClearLimitationNote')}</p></div></div></Card><Card>- <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t(`${tk}.PasswordSettingsTitle`)}</h3>+ <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t('items.passwordSettings')}</h3><DefaultPasswordSettings /></Card></PageContent>diff --git a/apps/web/src/pages/settings/StorageInsights.tsx b/apps/web/src/pages/settings/StorageInsights.tsxindex 979c6bd6c..b5f5cb883 100644--- a/apps/web/src/pages/settings/StorageInsights.tsx+++ b/apps/web/src/pages/settings/StorageInsights.tsx@@ -22,8 +22,6 @@ import { itemRoute } from '@/utils/ItemRoute';import type { AttachmentSizeRow, LogoSizeRow, StorageCounts } from '@aliasvault/client/database/repositories/StorageInsightsRepository';import type { StorageStatisticsResponse } from '@aliasvault/models/webapi';-const tk = 'pages.main.settings.storageInsights';-/** Blob categories as the server stores them. */const ATTACHMENT_CATEGORY = 'attachment';const LOGO_CATEGORY = 'favicon';@@ -90,7 +88,7 @@ const StorageInsights: React.FC = () => {const notifications = useNotifications();const { showConfirmation } = useConfirmModal();const { executeVaultMutationAsync } = useVaultMutate();- usePageTitle(t(`${tk}.PageTitle`));+ usePageTitle(t('settings.storageInsights.pageTitle'));const [localStats, setLocalStats] = useState<LocalStats | null>(null);const [serverStats, setServerStats] = useState<StorageStatisticsResponse | null>(null);@@ -176,9 +174,9 @@ const StorageInsights: React.FC = () => {}}return [- { label: t(`${tk}.BreakdownCredentialsLabel`), bytes: credentials, colorClass: 'bg-blue-500' },- { label: t(`${tk}.BreakdownAttachmentsLabel`), bytes: attachments, colorClass: 'bg-amber-500' },- { label: t(`${tk}.BreakdownLogosLabel`), bytes: logos, colorClass: 'bg-emerald-500' },+ { label: t('common.credentials'), bytes: credentials, colorClass: 'bg-blue-500' },+ { label: t('common.attachments'), bytes: attachments, colorClass: 'bg-amber-500' },+ { label: t('settings.storageInsights.breakdownLogosLabel'), bytes: logos, colorClass: 'bg-emerald-500' },];}, [serverStats, t]);@@ -186,15 +184,15 @@ const StorageInsights: React.FC = () => {const isLogoActionRunning = isDeletingLogos || redownloadProgress !== null;const attachmentColumns: TableColumn[] = [- { title: t(`${tk}.ColumnFilename`) },- { title: t(`${tk}.ColumnSize`) },- { title: t(`${tk}.ColumnItem`) },- { title: t(`${tk}.ColumnCreated`) },+ { title: t('settings.storageInsights.columnFilename') },+ { title: t('settings.storageInsights.columnSize') },+ { title: t('settings.storageInsights.columnItem') },+ { title: t('settings.storageInsights.columnCreated') },];const logoColumns: TableColumn[] = [- { title: t(`${tk}.ColumnWebsiteURL`) },- { title: t(`${tk}.ColumnSize`) },- { title: t(`${tk}.ColumnItemCount`) },+ { title: t('fieldLabels.login.url') },+ { title: t('settings.storageInsights.columnSize') },+ { title: t('settings.storageInsights.columnItemCount') },];/**@@ -205,7 +203,7 @@ const StorageInsights: React.FC = () => {if (!client || isLogoActionRunning) {return;}- const confirmed = await showConfirmation(t(`${tk}.DeleteAllLogosConfirmTitle`), t(`${tk}.DeleteAllLogosConfirmMessage`), t('sharedResources.Confirm'), t('sharedResources.Cancel'));+ const confirmed = await showConfirmation(t('settings.storageInsights.deleteAllLogosConfirmTitle'), t('settings.storageInsights.deleteAllLogosConfirmMessage'), t('common.confirm'), t('common.cancel'));if (!confirmed) {return;}@@ -215,11 +213,11 @@ const StorageInsights: React.FC = () => {await executeVaultMutationAsync(async () => {removed = await client.logos.deleteAllFavicons();});- notifications.addSuccessMessage(t(`${tk}.DeleteAllLogosSuccessMessage`, { 0: removed }), true);+ notifications.addSuccessMessage(t('settings.storageInsights.deleteAllLogosSuccessMessage', { count: removed }), true);} catch (error) {console.error('Failed to delete the logos:', error);if (!(error instanceof VaultPushFailedError)) {- notifications.addErrorMessage(t('sharedResources.ErrorGeneric'), true);+ notifications.addErrorMessage(t('common.errorGeneric'), true);}} finally {setIsDeletingLogos(false);@@ -235,7 +233,7 @@ const StorageInsights: React.FC = () => {if (!client || isLogoActionRunning) {return;}- const confirmed = await showConfirmation(t(`${tk}.RedownloadAllLogosConfirmTitle`), t(`${tk}.RedownloadAllLogosConfirmMessage`), t('sharedResources.Confirm'), t('sharedResources.Cancel'));+ const confirmed = await showConfirmation(t('settings.storageInsights.redownloadAllLogosConfirmTitle'), t('settings.storageInsights.redownloadAllLogosConfirmMessage'), t('common.confirm'), t('common.cancel'));if (!confirmed) {return;}@@ -249,14 +247,14 @@ const StorageInsights: React.FC = () => {changed = result.changedItems;});if (rateLimited) {- notifications.addErrorMessage(t('sharedResources.ErrorGeneric'), true);+ notifications.addErrorMessage(t('common.errorGeneric'), true);} else {- notifications.addSuccessMessage(t(`${tk}.RedownloadAllLogosSuccessMessage`, { 0: changed }), true);+ notifications.addSuccessMessage(t('settings.storageInsights.redownloadAllLogosSuccessMessage', { count: changed }), true);}} catch (error) {console.error('Failed to re-download the logos:', error);if (!(error instanceof VaultPushFailedError)) {- notifications.addErrorMessage(t('sharedResources.ErrorGeneric'), true);+ notifications.addErrorMessage(t('common.errorGeneric'), true);}} finally {setRedownloadProgress(null);@@ -266,41 +264,41 @@ const StorageInsights: React.FC = () => {return (<>- <PageHeader breadcrumbItems={[{ displayName: t(`${tk}.BreadcrumbTitle`) }]} title={t(`${tk}.PageTitle`)} description={t(`${tk}.PageDescription`)} />+ <PageHeader breadcrumbItems={[{ displayName: t('settings.storageInsights.breadcrumbTitle') }]} title={t('settings.storageInsights.pageTitle')} description={t('settings.storageInsights.pageDescription')} /><PageContent><Card>- <h3 className="mb-2 text-lg font-medium text-gray-900 dark:text-white">{t(`${tk}.ServerTotalTitle`)}</h3>+ <h3 className="mb-2 text-lg font-medium text-gray-900 dark:text-white">{t('settings.storageInsights.serverTotalTitle')}</h3>{serverStatsFailed ? (- <p className="text-sm text-gray-500 dark:text-gray-400">{t('sharedResources.ErrorGeneric')}</p>+ <p className="text-sm text-gray-500 dark:text-gray-400">{t('common.errorGeneric')}</p>) : serverStats ? (<><p className="text-4xl font-semibold text-gray-900 dark:text-white">{formatBytes(totalBytes)}</p>- <p className="mt-2 text-sm text-gray-500 dark:text-gray-400">{t(`${tk}.ServerTotalDescription`)}</p>+ <p className="mt-2 text-sm text-gray-500 dark:text-gray-400">{t('settings.storageInsights.serverTotalDescription')}</p></>) : (- <p className="text-gray-600 dark:text-gray-400">{t('sharedResources.Loading')}</p>+ <p className="text-gray-600 dark:text-gray-400">{t('common.loading')}</p>)}</Card><Card>- <CardHeading title={t(`${tk}.CountsTitle`)} />+ <CardHeading title={t('settings.storageInsights.countsTitle')} />{localStats ? (<div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-5">- <CountTile label={t(`${tk}.ItemCountLabel`)} value={localStats.counts.ItemCount} />- <CountTile label={t(`${tk}.ItemsWithAttachmentsLabel`)} value={localStats.counts.ItemsWithAttachments} />- <CountTile label={t(`${tk}.ItemsWithLogosLabel`)} value={localStats.counts.ItemsWithLogos} />- <CountTile label={t(`${tk}.BreakdownAttachmentsLabel`)} value={localStats.counts.AttachmentCount} />- <CountTile label={t(`${tk}.BreakdownLogosLabel`)} value={localStats.counts.LogoCount} />+ <CountTile label={t('items.title')} value={localStats.counts.ItemCount} />+ <CountTile label={t('settings.storageInsights.itemsWithAttachmentsLabel')} value={localStats.counts.ItemsWithAttachments} />+ <CountTile label={t('settings.storageInsights.itemsWithLogosLabel')} value={localStats.counts.ItemsWithLogos} />+ <CountTile label={t('common.attachments')} value={localStats.counts.AttachmentCount} />+ <CountTile label={t('settings.storageInsights.breakdownLogosLabel')} value={localStats.counts.LogoCount} /></div>) : (- <p className="text-gray-600 dark:text-gray-400">{t('sharedResources.Loading')}</p>+ <p className="text-gray-600 dark:text-gray-400">{t('common.loading')}</p>)}</Card>{totalBytes > 0 && (<Card>- <CardHeading title={t(`${tk}.BreakdownTitle`)} />+ <CardHeading title={t('settings.storageInsights.breakdownTitle')} /><div className="flex w-full h-4 overflow-hidden rounded-full bg-gray-200 dark:bg-gray-700">{segments.map(segment => (<div key={segment.label} className={segment.colorClass} style={{ width: `${percent(segment.bytes, totalBytes).toFixed(2)}%` }} title={segment.label}></div>@@ -321,7 +319,7 @@ const StorageInsights: React.FC = () => {{localStats && (<><Card>- <CardHeading title={t(`${tk}.TopAttachmentsTitle`)} description={t(`${tk}.TopAttachmentsDescription`)} />+ <CardHeading title={t('settings.storageInsights.topAttachmentsTitle')} description={t('settings.storageInsights.topAttachmentsDescription')} />{localStats.attachments.length === 0 ? (<p className="text-sm text-gray-500 dark:text-gray-400">-</p>) : (@@ -339,7 +337,7 @@ const StorageInsights: React.FC = () => {</Card><Card>- <CardHeading title={t(`${tk}.TopLogosTitle`)} description={t(`${tk}.TopLogosDescription`)} />+ <CardHeading title={t('settings.storageInsights.topLogosTitle')} description={t('settings.storageInsights.topLogosDescription')} />{localStats.logos.length === 0 ? (<p className="text-sm text-gray-500 dark:text-gray-400">-</p>) : (@@ -361,11 +359,11 @@ const StorageInsights: React.FC = () => {)}<Card>- <CardHeading title={t(`${tk}.LogoManagementTitle`)} description={t(`${tk}.LogoManagementDescription`)} />+ <CardHeading title={t('settings.storageInsights.logoManagementTitle')} description={t('settings.storageInsights.logoManagementDescription')} />{redownloadProgress && (<div className="mb-4"><div className="flex justify-between text-sm text-gray-700 dark:text-gray-300 mb-1">- <span>{t('sharedResources.Loading')}</span>+ <span>{t('common.loading')}</span><span>{redownloadProgress.processed} / {redownloadProgress.total}</span></div><div className="w-full bg-gray-200 rounded-full h-2.5 dark:bg-gray-700">@@ -374,8 +372,8 @@ const StorageInsights: React.FC = () => {</div>)}<div className="flex flex-col sm:flex-row gap-3">- <Button color="secondary" isDisabled={isLogoActionRunning} onClick={() => void redownloadAllLogos()}>{t(`${tk}.RedownloadAllLogosButton`)}</Button>- <Button color="danger" isDisabled={isLogoActionRunning} onClick={() => void deleteAllLogos()}>{t(`${tk}.DeleteAllLogosButton`)}</Button>+ <Button color="secondary" isDisabled={isLogoActionRunning} onClick={() => void redownloadAllLogos()}>{t('settings.storageInsights.redownloadAllLogosButton')}</Button>+ <Button color="danger" isDisabled={isLogoActionRunning} onClick={() => void deleteAllLogos()}>{t('settings.storageInsights.deleteAllLogosButton')}</Button></div></Card></PageContent>diff --git a/apps/web/src/pages/settings/importexport/ImportExport.tsx b/apps/web/src/pages/settings/importexport/ImportExport.tsxindex 38175fe27..41c5de093 100644--- a/apps/web/src/pages/settings/importexport/ImportExport.tsx+++ b/apps/web/src/pages/settings/importexport/ImportExport.tsx@@ -34,8 +34,8 @@ enum ExportType {*/const ImportExport: React.FC = () => {const { t } = useTranslation();- const tk = 'pages.main.settings.importExport.importExport';- usePageTitle(t(`${tk}.PageTitle`));++ usePageTitle(t('settings.importExport'));const dbContext = useDb();const { username } = useAuth();const { showConfirmation } = useConfirmModal();@@ -62,9 +62,9 @@ const ImportExport: React.FC = () => {*/const showExportConfirmation = async (exportType: ExportType): Promise<void> => {setCurrentExportType(exportType);- const confirmMessage = exportType === ExportType.Avex ? t(`${tk}.ExportEncryptedWarningMessage`) : t(`${tk}.ExportWarningMessage`);+ const confirmMessage = exportType === ExportType.Avex ? t('importExport.exportEncryptedWarningMessage') : t('importExport.exportWarningMessage');- const confirmed = await showConfirmation(t(`${tk}.ExportConfirmTitle`), confirmMessage, t('sharedResources.Confirm'), t('sharedResources.Cancel'));+ const confirmed = await showConfirmation(t('settings.exportConfirmTitle'), confirmMessage, t('common.confirm'), t('common.cancel'));if (!confirmed) {return;}@@ -96,10 +96,10 @@ const ImportExport: React.FC = () => {throw new Error('Vault is not available');}downloadBytes(getExportFileName('csv'), sqliteClient.importExport.exportToCsv(), 'text/csv');- notifications.addSuccessMessage(t(`${tk}.ExportSuccessMessage`), true);+ notifications.addSuccessMessage(t('importExport.exportSuccessMessage'), true);} catch (error) {console.error('[Export] Error downloading file:', error);- notifications.addErrorMessage(t('sharedResources.ErrorGeneric'), true);+ notifications.addErrorMessage(t('common.errorGeneric'), true);}};@@ -107,13 +107,13 @@ const ImportExport: React.FC = () => {* Export the vault to .avux.*/const exportVaultAvux = async (): Promise<void> => {- showLoading(t(`${tk}.ExportingVaultMessage`));+ showLoading(t('importExport.exportingVaultMessage'));try {downloadBytes(getExportFileName('avux'), generateAvuxBytes());- notifications.addSuccessMessage(t(`${tk}.ExportSuccessMessage`), true);+ notifications.addSuccessMessage(t('importExport.exportSuccessMessage'), true);} catch (error) {console.error('[Export] Error exporting vault to .avux format:', error);- notifications.addErrorMessage(t('sharedResources.ErrorGeneric'), true);+ notifications.addErrorMessage(t('common.errorGeneric'), true);} finally {hideLoading();}@@ -123,14 +123,14 @@ const ImportExport: React.FC = () => {* Export the vault to .avex, encrypted with the given password.*/const exportVaultAvex = async (exportPassword: string): Promise<void> => {- showLoading(t(`${tk}.ExportingVaultMessage`));+ showLoading(t('importExport.exportingVaultMessage'));try {const avexBytes = await AvexExportService.encryptToAvex(generateAvuxBytes(), exportPassword, username ?? '');downloadBytes(getExportFileName('avex'), avexBytes);- notifications.addSuccessMessage(t(`${tk}.ExportSuccessMessage`), true);+ notifications.addSuccessMessage(t('importExport.exportSuccessMessage'), true);} catch (error) {console.error('[Export] Error exporting vault to .avex format:', error);- notifications.addErrorMessage(t('sharedResources.ErrorGeneric'), true);+ notifications.addErrorMessage(t('common.errorGeneric'), true);} finally {hideLoading();}@@ -149,7 +149,7 @@ const ImportExport: React.FC = () => {downloadBytes(getExportFileName('sqlite'), sqliteClient.exportToBytes());} catch (error) {console.error('[Export] Error exporting raw SQLite vault:', error);- notifications.addErrorMessage(t('sharedResources.ErrorGeneric'), true);+ notifications.addErrorMessage(t('common.errorGeneric'), true);} finally {hideLoading();}@@ -178,13 +178,13 @@ const ImportExport: React.FC = () => {setShowPasswordConfirmation(false);setPasswordError('');- showLoading(t(`${tk}.VerifyingPasswordMessage`));+ showLoading(t('common.verifyingPassword'));try {const isValid = await verifyMasterPassword(password);hideLoading();if (!isValid) {- setPasswordError(t(`${tk}.PasswordIncorrect`));+ setPasswordError(t('importExport.passwordIncorrect'));setShowPasswordConfirmation(true);} else if (currentExportType === ExportType.Avex) {setShowExportPasswordModal(true);@@ -194,7 +194,7 @@ const ImportExport: React.FC = () => {} catch (error) {console.error('[Export] Error verifying password:', error);hideLoading();- setPasswordError(t(`${tk}.PasswordVerificationFailed`));+ setPasswordError(t('importExport.passwordVerificationFailed'));setShowPasswordConfirmation(true);}};@@ -209,47 +209,47 @@ const ImportExport: React.FC = () => {return (<>- <PageHeader breadcrumbItems={[{ displayName: t(`${tk}.PageTitle`) }]} title={t(`${tk}.PageTitle`)} description={t(`${tk}.PageDescription`)} />+ <PageHeader breadcrumbItems={[{ displayName: t('settings.importExport') }]} title={t('settings.importExport')} description={t('importExport.pageDescription')} /><PageContent><Card className="2xl:col-span-2">- <h3 className="mb-4 text-xl font-semibold dark:text-white">{t(`${tk}.ImportSectionTitle`)}</h3>- <div className="mb-4 text-sm text-gray-500 dark:text-gray-400">{t(`${tk}.ImportSectionDescription`)}</div>+ <h3 className="mb-4 text-xl font-semibold dark:text-white">{t('importExport.importSectionTitle')}</h3>+ <div className="mb-4 text-sm text-gray-500 dark:text-gray-400">{t('importExport.importSectionDescription')}</div><div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4"><ImportServices /></div></Card><Card className="2xl:col-span-2">- <h3 className="mb-4 text-xl font-semibold dark:text-white">{t(`${tk}.ExportSectionTitle`)}</h3>- <p className="text-sm text-gray-500 dark:text-gray-400 mb-4">{t(`${tk}.ExportSectionDescription`)}</p>+ <h3 className="mb-4 text-xl font-semibold dark:text-white">{t('settings.exportConfirmTitle')}</h3>+ <p className="text-sm text-gray-500 dark:text-gray-400 mb-4">{t('importExport.exportSectionDescription')}</p><div className="space-y-3"><div className="flex items-center justify-between p-3 border-2 border-orange-200 dark:border-orange-800 rounded-lg bg-orange-50 dark:bg-orange-900/20"><div className="flex-1 min-w-0 mr-4"><div className="flex items-center gap-2 mb-1">- <h4 className="text-sm font-semibold text-gray-900 dark:text-white">{t(`${tk}.ExportAvexTitle`)}</h4>- <span className="px-1.5 py-0.5 text-xs font-medium text-orange-700 dark:text-orange-300 bg-orange-100 dark:bg-orange-900 rounded">{t(`${tk}.RecommendedLabel`)}</span>+ <h4 className="text-sm font-semibold text-gray-900 dark:text-white">{t('importExport.exportAvexTitle')}</h4>+ <span className="px-1.5 py-0.5 text-xs font-medium text-orange-700 dark:text-orange-300 bg-orange-100 dark:bg-orange-900 rounded">{t('importExport.recommendedLabel')}</span></div>- <p className="text-xs text-gray-600 dark:text-gray-300">{t(`${tk}.ExportAvexDescription`)}</p>+ <p className="text-xs text-gray-600 dark:text-gray-300">{t('importExport.exportAvexDescription')}</p></div>- <Button onClick={() => void showExportConfirmation(ExportType.Avex)}>{t(`${tk}.ExportAvexButton`)}</Button>+ <Button onClick={() => void showExportConfirmation(ExportType.Avex)}>{t('importExport.exportAvexButton')}</Button></div><div className="flex items-center justify-between p-3 border border-gray-200 dark:border-gray-700 rounded-lg"><div className="flex-1 min-w-0 mr-4">- <h4 className="text-sm font-semibold text-gray-900 dark:text-white mb-1">{t(`${tk}.ExportAvuxTitle`)}</h4>- <p className="text-xs text-gray-600 dark:text-gray-300">{t(`${tk}.ExportAvuxDescription`)}</p>+ <h4 className="text-sm font-semibold text-gray-900 dark:text-white mb-1">{t('importExport.exportAvuxTitle')}</h4>+ <p className="text-xs text-gray-600 dark:text-gray-300">{t('importExport.exportAvuxDescription')}</p></div>- <Button onClick={() => void showExportConfirmation(ExportType.Avux)}>{t(`${tk}.ExportAvuxButton`)}</Button>+ <Button onClick={() => void showExportConfirmation(ExportType.Avux)}>{t('importExport.exportAvuxButton')}</Button></div><div className="flex items-center justify-between p-3 border border-gray-200 dark:border-gray-700 rounded-lg"><div className="flex-1 min-w-0 mr-4">- <h4 className="text-sm font-semibold text-gray-900 dark:text-white mb-1">{t(`${tk}.ExportCsvTitle`)}</h4>- <p className="text-xs text-gray-600 dark:text-gray-300">{t(`${tk}.ExportCsvDescription`)}</p>+ <h4 className="text-sm font-semibold text-gray-900 dark:text-white mb-1">{t('importExport.exportCsvTitle')}</h4>+ <p className="text-xs text-gray-600 dark:text-gray-300">{t('importExport.exportCsvDescription')}</p></div>- <Button onClick={() => void showExportConfirmation(ExportType.Csv)}>{t(`${tk}.ExportCsvButton`)}</Button>+ <Button onClick={() => void showExportConfirmation(ExportType.Csv)}>{t('importExport.exportCsvButton')}</Button></div>{isDebugBuild && (@@ -272,8 +272,8 @@ const ImportExport: React.FC = () => {<PasswordConfirmationModalisOpen={showPasswordConfirmation}- title={t(`${tk}.ExportPasswordConfirmTitle`)}- description={t(`${tk}.ExportPasswordConfirmDescription`)}+ title={t('importExport.exportPasswordConfirmTitle')}+ description={t('settings.passwordConfirm.exportDescription')}errorMessage={passwordError}onPasswordSubmitted={password => void handlePasswordSubmitted(password)}onClose={() => {@@ -283,8 +283,8 @@ const ImportExport: React.FC = () => {<ExportPasswordModalisOpen={showExportPasswordModal}- title={t(`${tk}.ExportEncryptedPasswordTitle`)}- description={t(`${tk}.ExportEncryptedPasswordDescription`)}+ title={t('importExport.exportEncryptedPasswordTitle')}+ description={t('importExport.exportEncryptedPasswordDescription')}onPasswordSubmitted={password => void handleExportPasswordSubmitted(password)}onClose={() => setShowExportPasswordModal(false)} /></>diff --git a/apps/web/src/pages/settings/importexport/ResetVault.tsx b/apps/web/src/pages/settings/importexport/ResetVault.tsxindex 914805249..865038485 100644--- a/apps/web/src/pages/settings/importexport/ResetVault.tsx+++ b/apps/web/src/pages/settings/importexport/ResetVault.tsx@@ -22,8 +22,8 @@ import { verifyMasterPassword } from '@/utils/MasterPasswordCheck';*/const ResetVault: React.FC = () => {const { t } = useTranslation();- const tk = 'components.main.pages.settings.importExport.resetVault';- usePageTitle(t(`${tk}.PageTitle`));++ usePageTitle(t('settings.resetVault.pageTitle'));const navigate = useNavigate();const dbContext = useDb();const { username: accountUsername } = useAuth();@@ -43,12 +43,12 @@ const ResetVault: React.FC = () => {notifications.clearMessages();if (username.length === 0) {- notifications.addErrorMessage(t(`${tk}.ResetVaultUsernameRequired`), true);+ notifications.addErrorMessage(t('apiErrors.USERNAME_REQUIRED'), true);return;}if (username.trim().toLowerCase() !== (accountUsername ?? '').trim().toLowerCase()) {- notifications.addErrorMessage(t(`${tk}.ResetVaultUsernameDoesNotMatch`), true);+ notifications.addErrorMessage(t('settings.resetVault.resetVaultUsernameDoesNotMatch'), true);return;}@@ -61,16 +61,16 @@ const ResetVault: React.FC = () => {const resetVaultConfirmed = async (e: React.FormEvent): Promise<void> => {e.preventDefault();if (password.length === 0) {- notifications.addErrorMessage(t('validationMessages.PasswordRequired'), true);+ notifications.addErrorMessage(t('validation.passwordRequired'), true);return;}- showLoading(t(`${tk}.ResetVaultProgressMessage`));+ showLoading(t('settings.resetVault.resetVaultProgressMessage'));notifications.clearMessages();try {if (!await verifyMasterPassword(password)) {- notifications.addErrorMessage(t(`${tk}.ResetVaultPasswordIncorrect`), true);+ notifications.addErrorMessage(t('settings.resetVault.resetVaultPasswordIncorrect'), true);return;}@@ -85,11 +85,11 @@ const ResetVault: React.FC = () => {sqliteClient.settings.updateSetting('TutorialDone', 'True');});- notifications.addSuccessMessage(t(`${tk}.ResetVaultSuccessMessage`));+ notifications.addSuccessMessage(t('settings.resetVault.resetVaultSuccessMessage'));navigate('/items');} catch (error) {console.error('[ResetVault] Error resetting vault:', error);- notifications.addErrorMessage(t(`${tk}.ResetVaultErrorMessage`), true);+ notifications.addErrorMessage(t('settings.resetVault.resetVaultErrorMessage'), true);} finally {hideLoading();}@@ -106,8 +106,8 @@ const ResetVault: React.FC = () => {<><div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900"><div className="mb-4 col-span-full xl:mb-2">- <Breadcrumb items={[{ displayName: t('sharedResources.Home'), url: '/', showHomeIcon: true }, { displayName: t(`${tk}.BreadcrumbImportExport`), url: '/settings/import-export' }, { displayName: t(`${tk}.BreadcrumbResetVault`) }]} />- <H1>{t(`${tk}.PageTitle`)}</H1>+ <Breadcrumb items={[{ displayName: t('common.home'), url: '/', showHomeIcon: true }, { displayName: t('settings.importExport'), url: '/settings/import-export' }, { displayName: t('settings.resetVault.pageTitle') }]} />+ <H1>{t('settings.resetVault.pageTitle')}</H1></div></div>@@ -115,45 +115,45 @@ const ResetVault: React.FC = () => {{!showPasswordConfirm ? (<><div className="mb-6 text-sm text-gray-600 dark:text-gray-400">- <p className="mb-2">{t(`${tk}.ResetVaultPleaseNote`)}</p>+ <p className="mb-2">{t('settings.resetVault.resetVaultPleaseNote')}</p><ul className="list-disc list-inside space-y-2">- <li>{t(`${tk}.ResetVaultItemsDeletedNote`)}</li>- <li>{t(`${tk}.ResetVaultEmailAliasesKeptNote`)}</li>- <li>{t(`${tk}.ResetVaultSettingsKeptNote`)}</li>- <li>{t(`${tk}.ResetVaultIrreversibleNote`)}</li>+ <li>{t('settings.resetVault.resetVaultItemsDeletedNote')}</li>+ <li>{t('settings.resetVault.resetVaultEmailAliasesKeptNote')}</li>+ <li>{t('settings.resetVault.resetVaultSettingsKeptNote')}</li>+ <li>{t('settings.resetVault.resetVaultIrreversibleNote')}</li></ul></div><form onSubmit={confirmUsername}><div className="mb-4">- <FormLabel htmlFor="username">{t(`${tk}.ResetVaultConfirmUsernameLabel`)}</FormLabel>+ <FormLabel htmlFor="username">{t('settings.resetVault.resetVaultConfirmUsernameLabel')}</FormLabel><InputTextField id="username" type="text" value={username} onValueChange={setUsername} /></div><div className="flex space-x-3">- <Button type="submit" color="danger">{t(`${tk}.ResetVaultContinueButton`)}</Button>- <Button type="button" color="secondary" onClick={cancel}>{t('sharedResources.Cancel')}</Button>+ <Button type="submit" color="danger">{t('settings.resetVault.resetVaultContinueButton')}</Button>+ <Button type="button" color="secondary" onClick={cancel}>{t('common.cancel')}</Button></div></form></>) : (<>- <MessageWarning message={t(`${tk}.ResetVaultFinalWarning`)} />+ <MessageWarning message={t('settings.resetVault.resetVaultFinalWarning')} /><div className="mt-4 mb-6 text-sm text-gray-600 dark:text-gray-400">- <p className="mb-2">{t(`${tk}.ResetVaultPleaseNote`)}</p>+ <p className="mb-2">{t('settings.resetVault.resetVaultPleaseNote')}</p><ul className="list-disc list-inside space-y-2">- <li>{t(`${tk}.ResetVaultDeletionIrreversibleNote`)}</li>+ <li>{t('settings.resetVault.resetVaultDeletionIrreversibleNote')}</li></ul></div><form onSubmit={e => void resetVaultConfirmed(e)}><div className="mb-4">- <FormLabel htmlFor="password">{t(`${tk}.ResetVaultEnterPasswordLabel`)}</FormLabel>+ <FormLabel htmlFor="password">{t('settings.resetVault.resetVaultEnterPasswordLabel')}</FormLabel><InputTextField id="password" type="password" value={password} onValueChange={setPassword} autoComplete="off" /></div><div className="flex space-x-3">- <Button type="submit" color="danger">{t(`${tk}.ResetVaultConfirmButton`)}</Button>- <Button type="button" color="secondary" onClick={cancel}>{t('sharedResources.Cancel')}</Button>+ <Button type="submit" color="danger">{t('settings.resetVault.resetVaultConfirmButton')}</Button>+ <Button type="button" color="secondary" onClick={cancel}>{t('common.cancel')}</Button></div></form></>diff --git a/apps/web/src/pages/settings/security/ChangePassword.tsx b/apps/web/src/pages/settings/security/ChangePassword.tsxindex 5cb163f47..ec9e7c4ba 100644--- a/apps/web/src/pages/settings/security/ChangePassword.tsx+++ b/apps/web/src/pages/settings/security/ChangePassword.tsx@@ -29,8 +29,8 @@ const ChangePassword: React.FC = () => {const notifications = useNotifications();const { showLoading, hideLoading } = useLoading();const { syncVault } = useVaultSync();- const tk = 'components.main.pages.settings.security.changePassword';- usePageTitle(t(`${tk}.PageTitle`));++ usePageTitle(t('settings.securitySettings.changePassword.changePassword'));const [currentPassword, setCurrentPassword] = useState('');const [newPassword, setNewPassword] = useState('');@@ -43,11 +43,11 @@ const ChangePassword: React.FC = () => {*/const validate = (password: string, confirm: string): void => {if (password.trim().length > 0 && password.length < MIN_ACCEPTED_PASSWORD_LENGTH) {- setValidationError(t('validationMessages.PasswordMinLengthGeneric', { 0: MIN_ACCEPTED_PASSWORD_LENGTH }));+ setValidationError(t('settings.securitySettings.changePassword.passwordTooShort', { minLength: MIN_ACCEPTED_PASSWORD_LENGTH }));return;}if (confirm.trim().length > 0 && password !== confirm) {- setValidationError(t('validationMessages.PasswordsDoNotMatchGeneric'));+ setValidationError(t('common.errorPasswordMismatch'));return;}setValidationError('');@@ -82,18 +82,18 @@ const ChangePassword: React.FC = () => {e.preventDefault();setValidationError('');if (newPassword.length < MIN_ACCEPTED_PASSWORD_LENGTH) {- setValidationError(t('validationMessages.PasswordMinLengthGeneric', { 0: MIN_ACCEPTED_PASSWORD_LENGTH }));+ setValidationError(t('settings.securitySettings.changePassword.passwordTooShort', { minLength: MIN_ACCEPTED_PASSWORD_LENGTH }));return;}- showLoading(t(`${tk}.ChangingPasswordMessage`));+ showLoading(t('settings.securitySettings.changePassword.changingPasswordMessage'));notifications.clearMessages();try {await MasterPasswordService.changePassword(webApi, currentPassword, newPassword);setCurrentPassword('');setNewPassword('');setNewPasswordConfirm('');- notifications.addSuccessMessage(t(`${tk}.PasswordChangedSuccessfully`), true);+ notifications.addSuccessMessage(t('settings.securitySettings.changePassword.passwordChangedSuccessfully'), true);} catch (error) {console.error('Password change failed:', error);if (error instanceof IncorrectPasswordError) {@@ -101,7 +101,7 @@ const ChangePassword: React.FC = () => {} else if (error instanceof PasswordChangedElsewhereError) {notifications.addErrorMessage(t('common.errors.passwordChanged'), true);} else {- notifications.addErrorMessage(apiErrorMessage(error, t, t(`${tk}.FailedToChangePassword`)), true);+ notifications.addErrorMessage(apiErrorMessage(error, t, t('settings.securitySettings.changePassword.failedToChangePassword')), true);}return;} finally {@@ -116,30 +116,30 @@ const ChangePassword: React.FC = () => {<><div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900"><div className="mb-4 col-span-full xl:mb-2">- <Breadcrumb items={[{ displayName: t('sharedResources.Home'), url: '/', showHomeIcon: true }, { displayName: t(`${tk}.BreadcrumbSecuritySettings`), url: '/settings/security' }, { displayName: t(`${tk}.BreadcrumbChangePassword`) }]} />- <H1>{t(`${tk}.PageTitle`)}</H1>- <p className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.PageDescription`)}</p>+ <Breadcrumb items={[{ displayName: t('common.home'), url: '/', showHomeIcon: true }, { displayName: t('settings.securitySettings.pageTitle'), url: '/settings/security' }, { displayName: t('settings.securitySettings.changePassword.changePassword') }]} />+ <H1>{t('settings.securitySettings.changePassword.changePassword')}</H1>+ <p className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.changePassword.headerText')}</p></div></div><Card><form onSubmit={changePassword} className="space-y-4"><div>- <FormLabel htmlFor="currentPassword">{t(`${tk}.CurrentPasswordLabel`)}</FormLabel>- <PasswordInputField id="currentPassword" value={currentPassword} onValueChange={setCurrentPassword} placeholder={t(`${tk}.CurrentPasswordLabel`)} />+ <FormLabel htmlFor="currentPassword">{t('settings.securitySettings.changePassword.currentPassword')}</FormLabel>+ <PasswordInputField id="currentPassword" value={currentPassword} onValueChange={setCurrentPassword} placeholder={t('settings.securitySettings.changePassword.currentPassword')} /></div><div>- <FormLabel htmlFor="newPassword">{t(`${tk}.NewPasswordLabel`)}</FormLabel>- <PasswordInputField id="newPassword" value={newPassword} onValueChange={onNewPasswordChange} placeholder={t(`${tk}.NewPasswordLabel`)} />+ <FormLabel htmlFor="newPassword">{t('settings.securitySettings.changePassword.newPassword')}</FormLabel>+ <PasswordInputField id="newPassword" value={newPassword} onValueChange={onNewPasswordChange} placeholder={t('settings.securitySettings.changePassword.newPassword')} /><PasswordStrengthIndicator password={newPassword} /></div><div>- <FormLabel htmlFor="newPasswordConfirm">{t(`${tk}.ConfirmNewPasswordLabel`)}</FormLabel>- <PasswordInputField id="newPasswordConfirm" value={newPasswordConfirm} onValueChange={onConfirmChange} placeholder={t(`${tk}.ConfirmNewPasswordLabel`)} />+ <FormLabel htmlFor="newPasswordConfirm">{t('settings.securitySettings.changePassword.confirmNewPassword')}</FormLabel>+ <PasswordInputField id="newPasswordConfirm" value={newPasswordConfirm} onValueChange={onConfirmChange} placeholder={t('settings.securitySettings.changePassword.confirmNewPassword')} /></div>{validationError.length > 0 && <div className="mt-2 text-sm text-red-600 dark:text-red-400">{validationError}</div>}<button type="submit" disabled={!isSubmitEnabled} className={`w-full bg-primary-500 text-white py-2 px-4 rounded-md hover:bg-primary-600 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 transition duration-150 ease-in-out ${isSubmitEnabled ? '' : 'opacity-50 cursor-not-allowed'}`}>- {t(`${tk}.ChangePasswordButton`)}+ {t('settings.securitySettings.changePassword.changePassword')}</button></form></Card>diff --git a/apps/web/src/pages/settings/security/DeleteAccount.tsx b/apps/web/src/pages/settings/security/DeleteAccount.tsxindex 4caf90466..fe27cf94b 100644--- a/apps/web/src/pages/settings/security/DeleteAccount.tsx+++ b/apps/web/src/pages/settings/security/DeleteAccount.tsx@@ -30,8 +30,8 @@ const DeleteAccount: React.FC = () => {const webApi = useWebApi();const notifications = useNotifications();const { showLoading, hideLoading } = useLoading();- const tk = 'components.main.pages.settings.security.deleteAccount';- usePageTitle(t(`${tk}.PageTitle`));++ usePageTitle(t('settings.securitySettings.deleteAccount.deleteAccount'));const [showPasswordConfirm, setShowPasswordConfirm] = useState(false);const [username, setUsername] = useState('');@@ -45,11 +45,11 @@ const DeleteAccount: React.FC = () => {e.preventDefault();notifications.clearMessages();if (username.length === 0) {- notifications.addErrorMessage(t(`${tk}.UsernameRequired`), true);+ notifications.addErrorMessage(t('apiErrors.USERNAME_REQUIRED'), true);return;}if (username.trim().toLowerCase() !== currentUsername.trim().toLowerCase()) {- notifications.addErrorMessage(t(`${tk}.UsernameDoesNotMatch`), true);+ notifications.addErrorMessage(t('settings.securitySettings.deleteAccount.usernameMismatchDescription'), true);return;}setShowPasswordConfirm(true);@@ -61,10 +61,10 @@ const DeleteAccount: React.FC = () => {const deleteAccountConfirmed = async (e: React.FormEvent): Promise<void> => {e.preventDefault();if (password.length === 0) {- notifications.addErrorMessage(t('validationMessages.PasswordRequired'), true);+ notifications.addErrorMessage(t('validation.passwordRequired'), true);return;}- showLoading(t(`${tk}.DeletingAccountMessage`));+ showLoading(t('settings.securitySettings.deleteAccount.deletingAccount'));notifications.clearMessages();try {const initiate = await webApi.post<DeleteAccountInitiateRequest, DeleteAccountInitiateResponse>('Auth/delete-account/initiate', { username: currentUsername });@@ -74,7 +74,7 @@ const DeleteAccount: React.FC = () => {navigate('/user/logout');} catch (error) {console.error('Account deletion failed:', error);- notifications.addErrorMessage(apiErrorMessage(error, t, t(`${tk}.ErrorProcessingRequest`)), true);+ notifications.addErrorMessage(apiErrorMessage(error, t, t('settings.securitySettings.deleteAccount.errorProcessingRequest')), true);} finally {hideLoading();}@@ -84,51 +84,51 @@ const DeleteAccount: React.FC = () => {<><div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900"><div className="mb-4 col-span-full xl:mb-2">- <Breadcrumb items={[{ displayName: t('sharedResources.Home'), url: '/', showHomeIcon: true }, { displayName: t(`${tk}.BreadcrumbSecuritySettings`), url: '/settings/security' }, { displayName: t(`${tk}.BreadcrumbDeleteAccount`) }]} />- <H1>{t(`${tk}.PageTitle`)}</H1>+ <Breadcrumb items={[{ displayName: t('common.home'), url: '/', showHomeIcon: true }, { displayName: t('settings.securitySettings.pageTitle'), url: '/settings/security' }, { displayName: t('settings.securitySettings.deleteAccount.deleteAccount') }]} />+ <H1>{t('settings.securitySettings.deleteAccount.deleteAccount')}</H1></div></div><Card>{!showPasswordConfirm ? (<>- <MessageWarning message={t(`${tk}.PermanentActionWarning`)} />+ <MessageWarning message={t('settings.securitySettings.deleteAccount.permanentActionWarning')} /><div className="mt-4 mb-6 text-sm text-gray-600 dark:text-gray-400">- <p className="mb-2">{t(`${tk}.PleaseNote`)}</p>+ <p className="mb-2">{t('settings.resetVault.resetVaultPleaseNote')}</p><ul className="list-disc list-inside space-y-2">- <li>{t(`${tk}.VaultsDeletedNote`)}</li>- <li>{t(`${tk}.EmailAliasesOrphanedNote`)}</li>- <li>{t(`${tk}.AccountCannotBeRecoveredNote`)}</li>+ <li>{t('settings.securitySettings.deleteAccount.warningVaults')}</li>+ <li>{t('settings.securitySettings.deleteAccount.warningAliases')}</li>+ <li>{t('settings.securitySettings.deleteAccount.warningRecovery')}</li></ul></div><form onSubmit={confirmUsername}><div className="mb-4">- <FormLabel htmlFor="username">{t(`${tk}.ConfirmUsernameLabel`)}</FormLabel>+ <FormLabel htmlFor="username">{t('settings.securitySettings.deleteAccount.confirmUsernameLabel')}</FormLabel><InputTextField id="username" type="text" value={username} onValueChange={setUsername} /></div><div className="flex space-x-3">- <Button type="submit" color="danger">{t(`${tk}.ContinueWithAccountDeletion`)}</Button>- <Button type="button" color="secondary" onClick={() => navigate('/settings/security')}>{t('sharedResources.Cancel')}</Button>+ <Button type="submit" color="danger">{t('settings.securitySettings.deleteAccount.continueWithAccountDeletion')}</Button>+ <Button type="button" color="secondary" onClick={() => navigate('/settings/security')}>{t('common.cancel')}</Button></div></form></>) : (<>- <MessageWarning message={t(`${tk}.FinalWarning`)} />+ <MessageWarning message={t('settings.securitySettings.deleteAccount.finalWarning')} /><div className="mt-4 mb-6 text-sm text-gray-600 dark:text-gray-400">- <p className="mb-2">{t(`${tk}.PleaseNote`)}</p>+ <p className="mb-2">{t('settings.resetVault.resetVaultPleaseNote')}</p><ul className="list-disc list-inside space-y-2">- <li>{t(`${tk}.DeletionIrreversibleNote`)}</li>+ <li>{t('settings.securitySettings.deleteAccount.deletionIrreversibleNote')}</li></ul></div><form onSubmit={deleteAccountConfirmed}><div className="mb-4">- <FormLabel htmlFor="password">{t(`${tk}.EnterPasswordLabel`)}</FormLabel>+ <FormLabel htmlFor="password">{t('auth.passwordPlaceholder')}</FormLabel><InputTextField id="password" type="password" value={password} onValueChange={setPassword} /></div><div className="flex space-x-3">- <Button type="submit" color="danger">{t(`${tk}.DeleteMyAccount`)}</Button>- <Button type="button" color="secondary" onClick={() => navigate('/settings/security')}>{t('sharedResources.Cancel')}</Button>+ <Button type="submit" color="danger">{t('settings.securitySettings.deleteAccount.deleteMyAccount')}</Button>+ <Button type="button" color="secondary" onClick={() => navigate('/settings/security')}>{t('common.cancel')}</Button></div></form></>diff --git a/apps/web/src/pages/settings/security/Disable2Fa.tsx b/apps/web/src/pages/settings/security/Disable2Fa.tsxindex aad29f513..fc65fa26c 100644--- a/apps/web/src/pages/settings/security/Disable2Fa.tsx+++ b/apps/web/src/pages/settings/security/Disable2Fa.tsx@@ -19,8 +19,8 @@ const Disable2Fa: React.FC = () => {const navigate = useNavigate();const webApi = useWebApi();const notifications = useNotifications();- const tk = 'components.main.pages.settings.security.disable2Fa';- usePageTitle(t(`${tk}.PageTitle`));++ usePageTitle(t('settings.securitySettings.disable2fa.pageTitle'));const [isLoading, setIsLoading] = useState(true);const hasStarted = useRef(false);@@ -37,7 +37,7 @@ const Disable2Fa: React.FC = () => {try {const status = await webApi.get<{ twoFactorEnabled: boolean }>('TwoFactorAuth/status');if (!status.twoFactorEnabled) {- notifications.addErrorMessage(t(`${tk}.TwoFactorNotEnabled`));+ notifications.addErrorMessage(t('settings.securitySettings.disable2fa.twoFactorNotEnabled'));navigate('/settings/security');return;}@@ -55,11 +55,11 @@ const Disable2Fa: React.FC = () => {const disableTwoFactor = async (): Promise<void> => {try {await webApi.post<null, unknown>('TwoFactorAuth/disable', null, false);- notifications.addSuccessMessage(t(`${tk}.TwoFactorDisabledSuccess`));+ notifications.addSuccessMessage(t('settings.securitySettings.disable2fa.twoFactorDisabledSuccess'));navigate('/settings/security');} catch (error) {console.error('Failed to disable 2FA:', error);- notifications.addErrorMessage(t(`${tk}.FailedToDisable2Fa`), true);+ notifications.addErrorMessage(t('settings.securitySettings.disable2fa.failedToDisable2Fa'), true);}};@@ -71,17 +71,17 @@ const Disable2Fa: React.FC = () => {<><div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900"><div className="mb-4 col-span-full xl:mb-2">- <Breadcrumb items={[{ displayName: t('sharedResources.Home'), url: '/', showHomeIcon: true }, { displayName: t(`${tk}.BreadcrumbSecuritySettings`), url: '/settings/security' }, { displayName: t(`${tk}.BreadcrumbDisable2Fa`) }]} />- <H1>{t(`${tk}.PageTitle`)}</H1>- <p className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.PageDescription`)}</p>+ <Breadcrumb items={[{ displayName: t('common.home'), url: '/', showHomeIcon: true }, { displayName: t('settings.securitySettings.pageTitle'), url: '/settings/security' }, { displayName: t('settings.securitySettings.disable2fa.pageTitle') }]} />+ <H1>{t('settings.securitySettings.disable2fa.pageTitle')}</H1>+ <p className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.disable2fa.pageDescription')}</p></div></div><Card>- <AlertMessageError hasTopMargin={false} message={t(`${tk}.WarningMessage`)} />- <div className="mb-3 mt-4 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.StatusMessage`)}</div>+ <AlertMessageError hasTopMargin={false} message={t('settings.securitySettings.disable2fa.warningMessage')} />+ <div className="mb-3 mt-4 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.disable2fa.statusMessage')}</div><button type="button" onClick={() => void disableTwoFactor()} className="bg-red-500 text-white py-2 px-4 rounded-md hover:bg-red-600 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 transition duration-150 ease-in-out">- {t(`${tk}.ConfirmDisableButton`)}+ {t('settings.securitySettings.disable2fa.confirmDisableButton')}</button></Card></>diff --git a/apps/web/src/pages/settings/security/Enable2Fa.tsx b/apps/web/src/pages/settings/security/Enable2Fa.tsxindex f17cebb78..2565bfef1 100644--- a/apps/web/src/pages/settings/security/Enable2Fa.tsx+++ b/apps/web/src/pages/settings/security/Enable2Fa.tsx@@ -15,15 +15,15 @@ import { usePageTitle } from '@/hooks/usePageTitle';*/const ShowRecoveryCodes: React.FC<{ recoveryCodes: string[] }> = ({ recoveryCodes }) => {const { t } = useTranslation();- const tk = 'components.main.settings.security.showRecoveryCodes';+return (<div className="max-w-2xl mx-auto px-4 lg:mt-8"><Card variant="plain">- <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t(`${tk}.Title`)}</h3>- <div className="text-sm text-gray-600 dark:text-gray-400 mb-4">{t(`${tk}.Description`)}</div>+ <h3 className="mb-4 text-lg font-medium text-gray-900 dark:text-white">{t('settings.securitySettings.recoveryCodes.title')}</h3>+ <div className="text-sm text-gray-600 dark:text-gray-400 mb-4">{t('settings.securitySettings.recoveryCodes.description')}</div><div className="bg-primary-100 border-l-4 border-primary-500 text-primary-700 p-4 mb-4 dark:bg-gray-700 dark:border-primary-500 dark:text-gray-200">- <p className="font-semibold">{t(`${tk}.WarningTitle`)}</p>- <p>{t(`${tk}.WarningDescription`)}</p>+ <p className="font-semibold">{t('settings.securitySettings.recoveryCodes.warningTitle')}</p>+ <p>{t('settings.securitySettings.recoveryCodes.warningDescription')}</p></div><div className="grid grid-cols-1 md:grid-cols-2 gap-2" id="recovery-codes">{recoveryCodes.map(code => (@@ -44,8 +44,7 @@ const Enable2Fa: React.FC = () => {const { t } = useTranslation();const webApi = useWebApi();const notifications = useNotifications();- const tk = 'components.main.pages.settings.security.enable2Fa';- usePageTitle(t(`${tk}.PageTitle`));+ usePageTitle(t('settings.securitySettings.enable2fa.pageTitle'));const [isLoading, setIsLoading] = useState(true);const [qrCodeDataUrl, setQrCodeDataUrl] = useState('');@@ -71,7 +70,7 @@ const Enable2Fa: React.FC = () => {setQrCodeDataUrl(await QRCode.toDataURL(result.qrCodeUrl, { width: 256, margin: 2 }));} catch (error) {console.error('Failed to start 2FA setup:', error);- notifications.addErrorMessage(t(`${tk}.FailedToEnable2Fa`), true);+ notifications.addErrorMessage(t('settings.securitySettings.enable2fa.failedToEnable2Fa'), true);} finally {setIsLoading(false);}@@ -86,11 +85,11 @@ const Enable2Fa: React.FC = () => {e.preventDefault();try {const result = await webApi.post<string, { recoveryCodes: string[] }>('TwoFactorAuth/verify', code);- notifications.addSuccessMessage(t(`${tk}.TwoFactorEnabledSuccess`), true);+ notifications.addSuccessMessage(t('settings.securitySettings.enable2fa.twoFactorEnabledSuccess'), true);setRecoveryCodes(result.recoveryCodes);} catch (error) {console.error('Failed to verify 2FA code:', error);- notifications.addErrorMessage(t(`${tk}.FailedToEnable2Fa`), true);+ notifications.addErrorMessage(t('settings.securitySettings.enable2fa.failedToEnable2Fa'), true);}};@@ -98,9 +97,9 @@ const Enable2Fa: React.FC = () => {<><div className="grid grid-cols-1 px-4 pt-6 xl:grid-cols-3 xl:gap-4 dark:bg-gray-900"><div className="mb-4 col-span-full xl:mb-2">- <Breadcrumb items={[{ displayName: t('sharedResources.Home'), url: '/', showHomeIcon: true }, { displayName: t(`${tk}.BreadcrumbSecuritySettings`), url: '/settings/security' }, { displayName: t(`${tk}.BreadcrumbEnable2Fa`) }]} />- <H1>{t(`${tk}.PageTitle`)}</H1>- <p className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t(`${tk}.PageDescription`)}</p>+ <Breadcrumb items={[{ displayName: t('common.home'), url: '/', showHomeIcon: true }, { displayName: t('settings.securitySettings.pageTitle'), url: '/settings/security' }, { displayName: t('settings.securitySettings.enable2fa.pageTitle') }]} />+ <H1>{t('settings.securitySettings.enable2fa.pageTitle')}</H1>+ <p className="mt-2 text-sm text-gray-600 dark:text-gray-400">{t('settings.securitySettings.enable2fa.pageDescription')}</p></div></div>@@ -109,17 +108,17 @@ const Enable2Fa: React.FC = () => {<Card variant="plain"><div className="space-y-6"><div id="authenticator-uri" className="flex justify-center">- {qrCodeDataUrl.length > 0 && <img src={qrCodeDataUrl} alt="QR code" className="w-64 h-64" />}+ {qrCodeDataUrl.length > 0 && <img src={qrCodeDataUrl} alt={t('common.qrCode')} className="w-64 h-64" />}</div>- <p className="text-sm text-gray-600 dark:text-gray-400 text-center">{t(`${tk}.QrCodeInstructions`)}</p>+ <p className="text-sm text-gray-600 dark:text-gray-400 text-center">{t('settings.securitySettings.enable2fa.qrCodeInstructions')}</p><div className="text-lg font-mono text-center bg-gray-100 dark:bg-gray-700 p-3 rounded border dark:text-gray-200" id="authenticator-secret">{secret}</div><form onSubmit={verifySetup} className="space-y-4" av-enable="true" av-suppress-save="true"><div>- <input id="verificationCode" type="text" value={code} onChange={e => setCode(e.target.value)} className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 dark:focus:ring-blue-400" placeholder={t(`${tk}.VerificationCodePlaceholder`)} autoComplete="one-time-code" />+ <input id="verificationCode" type="text" value={code} onChange={e => setCode(e.target.value)} className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 dark:focus:ring-blue-400" placeholder={t('settings.securitySettings.enable2fa.verificationCodePlaceholder')} autoComplete="one-time-code" /></div><button type="submit" className="w-full bg-primary-500 text-white py-2 px-4 rounded-md hover:bg-primary-600 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 transition duration-150 ease-in-out">- {t(`${tk}.VerifyAndEnableButton`)}+ {t('settings.securitySettings.enable2fa.verifyAndEnableButton')}</button></form></div>diff --git a/apps/web/src/pages/settings/security/Security.tsx b/apps/web/src/pages/settings/security/Security.tsxindex c9f9d2310..135febcf4 100644--- a/apps/web/src/pages/settings/security/Security.tsx+++ b/apps/web/src/pages/settings/security/Security.tsx@@ -18,8 +18,8 @@ import { usePageTitle } from '@/hooks/usePageTitle';*/const SecuritySettings: React.FC = () => {const { t } = useTranslation();- const tk = 'pages.main.settings.security.security';- usePageTitle(t(`${tk}.PageTitle`));++ usePageTitle(t('settings.securitySettings.pageTitle'));const twoFactorRef = useRef<SectionHandle>(null);const quickUnlockRef = useRef<SectionHandle>(null);const sessionsRef = useRef<SectionHandle>(null);@@ -36,7 +36,7 @@ const SecuritySettings: React.FC = () => {return (<>- <PageHeader breadcrumbItems={[{ displayName: t(`${tk}.BreadcrumbTitle`) }]} title={t(`${tk}.PageTitle`)} description={t(`${tk}.PageDescription`)} customActions={<RefreshButton onClick={() => void loadData()} buttonText={t(`${tk}.RefreshButton`)} />} />+ <PageHeader breadcrumbItems={[{ displayName: t('settings.securitySettings.pageTitle') }]} title={t('settings.securitySettings.pageTitle')} description={t('settings.securitySettings.pageDescription')} customActions={<RefreshButton onClick={() => void loadData()} buttonText={t('common.refresh')} />} /><PageContent><PasswordChangeSection />diff --git a/apps/web/src/pages/sync/Sync.tsx b/apps/web/src/pages/sync/Sync.tsxindex a8c47e5f5..eae28ab1a 100644--- a/apps/web/src/pages/sync/Sync.tsx+++ b/apps/web/src/pages/sync/Sync.tsx@@ -38,7 +38,7 @@ const Sync: React.FC = () => {const auth = useAuth();const dbContext = useDb();const { executeVaultMutationLocally } = useVaultMutate();- usePageTitle(t('pages.main.sync.sync.PageTitle'));+ usePageTitle(t('sync.page.pageTitle'));const [status, setStatus] = useState<SyncStatus>('loading');const [errorDetails, setErrorDetails] = useState<string | null>(null);@@ -173,11 +173,11 @@ const Sync: React.FC = () => {if (upgradeKind === 'legacy-sqlite-blob') {const client = dbContext.sqliteClient;if (!client || !currentVersion || !latestVersion) {- throw new Error(t('pages.main.sync.statusMessages.pendingMigrations.UpgradeFailedError'));+ throw new Error(t('upgrade.upgradeFailedError'));}const upgrade = new VaultSqlGenerator().getUpgradeVaultSql(currentVersion.revision, latestVersion.revision);if (!upgrade.success) {- throw new Error(upgrade.error ?? t('pages.main.sync.statusMessages.pendingMigrations.UpgradeFailedError'));+ throw new Error(upgrade.error ?? t('upgrade.upgradeFailedError'));}/** The migration SQL contains PRAGMA statements that only take effect outside a transaction, so every@@ -191,7 +191,7 @@ const Sync: React.FC = () => {} else {const result = await vaultStore.migrateVaultManifest();if (!result.success) {- throw new Error(syncErrorMessage(result, t) ?? t('pages.main.sync.statusMessages.pendingMigrations.UpgradeFailedError'));+ throw new Error(syncErrorMessage(result, t) ?? t('upgrade.upgradeFailedError'));}}@@ -201,7 +201,7 @@ const Sync: React.FC = () => {await openVault(upgradeKind === 'storage-format');} catch (error) {console.error('Vault upgrade failed:', error);- setUpgradeError(error instanceof Error ? error.message : t('pages.main.sync.statusMessages.pendingMigrations.UpgradeFailedError'));+ setUpgradeError(error instanceof Error ? error.message : t('upgrade.upgradeFailedError'));} finally {setIsUpgrading(false);}@@ -216,13 +216,13 @@ const Sync: React.FC = () => {return (<div className="relative p-6 sm:p-8 bg-white dark:bg-gray-800 rounded-lg sm:shadow-xl max-w-md w-full mx-auto"><div className="text-center">- <h2 className="mt-4 text-xl font-semibold text-gray-900 dark:text-white">Vault version not supported</h2>+ <h2 className="mt-4 text-xl font-semibold text-gray-900 dark:text-white">{t('sync.versionNotSupported.title')}</h2><p className="mt-2 text-sm text-gray-500 dark:text-gray-400">- The version of this vault is not compatible with your client. <br />- Please update to the latest version of AliasVault, refresh this page, and try again. <br />+ {t('sync.versionNotSupported.notCompatible')} <br />+ {t('sync.versionNotSupported.updateInstructions')} <br /></p><p className="mt-4 text-sm text-gray-500 dark:text-gray-400">- If the issue persists, contact our support team for help.+ {t('sync.versionNotSupported.contactSupport')}</p></div></div>@@ -232,14 +232,14 @@ const Sync: React.FC = () => {<div className="relative p-6 sm:p-8 bg-white dark:bg-gray-800 rounded-lg sm:shadow-xl max-w-md w-full mx-auto"><div className="text-center"><div className="space-y-4">- <h2 className="text-xl font-semibold text-gray-900 dark:text-white">{t('pages.main.sync.statusMessages.pendingMigrations.UpgradeVaultTitle')}</h2>+ <h2 className="text-xl font-semibold text-gray-900 dark:text-white">{t('upgrade.title')}</h2><p className="text-sm text-gray-500 dark:text-gray-400">- {t('pages.main.sync.statusMessages.pendingMigrations.UpgradeDescription')}+ {t('upgrade.upgradeDescription')}</p>{upgradeKind === 'legacy-sqlite-blob' && (<div className="bg-gray-100 dark:bg-gray-700 p-4 rounded-lg shadow-sm"><div className="flex items-center justify-center mb-3">- <h3 className="text-lg font-medium text-gray-700 dark:text-gray-300">{t('pages.main.sync.statusMessages.pendingMigrations.VersionInformationTitle')}</h3>+ <h3 className="text-lg font-medium text-gray-700 dark:text-gray-300">{t('upgrade.versionInformation')}</h3><button onClick={() => setShowVersionDescription(!showVersionDescription)} className="ml-2 w-6 h-6 bg-gray-200 dark:bg-gray-600 rounded-full flex items-center justify-center text-gray-600 dark:text-gray-400 hover:bg-gray-300 dark:hover:bg-gray-500 transition-colors"><span className="text-sm font-bold">?</span></button>@@ -247,17 +247,17 @@ const Sync: React.FC = () => {{showVersionDescription && (<div className="mb-4 p-3 bg-orange-50 dark:bg-orange-900/30 border border-orange-200 dark:border-orange-700 rounded-lg"><p className="text-sm text-orange-800 dark:text-orange-200">- {t('pages.main.sync.statusMessages.pendingMigrations.UpgradeRequiredDescription', { 0: latestVersion?.description ?? t('pages.main.sync.statusMessages.pendingMigrations.NoDescriptionAvailable') })}+ {t('upgrade.upgradeRequiredDescription', { changes: latestVersion?.description ?? t('upgrade.noDescriptionAvailable') })}</p></div>)}<div className="space-y-2"><p className="flex justify-between items-center">- <span className="text-sm font-medium text-gray-600 dark:text-gray-400">{t('pages.main.sync.statusMessages.pendingMigrations.YourVaultLabel')}</span>+ <span className="text-sm font-medium text-gray-600 dark:text-gray-400">{t('upgrade.yourVault')}</span><span className="text-base font-bold text-blue-600 dark:text-blue-400">{currentVersion?.compatibleUpToVersion ?? '...'}</span></p><p className="flex justify-between items-center">- <span className="text-sm font-medium text-gray-600 dark:text-gray-400">{t('pages.main.sync.statusMessages.pendingMigrations.NewVersionLabel')}</span>+ <span className="text-sm font-medium text-gray-600 dark:text-gray-400">{t('upgrade.newVersion')}</span><span className="text-base font-bold text-green-600 dark:text-green-400">{latestVersion?.releaseVersion ?? '...'}</span></p></div>@@ -276,7 +276,7 @@ const Sync: React.FC = () => {<BoldLoadingIndicator />) : (<button onClick={migrateDatabase} type="button" className="px-4 mt-4 py-2 text-white bg-primary-600 rounded-lg hover:bg-primary-700 focus:ring-4 focus:ring-primary-300 dark:bg-primary-500 dark:hover:bg-primary-600 dark:focus:ring-primary-800">- {t('pages.main.sync.statusMessages.pendingMigrations.StartUpgradeButton')}+ {t('upgrade.startUpgradeButton')}</button>)}</div>@@ -291,10 +291,10 @@ const Sync: React.FC = () => {<svg className="w-12 h-12 mx-auto text-green-600 dark:text-green-400" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>- <h2 className="text-xl font-semibold text-gray-900 dark:text-white">{t('pages.main.sync.statusMessages.pendingMigrations.UpgradeSuccessMessage')}</h2>+ <h2 className="text-xl font-semibold text-gray-900 dark:text-white">{t('upgrade.upgradeSuccessMessage')}</h2><p className="text-sm text-gray-500 dark:text-gray-400">{t('upgrade.successOtherDevices')}</p><button onClick={() => void navigateToHome()} type="button" id="upgrade-continue-button" className="px-4 mt-4 py-2 text-white bg-primary-600 rounded-lg hover:bg-primary-700 focus:ring-4 focus:ring-primary-300 dark:bg-primary-500 dark:hover:bg-primary-600 dark:focus:ring-primary-800">- {t('sharedResources.Continue')}+ {t('common.continue')}</button></div></div>@@ -304,8 +304,8 @@ const Sync: React.FC = () => {<div className="relative p-6 sm:p-8 bg-white dark:bg-gray-700 rounded-lg sm:shadow-xl max-w-md w-full mx-auto"><div className="text-center"><BoldLoadingIndicator />- <h2 className="mt-6 text-xl font-semibold text-gray-900 dark:text-white">{t('pages.main.sync.statusMessages.vaultDecryptionProgress.Title')}</h2>- <p className="mt-3 text-sm text-gray-500 dark:text-gray-400">{t('pages.main.sync.statusMessages.vaultDecryptionProgress.Description')}</p>+ <h2 className="mt-6 text-xl font-semibold text-gray-900 dark:text-white">{t('sync.decrypting.title')}</h2>+ <p className="mt-3 text-sm text-gray-500 dark:text-gray-400">{t('sync.decrypting.description')}</p></div></div>);@@ -314,14 +314,14 @@ const Sync: React.FC = () => {const logoutLink = (<>- {t('pages.main.sync.sync.SwitchAccountsText')} <Link to="/user/logout" className="text-primary-700 hover:underline dark:text-primary-500">{t('pages.main.sync.sync.LogoutLink')}</Link>+ {t('auth.switchAccounts')} <Link to="/user/logout" className="text-primary-700 hover:underline dark:text-primary-500">{t('common.logout')}</Link></>);if (status === 'decryption-failed') {return errorDetails? <CriticalErrorPanel report={errorDetails} footer={logoutLink} />- : <CriticalErrorPanel title={t('pages.main.sync.statusMessages.errorVaultDecrypt.ErrorTitle')} description={t('pages.main.sync.statusMessages.errorVaultDecrypt.ErrorDescription')} footer={logoutLink} />;+ : <CriticalErrorPanel title={t('sync.decryptError.errorTitle')} description={t('sync.decryptError.errorDescription')} footer={logoutLink} />;}return (diff --git a/apps/web/src/platform/WebPlatform.ts b/apps/web/src/platform/WebPlatform.tsindex 0357ccd05..3cadcab40 100644--- a/apps/web/src/platform/WebPlatform.ts+++ b/apps/web/src/platform/WebPlatform.ts@@ -15,7 +15,7 @@ import { devError, devLog, devWarn } from '@/utils/DevLogger';* Which translation key backs each of the core's own messages.*/const TRANSLATION_KEYS: Record<TranslatableMessage, string> = {- [TranslatableMessage.ClientOutdated]: 'sharedResources.ClientVersionUnsupported',+ [TranslatableMessage.ClientOutdated]: 'common.clientVersionUnsupported',[TranslatableMessage.VaultUpgradeRequired]: 'content.vaultUpgradeRequired',};diff --git a/apps/web/tests/e2e/03-items.spec.ts b/apps/web/tests/e2e/03-items.spec.tsindex 65c4e13ba..90c400aee 100644--- a/apps/web/tests/e2e/03-items.spec.ts+++ b/apps/web/tests/e2e/03-items.spec.ts@@ -29,7 +29,7 @@ test.describe('3. Items', () => {});await test.step('the view page shows the new name', async () => {- await expect(page.getByText('Item updated successfully.')).toBeVisible();+ await expect(page.getByText('Item updated successfully')).toBeVisible();await app.expectItemView('Item service after');await expect(page.getByText('Item service before')).toHaveCount(0);});diff --git a/apps/web/tests/fixtures/WebApp.ts b/apps/web/tests/fixtures/WebApp.tsindex 215844138..4a1fcc6c8 100644--- a/apps/web/tests/fixtures/WebApp.ts+++ b/apps/web/tests/fixtures/WebApp.ts@@ -89,7 +89,7 @@ export class WebApp {await this.page.locator('#quickIdentitySubmit').click();await expect(this.page.locator('#service-name')).toHaveValue(name);await this.saveItemButton().click();- await expect(this.page.getByText('Item created successfully.')).toBeVisible();+ await expect(this.page.getByText('Item created successfully')).toBeVisible();await this.expectItemView(name);}diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.tsindex 2ff2e301e..0bb2d62cb 100644--- a/apps/web/vite.config.ts+++ b/apps/web/vite.config.ts@@ -6,11 +6,11 @@ import { minify } from 'html-minifier-terser';import { defineConfig, type Plugin } from 'vite';const CORE_DIR = path.resolve(import.meta.dirname, '../../core');-const LOCALES_DIR = path.resolve(import.meta.dirname, 'src/i18n/locales');+const LOCALES_DIR = path.join(CORE_DIR, 'i18n/locales');const APP_VERSION = (JSON.parse(readFileSync(path.resolve(import.meta.dirname, 'package.json'), 'utf8')) as { version: string }).version;/**- * Inline the loadingScreen strings of every src/i18n/locales/<lang>.json into index.html, so the loading screen+ * Inline the loadingScreen strings of every core/i18n/locales/<lang>.json into index.html, so the loading screen* script shows the right language on the first load without needing a separate request.*/function loadingScreenLocales(): Plugin {