From b30c2764f0e91ecfa2347f16581fdc6bd9e47d6e Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 28 Oct 2026 03:41:53 +0100
Subject: [PATCH] fix: confirm deleting folders, calendars, credentials and
 other things that can't come back in one dialog

---
 .../settings-delete-confirm.test.tsx          | 128 ++++++++++++++++++
 .../settings/account-archive-settings.tsx     |  15 +-
 .../settings/account-security-settings.tsx    |  36 ++++-
 .../settings/calendar-management-settings.tsx | 103 +++++---------
 components/settings/filter-settings.tsx       |  56 +++-----
 components/settings/folder-settings.tsx       |  48 +++----
 locales/ar/common.json                        |  24 +++-
 locales/ca/common.json                        |  24 +++-
 locales/cs/common.json                        |  24 +++-
 locales/da/common.json                        |  24 +++-
 locales/de/common.json                        |  24 +++-
 locales/en/common.json                        |  24 +++-
 locales/es/common.json                        |  24 +++-
 locales/et/common.json                        |  24 +++-
 locales/fa/common.json                        |  24 +++-
 locales/fr/common.json                        |  24 +++-
 locales/he/common.json                        |  24 +++-
 locales/hu/common.json                        |  24 +++-
 locales/it/common.json                        |  24 +++-
 locales/ja/common.json                        |  24 +++-
 locales/ko/common.json                        |  24 +++-
 locales/lv/common.json                        |  24 +++-
 locales/mn/common.json                        |  24 +++-
 locales/nb/common.json                        |  24 +++-
 locales/nl/common.json                        |  24 +++-
 locales/pl/common.json                        |  24 +++-
 locales/pt/common.json                        |  24 +++-
 locales/ro/common.json                        |  24 +++-
 locales/ru/common.json                        |  24 +++-
 locales/sk/common.json                        |  24 +++-
 locales/th/common.json                        |  24 +++-
 locales/tr/common.json                        |  24 +++-
 locales/uk/common.json                        |  24 +++-
 locales/zh-TW/common.json                     |  24 +++-
 locales/zh/common.json                        |  24 +++-
 35 files changed, 912 insertions(+), 170 deletions(-)
 create mode 100644 components/settings/__tests__/settings-delete-confirm.test.tsx

diff --git a/components/settings/__tests__/settings-delete-confirm.test.tsx b/components/settings/__tests__/settings-delete-confirm.test.tsx
new file mode 100644
index 000000000..5ef846700
--- /dev/null
+++ b/components/settings/__tests__/settings-delete-confirm.test.tsx
@@ -0,0 +1,128 @@
+import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { Calendar, Mailbox } from '@/lib/jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useCalendarStore } from '@/stores/calendar-store';
+import { useEmailStore } from '@/stores/email-store';
+import { useFilterStore } from '@/stores/filter-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { FolderSettings } from '../folder-settings';
+import { CalendarManagementSettings } from '../calendar-management-settings';
+import { FilterSettings } from '../filter-settings';
+
+// R3: what can't be brought back (a folder, a calendar, its events, a
+// subscription, a script typed in the raw editor) is confirmed in one
+// ConfirmDialog: "Delete …?", Cancel first, the destructive verb last.
+// No inline Delete/Cancel strips.
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+vi.mock('../settings-section', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('../settings-section')>()),
+  SettingsSection: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+}));
+
+const initial = {
+  auth: useAuthStore.getState(),
+  calendar: useCalendarStore.getState(),
+  email: useEmailStore.getState(),
+  filter: useFilterStore.getState(),
+  settings: useSettingsStore.getState(),
+};
+afterEach(() => {
+  useAuthStore.setState(initial.auth, true);
+  useCalendarStore.setState(initial.calendar, true);
+  useEmailStore.setState(initial.email, true);
+  useFilterStore.setState(initial.filter, true);
+  useSettingsStore.setState(initial.settings, true);
+});
+
+function confirmDialog() {
+  return within(screen.getByRole('alertdialog'));
+}
+
+describe('deleting a folder', () => {
+  const rights = {
+    mayReadItems: true, mayAddItems: true, mayRemoveItems: true, maySetSeen: true, maySetKeywords: true,
+    mayCreateChild: true, mayRename: true, mayDelete: true, maySubmit: true,
+  };
+  let deleteMailbox: ReturnType<typeof vi.fn>;
+  beforeEach(() => {
+    deleteMailbox = vi.fn(async () => true);
+    useAuthStore.setState({ client: {} } as never);
+    useEmailStore.setState({
+      mailboxes: [{ id: 'old', name: 'Old stuff', sortOrder: 0, totalEmails: 0, unreadEmails: 0, totalThreads: 0, unreadThreads: 0, myRights: rights, isSubscribed: true, isShared: false } as Mailbox],
+      fetchMailboxes: vi.fn(),
+      deleteMailbox,
+    } as never);
+  });
+
+  it('asks in a dialog and deletes only on the destructive button', async () => {
+    render(<FolderSettings />);
+    fireEvent.click(screen.getAllByRole('button', { name: 'delete' })[0]);
+
+    const dialog = confirmDialog();
+    expect(dialog.getByText('delete_title')).toBeTruthy();
+    const [cancel, confirm] = dialog.getAllByRole('button');
+    expect(cancel.textContent).toBe('cancel');
+    expect(confirm.textContent).toBe('delete');
+    fireEvent.click(cancel);
+    expect(deleteMailbox).not.toHaveBeenCalled();
+
+    fireEvent.click(screen.getAllByRole('button', { name: 'delete' })[0]);
+    fireEvent.click(confirmDialog().getAllByRole('button')[1]);
+    await waitFor(() => expect(deleteMailbox).toHaveBeenCalledWith(expect.anything(), 'old'));
+  });
+});
+
+describe('deleting a calendar and clearing its events', () => {
+  const work = {
+    id: 'work', name: 'Work', color: '#3b82f6', isDefault: false, isShared: false, shareWith: null,
+    myRights: { mayShare: true, mayDelete: true, mayWriteAll: true },
+  } as unknown as Calendar;
+  let removeCalendar: ReturnType<typeof vi.fn>;
+  let clearCalendarEvents: ReturnType<typeof vi.fn>;
+  beforeEach(() => {
+    removeCalendar = vi.fn(async () => {});
+    clearCalendarEvents = vi.fn(async () => 3);
+    useAuthStore.setState({ client: { getAccountId: () => 'acct-1' }, serverUrl: null, username: null } as never);
+    useCalendarStore.setState({ calendars: [work], icalSubscriptions: [], removeCalendar, clearCalendarEvents } as never);
+  });
+
+  it('confirms a delete in a dialog, not an inline strip', async () => {
+    render(<CalendarManagementSettings />);
+    fireEvent.click(screen.getByTitle('delete'));
+    expect(confirmDialog().getByText('delete_title')).toBeTruthy();
+    fireEvent.click(confirmDialog().getByRole('button', { name: 'delete' }));
+    await waitFor(() => expect(removeCalendar).toHaveBeenCalledWith(expect.anything(), 'work'));
+  });
+
+  it('confirms clearing the events in a dialog', async () => {
+    render(<CalendarManagementSettings />);
+    fireEvent.click(screen.getByTitle('clear_events'));
+    expect(confirmDialog().getByText('clear_title')).toBeTruthy();
+    fireEvent.click(confirmDialog().getByRole('button', { name: 'clear_events' }));
+    await waitFor(() => expect(clearCalendarEvents).toHaveBeenCalledWith(expect.anything(), 'work'));
+  });
+});
+
+describe('resetting the raw script to the visual builder', () => {
+  it('asks in a dialog before throwing the script away', async () => {
+    const updateSieveScript = vi.fn(async () => {});
+    useAuthStore.setState({ client: { updateSieveScript, getSieveAccountId: () => 'primary' } as never });
+    useEmailStore.setState({ fetchMailboxes: vi.fn(async () => {}) as never });
+    useFilterStore.setState({
+      rules: [], rawScript: 'keep;', isSupported: true, isLoading: false, isOpaque: true, activeScriptId: 's1',
+      selectedAccountId: 'primary', sieveCapabilities: null, selectAccount: vi.fn(async () => {}),
+    });
+    render(<FilterSettings />);
+
+    fireEvent.click(screen.getByRole('button', { name: /reset_to_visual/ }));
+    expect(useFilterStore.getState().isOpaque).toBe(true);
+    expect(confirmDialog().getByText('reset_title')).toBeTruthy();
+
+    fireEvent.click(confirmDialog().getByRole('button', { name: 'confirm_reset' }));
+    await waitFor(() => expect(useFilterStore.getState().isOpaque).toBe(false));
+  });
+});
diff --git a/components/settings/account-archive-settings.tsx b/components/settings/account-archive-settings.tsx
index c1c33b660..80483c382 100644
--- a/components/settings/account-archive-settings.tsx
+++ b/components/settings/account-archive-settings.tsx
@@ -11,6 +11,8 @@ import { decryptArchive, encryptArchive, ARCHIVE_MIN_PASSWORD, type ArchiveOwner
 import { collectAccounts, fetchArchive, putArchive, removeArchive, restoreArchive } from '@/lib/account-archive-client';
 import { toUnicodeEmail } from '@/lib/idn';
 import { SettingsSection } from './settings-section';
+import { ConfirmDialog } from '@/components/ui/confirm-dialog';
+import { useConfirmDialog } from '@/hooks/use-confirm-dialog';
 
 const KNOWN_ERRORS = ['mismatch', 'password_length', 'unlock_failed', 'owner_signin_required', 'https_required'];
 
@@ -35,6 +37,7 @@ export function restoreSummary(t: BackupT, result: Awaited<ReturnType<typeof res
 /** Save this browser's account list, encrypted, under the active account; restore it on another device. */
 export function AccountArchiveSettings() {
   const t = useTranslations('settings.account.backup');
+  const tCommon = useTranslations('common');
   const id = useId();
   const username = useAuthStore(s => s.username);
   const serverUrl = useAuthStore(s => s.serverUrl);
@@ -48,6 +51,7 @@ export function AccountArchiveSettings() {
   const [busy, setBusy] = useState(false);
   const [message, setMessage] = useState<{ error: boolean; text: string } | null>(null);
   const owner: ArchiveOwner | null = username && serverUrl ? { username, serverUrl } : null;
+  const { dialogProps: confirmProps, confirm } = useConfirmDialog();
 
   useEffect(() => {
     setSaved(null);
@@ -87,8 +91,14 @@ export function AccountArchiveSettings() {
     if (!envelope) { setSaved(false); throw new Error('storage_failed'); }
     return restoreSummary(t, await restoreArchive(await decryptArchive(owner, envelope, password), rememberMeEnabled));
   });
-  const remove = () => {
-    if (!window.confirm(t('delete_confirm'))) return;
+  const remove = async () => {
+    const ok = await confirm({
+      title: t('delete_confirm'),
+      message: t('delete_message'),
+      confirmText: tCommon('delete'),
+      variant: 'destructive',
+    });
+    if (!ok) return;
     void run(async () => { await removeArchive(owner); setSaved(false); return t('deleted'); });
   };
 
@@ -150,6 +160,7 @@ export function AccountArchiveSettings() {
           {message.text}
         </p>
       )}
+      <ConfirmDialog {...confirmProps} />
     </SettingsSection>
   );
 }
diff --git a/components/settings/account-security-settings.tsx b/components/settings/account-security-settings.tsx
index 558ca7bfa..18d344a76 100644
--- a/components/settings/account-security-settings.tsx
+++ b/components/settings/account-security-settings.tsx
@@ -19,6 +19,8 @@ import { sanitizeI18nHtml } from '@/lib/email-sanitization';
 import { IS_LITE } from '@/lib/lite';
 import { useConfig } from '@/hooks/use-config';
 import { totpIssuer } from '@/lib/totp-issuer';
+import { ConfirmDialog } from '@/components/ui/confirm-dialog';
+import { useConfirmDialog } from '@/hooks/use-confirm-dialog';
 
 function PasswordChangeSection() {
   const t = useTranslations('settings.security');
@@ -437,6 +439,7 @@ interface CredentialSectionProps {
 
 function CredentialSection({ icon: Icon, i18nNamespace, entries, onCreate, onRemove }: CredentialSectionProps) {
   const t = useTranslations('settings.security');
+  const tCommon = useTranslations('common');
   const tk = (key: string) => t(`${i18nNamespace}.${key}`);
   const { isSaving, isLoadingAuth } = useAccountSecurityStore();
   const [showAdd, setShowAdd] = useState(false);
@@ -467,7 +470,18 @@ function CredentialSection({ icon: Icon, i18nNamespace, entries, onCreate, onRem
     }
   };
 
+  const { dialogProps: confirmProps, confirm } = useConfirmDialog();
+
+  // A credential can't be brought back, so it asks first (R3).
   const handleRemove = async (id: string) => {
+    const entry = entries.find((e) => e.id === id);
+    const ok = await confirm({
+      title: tk('delete_title'),
+      message: t(`${i18nNamespace}.delete_message`, { name: entry?.description || id }),
+      confirmText: tCommon('delete'),
+      variant: 'destructive',
+    });
+    if (!ok) return;
     try {
       await onRemove(id);
       toast.success(tk('removed'));
@@ -574,6 +588,7 @@ function CredentialSection({ icon: Icon, i18nNamespace, entries, onCreate, onRem
       ) : (
         <p className="text-xs text-muted-foreground italic">{tk('none')}</p>
       )}
+      <ConfirmDialog {...confirmProps} />
     </div>
   );
 }
@@ -606,6 +621,7 @@ function ApiKeysSection() {
 
 function PublicKeysSection() {
   const t = useTranslations('settings.security');
+  const tCommon = useTranslations('common');
   const tk = (key: string) => t(`public_keys.${key}`);
   const {
     publicKeys,
@@ -645,7 +661,17 @@ function PublicKeysSection() {
     }
   };
 
+  const { dialogProps: confirmProps, confirm } = useConfirmDialog();
+
   const handleRemove = async (id: string) => {
+    const key = publicKeys.find((k) => k.id === id);
+    const ok = await confirm({
+      title: tk('delete_title'),
+      message: t('public_keys.delete_message', { name: key?.description || id }),
+      confirmText: tCommon('delete'),
+      variant: 'destructive',
+    });
+    if (!ok) return;
     try {
       await removePublicKey(id);
       toast.success(tk('removed'));
@@ -659,7 +685,14 @@ function PublicKeysSection() {
       encryptionConfig.type !== 'Disabled' && encryptionConfig.publicKeyId === keyId;
 
     if (isCurrentlyActiveKey) {
-      // Disable encryption
+      // Turning it off changes how new mail is stored, so it asks first.
+      const ok = await confirm({
+        title: t('encryption.disable_title'),
+        message: t('encryption.disable_message'),
+        confirmText: t('encryption.disable_button'),
+        variant: 'destructive',
+      });
+      if (!ok) return;
       try {
         await updateEncryptionAtRest({ type: 'Disabled' });
         toast.success(t('encryption.disabled_success'));
@@ -868,6 +901,7 @@ function PublicKeysSection() {
       ) : (
         <p className="text-xs text-muted-foreground italic">{tk('none')}</p>
       )}
+      <ConfirmDialog {...confirmProps} />
     </div>
   );
 }
diff --git a/components/settings/calendar-management-settings.tsx b/components/settings/calendar-management-settings.tsx
index bebf20113..dc5927e13 100644
--- a/components/settings/calendar-management-settings.tsx
+++ b/components/settings/calendar-management-settings.tsx
@@ -25,6 +25,7 @@ import { CALENDAR_COLORS, sharedCalendarColorKey } from '@/lib/shared-calendar-c
 import { IS_LITE } from '@/lib/lite';
 import { shareRecipientNames, useShareRecipientLabels } from '@/hooks/use-share-recipient-labels';
 import { calendarAccountKey, moveCalendar } from '@/lib/calendar-sort';
+import { ConfirmDialog } from '@/components/ui/confirm-dialog';
 
 function CalendarColorPicker({
   value,
@@ -280,6 +281,7 @@ export function CalendarManagementSettings() {
   const [refreshingSubId, setRefreshingSubId] = useState<string | null>(null);
   const tImport = useTranslations('calendar.import');
   const tSub = useTranslations('calendar.subscription');
+  const tConfirm = useTranslations('settings.calendar_management');
   const timeFormat = useSettingsStore((s) => s.timeFormat);
   const sharedCalendarColors = useSettingsStore((s) => s.sharedCalendarColors);
   const setSharedCalendarColor = useSettingsStore((s) => s.setSharedCalendarColor);
@@ -594,54 +596,6 @@ export function CalendarManagementSettings() {
             );
           }
 
-          if (deletingId === cal.id) {
-            return (
-              <div key={cal.id} className="flex items-center gap-3 py-2.5 px-3 bg-destructive/5 rounded-md border border-destructive/20">
-                <Trash2 className="w-4 h-4 text-destructive flex-shrink-0" />
-                <p className="text-sm text-foreground flex-1">
-                  {t('confirm_delete', { name: cal.name })}
-                </p>
-                <button
-                  onClick={() => handleDelete(cal.id)}
-                  disabled={isLoading}
-                  className="px-3 py-1 text-xs font-medium bg-destructive text-destructive-foreground rounded-md hover:bg-destructive/90 disabled:opacity-50"
-                >
-                  {t('delete')}
-                </button>
-                <button
-                  onClick={() => setDeletingId(null)}
-                  className="px-3 py-1 text-xs bg-muted text-foreground rounded-md hover:bg-accent"
-                >
-                  {t('cancel')}
-                </button>
-              </div>
-            );
-          }
-
-          if (clearingId === cal.id) {
-            return (
-              <div key={cal.id} className="flex items-center gap-3 py-2.5 px-3 bg-amber-500/5 rounded-md border border-amber-500/20">
-                <Eraser className="w-4 h-4 text-amber-600 dark:text-amber-400 flex-shrink-0" />
-                <p className="text-sm text-foreground flex-1">
-                  {t('confirm_clear', { name: cal.name })}
-                </p>
-                <button
-                  onClick={() => handleClear(cal.id)}
-                  disabled={isLoading}
-                  className="px-3 py-1 text-xs font-medium bg-amber-600 text-white rounded-md hover:bg-amber-700 disabled:opacity-50"
-                >
-                  {t('clear_events')}
-                </button>
-                <button
-                  onClick={() => setClearingId(null)}
-                  className="px-3 py-1 text-xs bg-muted text-foreground rounded-md hover:bg-accent"
-                >
-                  {t('cancel')}
-                </button>
-              </div>
-            );
-          }
-
           return (
             <div
               key={cal.id}
@@ -873,30 +827,6 @@ export function CalendarManagementSettings() {
             {tSub('section_title')}
           </h4>
           {icalSubscriptions.map((sub) => {
-            if (deletingSubId === sub.id) {
-              return (
-                <div key={sub.id} className="flex items-center gap-3 py-2.5 px-3 bg-destructive/5 rounded-md border border-destructive/20">
-                  <Trash2 className="w-4 h-4 text-destructive flex-shrink-0" />
-                  <p className="text-sm text-foreground flex-1">
-                    {tSub('confirm_delete', { name: sub.name })}
-                  </p>
-                  <button
-                    onClick={() => handleDeleteSubscription(sub.id)}
-                    disabled={isLoading}
-                    className="px-3 py-1 text-xs font-medium bg-destructive text-destructive-foreground rounded-md hover:bg-destructive/90 disabled:opacity-50"
-                  >
-                    {t('delete')}
-                  </button>
-                  <button
-                    onClick={() => setDeletingSubId(null)}
-                    className="px-3 py-1 text-xs bg-muted text-foreground rounded-md hover:bg-accent"
-                  >
-                    {t('cancel')}
-                  </button>
-                </div>
-              );
-            }
-
             return (
               <div
                 key={sub.id}
@@ -956,6 +886,35 @@ export function CalendarManagementSettings() {
         </div>
       )}
 
+      {/* Not reversible, so each asks first (R3). */}
+      <ConfirmDialog
+        isOpen={!!deletingId}
+        onClose={() => setDeletingId(null)}
+        onConfirm={() => { if (deletingId) void handleDelete(deletingId); }}
+        title={tConfirm('delete_title')}
+        message={t('confirm_delete', { name: calendars.find((cal) => cal.id === deletingId)?.name ?? '' })}
+        confirmText={t('delete')}
+        variant="destructive"
+      />
+      <ConfirmDialog
+        isOpen={!!clearingId}
+        onClose={() => setClearingId(null)}
+        onConfirm={() => { if (clearingId) void handleClear(clearingId); }}
+        title={tConfirm('clear_title')}
+        message={t('confirm_clear', { name: calendars.find((cal) => cal.id === clearingId)?.name ?? '' })}
+        confirmText={t('clear_events')}
+        variant="destructive"
+      />
+      <ConfirmDialog
+        isOpen={!!deletingSubId}
+        onClose={() => setDeletingSubId(null)}
+        onConfirm={() => { if (deletingSubId) void handleDeleteSubscription(deletingSubId); }}
+        title={tConfirm('unsubscribe_title')}
+        message={tSub('confirm_delete', { name: icalSubscriptions.find((sub) => sub.id === deletingSubId)?.name ?? '' })}
+        confirmText={tSub('unsubscribe')}
+        variant="destructive"
+      />
+
       {showImportModal && client && (
         <ICalImportModal
           calendars={calendars}
diff --git a/components/settings/filter-settings.tsx b/components/settings/filter-settings.tsx
index 902dcd514..b47ff8137 100644
--- a/components/settings/filter-settings.tsx
+++ b/components/settings/filter-settings.tsx
@@ -5,6 +5,8 @@ import { useTranslations } from "next-intl";
 import { SettingsSection, ToggleSwitch } from "./settings-section";
 import { Button } from "@/components/ui/button";
 import { IconButton } from "@/components/ui/icon-button";
+import { ConfirmDialog } from "@/components/ui/confirm-dialog";
+import { useConfirmDialog } from "@/hooks/use-confirm-dialog";
 import { FilterRuleModal } from "@/components/filters/filter-rule-modal";
 import { SieveEditorModal } from "@/components/filters/sieve-editor-modal";
 import { useFilterStore } from "@/stores/filter-store";
@@ -289,7 +291,6 @@ export function FilterSettings() {
   const [editingRule, setEditingRule] = useState<FilterRule | undefined>();
   const [showRuleModal, setShowRuleModal] = useState(false);
   const [showSieveEditor, setShowSieveEditor] = useState(false);
-  const [showResetConfirm, setShowResetConfirm] = useState(false);
   const [dragOverIndex, setDragOverIndex] = useState<number | null>(null);
   const draggedIndexRef = useRef<number | null>(null);
 
@@ -410,13 +411,17 @@ export function FilterSettings() {
     [client, setRawScript, saveFilters, tNotifications]
   );
 
+  const { dialogProps: confirmProps, confirm } = useConfirmDialog();
+  // The script typed in the raw editor is thrown away, so it asks first (R3).
   const handleResetToVisual = useCallback(async () => {
-    if (!showResetConfirm) {
-      setShowResetConfirm(true);
-      return;
-    }
+    const ok = await confirm({
+      title: t("reset_title"),
+      message: t("reset_warning"),
+      confirmText: t("confirm_reset"),
+      variant: "destructive",
+    });
+    if (!ok) return;
     resetToVisualBuilder();
-    setShowResetConfirm(false);
     if (client) {
       try {
         await saveFilters(client);
@@ -425,7 +430,7 @@ export function FilterSettings() {
         toast.error(tNotifications("filters_save_failed"));
       }
     }
-  }, [showResetConfirm, resetToVisualBuilder, client, saveFilters, tNotifications]);
+  }, [confirm, t, resetToVisualBuilder, client, saveFilters, tNotifications]);
 
   const handleValidate = useCallback(
     async (content: string) => {
@@ -535,34 +540,14 @@ export function FilterSettings() {
                 >
                   {t("open_sieve_editor")}
                 </button>
-                {showResetConfirm ? (
-                  <span className="flex items-center gap-2">
-                    <span className="text-red-600 dark:text-red-400">{t("reset_warning")}</span>
-                    <button
-                      type="button"
-                      onClick={handleResetToVisual}
-                      className="text-red-600 dark:text-red-400 hover:underline font-medium"
-                    >
-                      {t("confirm_reset")}
-                    </button>
-                    <button
-                      type="button"
-                      onClick={() => setShowResetConfirm(false)}
-                      className="text-muted-foreground hover:underline"
-                    >
-                      {t("cancel")}
-                    </button>
-                  </span>
-                ) : (
-                  <button
-                    type="button"
-                    onClick={handleResetToVisual}
-                    className="text-red-600 dark:text-red-400 hover:underline font-medium flex items-center gap-1"
-                  >
-                    <RotateCcw className="w-3.5 h-3.5" />
-                    {t("reset_to_visual")}
-                  </button>
-                )}
+                <button
+                  type="button"
+                  onClick={() => void handleResetToVisual()}
+                  className="text-red-600 dark:text-red-400 hover:underline font-medium flex items-center gap-1"
+                >
+                  <RotateCcw className="w-3.5 h-3.5" />
+                  {t("reset_to_visual")}
+                </button>
               </div>
             </div>
           </div>
@@ -798,6 +783,7 @@ export function FilterSettings() {
           onValidate={handleValidate}
         />
       )}
+      <ConfirmDialog {...confirmProps} />
     </div>
   );
 }
diff --git a/components/settings/folder-settings.tsx b/components/settings/folder-settings.tsx
index cfe298e36..277fbf6f1 100644
--- a/components/settings/folder-settings.tsx
+++ b/components/settings/folder-settings.tsx
@@ -18,6 +18,8 @@ import {
   type AppIcon,
 } from '@/components/icons';
 import { IconButton } from '@/components/ui/icon-button';
+import { ConfirmDialog } from '@/components/ui/confirm-dialog';
+import { useConfirmDialog } from '@/hooks/use-confirm-dialog';
 import { ContextMenu, ContextMenuItem, ContextMenuSeparator, ContextMenuSubMenu } from '@/components/ui/context-menu';
 import { useContextMenu } from '@/hooks/use-context-menu';
 import { cn, buildMailboxTree, flattenMailboxTree, type MailboxNode } from '@/lib/utils';
@@ -185,7 +187,6 @@ export function FolderSettings() {
   const [newFolderName, setNewFolderName] = useState('');
   const [editingId, setEditingId] = useState<string | null>(null);
   const [editingName, setEditingName] = useState('');
-  const [deletingId, setDeletingId] = useState<string | null>(null);
   const [iconPickerId, setIconPickerId] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(false);
   const [expandedFolders, setExpandedFolders] = useState<Set<string>>(new Set());
@@ -450,12 +451,21 @@ export function FolderSettings() {
     }
   };
 
-  const handleDelete = async (mailboxId: string) => {
+  const { dialogProps: confirmProps, confirm } = useConfirmDialog();
+
+  // Not reversible, so it asks first (R3).
+  const handleDelete = async (mailbox: { id: string; name: string }) => {
     if (!client) return;
+    const ok = await confirm({
+      title: t('delete_title'),
+      message: t('confirm_delete', { name: mailbox.name }),
+      confirmText: t('delete'),
+      variant: 'destructive',
+    });
+    if (!ok) return;
     setIsLoading(true);
     try {
-      if (!(await deleteMailbox(client, mailboxId))) return;
-      setDeletingId(null);
+      if (!(await deleteMailbox(client, mailbox.id))) return;
       toast.success(t('folder_deleted'));
     } catch (err: unknown) {
       switch (jmapErrorType(err)) {
@@ -604,31 +614,6 @@ export function FolderSettings() {
       );
     }
 
-    if (deletingId === mb.id) {
-      return (
-        <div key={mb.id}>
-        <div className="flex items-center gap-3 py-2.5 px-3 bg-destructive/5 rounded-md border border-destructive/20" style={{ marginInlineStart: depth * 16 }}>
-          <Trash2 className="w-4 h-4 text-destructive flex-shrink-0" />
-          <p className="text-sm text-foreground flex-1">
-            {t('confirm_delete', { name: mb.name })}
-          </p>
-          <button
-            onClick={() => handleDelete(mb.id)}
-            disabled={isLoading}
-            className="px-3 py-1 text-xs font-medium bg-destructive text-destructive-foreground rounded-md hover:bg-destructive/90 disabled:opacity-50"
-          >
-            {t('delete')}
-          </button>
-          <button
-            onClick={() => setDeletingId(null)}
-            className="px-3 py-1 text-xs bg-muted text-foreground rounded-md hover:bg-accent"
-          >
-            {t('cancel')}
-          </button>
-        </div>
-        </div>
-      );
-    }
 
     return (
       <div key={mb.id}>
@@ -770,7 +755,7 @@ export function FolderSettings() {
             {mb.myRights?.mayDelete && !mb.role && (
               <IconButton
                 label={t('delete')}
-                onClick={() => setDeletingId(mb.id)}
+                onClick={() => void handleDelete(mb)}
                 className="text-muted-foreground hover:text-destructive hover:bg-destructive/10"
               >
                 <Trash2 />
@@ -827,7 +812,7 @@ export function FolderSettings() {
         {canDelete && (
           <>
             <ContextMenuSeparator />
-            <ContextMenuItem icon={Trash2} label={t('delete')} destructive onClick={run(() => setDeletingId(mb.id))} />
+            <ContextMenuItem icon={Trash2} label={t('delete')} destructive onClick={run(() => void handleDelete(mb))} />
           </>
         )}
       </ContextMenu>
@@ -837,6 +822,7 @@ export function FolderSettings() {
   return (
     <div className="space-y-8">
       {renderRowMenu()}
+      <ConfirmDialog {...confirmProps} />
       {/* Folder List - primary section */}
       <SettingsSection id="folders" title={t('folder_list')} description={t('folder_list_description')}>
         {selectedCount > 0 && (
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 2741f3f87..53f8336bb 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "لن تتمكن الأجهزة الأخرى من استعادة الحسابات منها بعد الآن.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1895,6 +1896,8 @@
         "removed": "تمت إزالة كلمة مرور التطبيق",
         "add_error": "فشل إنشاء كلمة مرور التطبيق",
         "remove_error": "فشلت إزالة كلمة مرور التطبيق",
+        "delete_title": "حذف كلمة مرور التطبيق؟",
+        "delete_message": "لن تتمكن التطبيقات التي تسجّل الدخول باستخدام {name} من تسجيل الدخول بعد الآن.",
         "none": "لا توجد كلمات مرور تطبيقات مُعدَّة"
       },
       "api_keys": {
@@ -1907,6 +1910,8 @@
         "removed": "تمت إزالة مفتاح API",
         "add_error": "فشل إنشاء مفتاح API",
         "remove_error": "فشلت إزالة مفتاح API",
+        "delete_title": "حذف مفتاح API؟",
+        "delete_message": "ستفقد البرامج النصية والتكاملات التي تستخدم {name} الوصول.",
         "none": "لا توجد مفاتيح API مُعدَّة"
       },
       "encryption": {
@@ -1926,6 +1931,9 @@
         "configure_title": "تفعيل التشفير باستخدام هذا المفتاح",
         "enable_button": "تفعيل",
         "disable_tooltip": "تعطيل التشفير",
+        "disable_title": "إيقاف تشفير البيانات المخزنة؟",
+        "disable_message": "سيُخزَّن البريد الجديد بدون تشفير من الآن فصاعدًا.",
+        "disable_button": "إيقاف",
         "enabled_success": "تم تفعيل التشفير أثناء التخزين"
       },
       "email_client": {
@@ -1974,7 +1982,14 @@
         "name_placeholder": "مثال: مفتاحي",
         "key_label": "المفتاح العام (S/MIME أو PGP بترميز ASCII)",
         "key_placeholder": "الصق مفتاحك العام هنا",
-        "none": "لا توجد مفاتيح عامة مُعدّة"
+        "none": "لا توجد مفاتيح عامة مُعدّة",
+        "title": "المفاتيح العامة",
+        "added": "تمت إضافة المفتاح العام",
+        "removed": "تم حذف المفتاح العام",
+        "add_error": "تعذّرت إضافة المفتاح العام",
+        "remove_error": "تعذّر حذف المفتاح العام",
+        "delete_title": "حذف المفتاح العام؟",
+        "delete_message": "ستتم إزالة {name} من الخادم."
       },
       "sections": {
         "devices": "تطبيقات وأجهزة أخرى",
@@ -2111,6 +2126,7 @@
       "count_mode_all": "غير المقروءة والإجمالي",
       "count_mode_none": "بدون عداد",
       "delete": "حذف",
+      "delete_title": "حذف المجلد؟",
       "confirm_delete": "هل أنت متأكد أنك تريد حذف \"{name}\"؟ ستُنقل الرسائل في هذا المجلد إلى المهملات.",
       "create": "إنشاء",
       "cancel": "إلغاء",
@@ -2257,6 +2273,11 @@
       "categories_description": "إعادة تسمية فئات جهات الاتصال",
       "no_categories": "لم يتم العثور على فئات"
     },
+    "calendar_management": {
+      "delete_title": "حذف التقويم؟",
+      "clear_title": "مسح كل الأحداث؟",
+      "unsubscribe_title": "إلغاء الاشتراك في هذا التقويم؟"
+    },
     "downloads": {
       "title": "التنزيلات",
       "description": "تخصيص كيفية تسمية الرسائل والمرفقات التي تُنزَّل.",
@@ -2411,6 +2432,7 @@
       "match_type": "نوع المطابقة",
       "reset_to_visual": "إعادة التعيين إلى أداة الإنشاء المرئي",
       "reset_warning": "سيؤدي هذا إلى تجاهل النص الحالي والبدء من جديد.",
+      "reset_title": "إعادة التعيين إلى المحرر المرئي؟",
       "confirm_reset": "إعادة التعيين",
       "validation_empty_name": "اسم القاعدة مطلوب",
       "validation_empty_conditions": "مطلوب شرط واحد على الأقل بقيمة",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index b3cfc550b..f4673dfc4 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Els altres dispositius ja no en podran restaurar els comptes.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1895,6 +1896,8 @@
         "removed": "Contrasenya d'aplicació eliminada",
         "add_error": "No s'ha pogut crear la contrasenya d'aplicació",
         "remove_error": "No s'ha pogut eliminar la contrasenya d'aplicació",
+        "delete_title": "Voleu suprimir la contrasenya d'aplicació?",
+        "delete_message": "Les aplicacions que inicien la sessió amb {name} ja no ho podran fer.",
         "none": "No hi ha cap contrasenya d'aplicació configurada"
       },
       "api_keys": {
@@ -1907,6 +1910,8 @@
         "removed": "Clau API eliminada",
         "add_error": "No s'ha pogut crear la clau API",
         "remove_error": "No s'ha pogut eliminar la clau API",
+        "delete_title": "Voleu suprimir la clau d'API?",
+        "delete_message": "Els scripts i les integracions que fan servir {name} perden l'accés.",
         "none": "No hi ha cap clau API configurada"
       },
       "encryption": {
@@ -1926,6 +1931,9 @@
         "configure_title": "Activa el xifratge amb aquesta clau",
         "enable_button": "Activa",
         "disable_tooltip": "Desactiva el xifratge",
+        "disable_title": "Voleu desactivar el xifratge en repòs?",
+        "disable_message": "A partir d'ara, el correu nou es desa sense xifrar.",
+        "disable_button": "Desactiva",
         "enabled_success": "Xifratge en repòs activat"
       },
       "email_client": {
@@ -1974,7 +1982,14 @@
         "name_placeholder": "p. ex. La meva clau",
         "key_label": "Clau pública (S/MIME o PGP en ASCII armor)",
         "key_placeholder": "Enganxeu aquí la vostra clau pública",
-        "none": "No hi ha cap clau pública configurada"
+        "none": "No hi ha cap clau pública configurada",
+        "title": "Claus públiques",
+        "added": "Clau pública afegida",
+        "removed": "Clau pública suprimida",
+        "add_error": "No s'ha pogut afegir la clau pública",
+        "remove_error": "No s'ha pogut suprimir la clau pública",
+        "delete_title": "Voleu suprimir la clau pública?",
+        "delete_message": "{name} es treu del servidor."
       },
       "sections": {
         "devices": "Altres aplicacions i dispositius",
@@ -2111,6 +2126,7 @@
       "count_mode_all": "No llegits i total",
       "count_mode_none": "Sense comptador",
       "delete": "Suprimeix",
+      "delete_title": "Voleu suprimir la carpeta?",
       "confirm_delete": "Segur que voleu suprimir «{name}»? Els correus d'aquesta carpeta es mouran a la paperera.",
       "create": "Crea",
       "cancel": "Cancel·la",
@@ -2257,6 +2273,11 @@
       "categories_description": "Canvieu el nom de les categories de contactes",
       "no_categories": "No s'ha trobat cap categoria"
     },
+    "calendar_management": {
+      "delete_title": "Voleu suprimir el calendari?",
+      "clear_title": "Voleu esborrar tots els esdeveniments?",
+      "unsubscribe_title": "Voleu cancel·lar la subscripció a aquest calendari?"
+    },
     "downloads": {
       "title": "Baixades",
       "description": "Personalitzeu com es nomenen els correus i fitxers adjunts baixats.",
@@ -2411,6 +2432,7 @@
       "match_type": "Tipus de coincidència",
       "reset_to_visual": "Torna al constructor visual",
       "reset_warning": "Això descartarà l'script actual i començarà de nou.",
+      "reset_title": "Voleu tornar a l'editor visual?",
       "confirm_reset": "Reinicia",
       "validation_empty_name": "El nom de la regla és obligatori",
       "validation_empty_conditions": "Cal com a mínim una condició amb un valor",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 985a19e39..03092b9a9 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Jiná zařízení z něj už účty neobnoví.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1888,6 +1889,8 @@
         "removed": "Heslo aplikace smazáno",
         "add_error": "Chyba při vytváření hesla aplikace",
         "remove_error": "Chyba při mazání hesla aplikace",
+        "delete_title": "Odstranit heslo aplikace?",
+        "delete_message": "Aplikace, které se přihlašují pomocí {name}, se už nepřihlásí.",
         "none": "Žádná hesla aplikací"
       },
       "api_keys": {
@@ -1900,6 +1903,8 @@
         "removed": "API klíč smazán",
         "add_error": "Chyba při vytváření API klíče",
         "remove_error": "Chyba při mazání API klíče",
+        "delete_title": "Odstranit klíč API?",
+        "delete_message": "Skripty a integrace, které používají {name}, ztratí přístup.",
         "none": "Žádné API klíče"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Zapnout šifrování tímto klíčem",
         "enable_button": "Zapnout",
         "disable_tooltip": "Vypnout šifrování",
+        "disable_title": "Vypnout šifrování uložených dat?",
+        "disable_message": "Nová pošta se od teď ukládá bez šifrování.",
+        "disable_button": "Vypnout",
         "enabled_success": "Šifrování dat v klidu zapnuto"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "např. Můj klíč",
         "key_label": "Veřejný klíč (S/MIME nebo PGP ve formátu ASCII)",
         "key_placeholder": "Sem vložte svůj veřejný klíč",
-        "none": "Nejsou nastaveny žádné veřejné klíče"
+        "none": "Nejsou nastaveny žádné veřejné klíče",
+        "title": "Veřejné klíče",
+        "added": "Veřejný klíč byl přidán",
+        "removed": "Veřejný klíč byl odstraněn",
+        "add_error": "Veřejný klíč se nepodařilo přidat",
+        "remove_error": "Veřejný klíč se nepodařilo odstranit",
+        "delete_title": "Odstranit veřejný klíč?",
+        "delete_message": "{name} bude odebrán ze serveru."
       },
       "sections": {
         "devices": "Další aplikace a zařízení",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Nepřečtené a celkem",
       "count_mode_none": "Bez počítadla",
       "delete": "Odstranit",
+      "delete_title": "Odstranit složku?",
       "confirm_delete": "Opravdu chcete odstranit složku „{name}“? Zprávy v této složce budou přesunuty do Koše.",
       "create": "Vytvořit",
       "cancel": "Zrušit",
@@ -2250,6 +2266,11 @@
       "categories_description": "Přejmenovat kategorie kontaktů",
       "no_categories": "Nenalezeny žádné kategorie"
     },
+    "calendar_management": {
+      "delete_title": "Odstranit kalendář?",
+      "clear_title": "Vymazat všechny události?",
+      "unsubscribe_title": "Zrušit odběr tohoto kalendáře?"
+    },
     "downloads": {
       "title": "Stažené",
       "description": "Přizpůsobte si, jak se pojmenovávají stažené e-maily a přílohy.",
@@ -2404,6 +2425,7 @@
       "match_type": "Typ shody",
       "reset_to_visual": "Resetovat na vizuálního průvodce",
       "reset_warning": "Tímto zahodíte aktuální skript a začnete znovu.",
+      "reset_title": "Obnovit vizuální editor?",
       "confirm_reset": "Resetovat",
       "validation_empty_name": "Název pravidla je vyžadován",
       "validation_empty_conditions": "Je vyžadována alespoň jedna podmínka s hodnotou",
diff --git a/locales/da/common.json b/locales/da/common.json
index 97fc8ec71..ad480815b 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Andre enheder kan ikke længere gendanne kontiene fra den.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1891,6 +1892,8 @@
         "removed": "App-adgangskode fjernet",
         "add_error": "Kunne ikke oprette app-adgangskode",
         "remove_error": "Kunne ikke fjerne app-adgangskode",
+        "delete_title": "Slet app-adgangskoden?",
+        "delete_message": "Apps, der logger ind med {name}, kan ikke længere logge ind.",
         "none": "Ingen app-adgangskoder konfigureret"
       },
       "api_keys": {
@@ -1903,6 +1906,8 @@
         "removed": "API-nøgle fjernet",
         "add_error": "Kunne ikke oprette API-nøgle",
         "remove_error": "Kunne ikke fjerne API-nøgle",
+        "delete_title": "Slet API-nøglen?",
+        "delete_message": "Scripts og integrationer, der bruger {name}, mister adgangen.",
         "none": "Ingen API-nøgler konfigureret"
       },
       "encryption": {
@@ -1922,6 +1927,9 @@
         "configure_title": "Aktivér kryptering med denne nøgle",
         "enable_button": "Aktivér",
         "disable_tooltip": "Deaktivér kryptering",
+        "disable_title": "Slå kryptering af lagrede data fra?",
+        "disable_message": "Ny post gemmes fra nu af uden kryptering.",
+        "disable_button": "Slå fra",
         "enabled_success": "Kryptering af lagrede data aktiveret"
       },
       "email_client": {
@@ -1970,7 +1978,14 @@
         "name_placeholder": "f.eks. Min nøgle",
         "key_label": "Offentlig nøgle (S/MIME eller PGP i ASCII-format)",
         "key_placeholder": "Indsæt din offentlige nøgle her",
-        "none": "Ingen offentlige nøgler konfigureret"
+        "none": "Ingen offentlige nøgler konfigureret",
+        "title": "Offentlige nøgler",
+        "added": "Offentlig nøgle tilføjet",
+        "removed": "Offentlig nøgle slettet",
+        "add_error": "Den offentlige nøgle kunne ikke tilføjes",
+        "remove_error": "Den offentlige nøgle kunne ikke slettes",
+        "delete_title": "Slet den offentlige nøgle?",
+        "delete_message": "{name} fjernes fra serveren."
       },
       "sections": {
         "devices": "Andre apps og enheder",
@@ -2107,6 +2122,7 @@
       "count_mode_all": "Ulæste og i alt",
       "count_mode_none": "Ingen tæller",
       "delete": "Slet",
+      "delete_title": "Slet mappen?",
       "confirm_delete": "Er du sikker på, at du vil slette \"{name}\"? E-mails i denne mappe flyttes til papirkurven.",
       "create": "Opret",
       "cancel": "Annuller",
@@ -2253,6 +2269,11 @@
       "categories_description": "Omdøb kontaktkategorier",
       "no_categories": "Ingen kategorier fundet"
     },
+    "calendar_management": {
+      "delete_title": "Slet kalenderen?",
+      "clear_title": "Ryd alle begivenheder?",
+      "unsubscribe_title": "Afmeld denne kalender?"
+    },
     "downloads": {
       "title": "Downloads",
       "description": "Tilpas hvordan downloadede e-mails og vedhæftede filer navngives.",
@@ -2407,6 +2428,7 @@
       "match_type": "Match-type",
       "reset_to_visual": "Nulstil til visuel builder",
       "reset_warning": "Dette vil kassere det nuværende script og starte forfra.",
+      "reset_title": "Nulstil til den visuelle editor?",
       "confirm_reset": "Nulstil",
       "validation_empty_name": "Regelnavn er påkrævet",
       "validation_empty_conditions": "Mindst én betingelse med en værdi er påkrævet",
diff --git a/locales/de/common.json b/locales/de/common.json
index 5b2c295cb..b9d421235 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Gespeicherte Liste löschen",
         "cancel": "Abbrechen",
         "delete_confirm": "Die gespeicherte Kontoliste vom Server löschen?",
+        "delete_message": "Andere Geräte können die Konten danach nicht mehr daraus wiederherstellen.",
         "password": "Sicherungspasswort",
         "password_hint": "Mindestens 10 Zeichen. Es kann nicht wiederhergestellt werden: Wenn Sie es vergessen, speichern Sie die Liste erneut mit einem neuen.",
         "restore_hint": "Das Passwort, das beim Speichern der Liste gewählt wurde.",
@@ -1882,6 +1883,8 @@
         "removed": "App-Passwort entfernt",
         "add_error": "App-Passwort konnte nicht erstellt werden",
         "remove_error": "App-Passwort konnte nicht entfernt werden",
+        "delete_title": "App-Passwort löschen?",
+        "delete_message": "Apps, die sich mit {name} anmelden, können sich danach nicht mehr anmelden.",
         "none": "Keine App-Passwörter konfiguriert",
         "done": "Fertig",
         "expires_label": "Läuft ab (optional)",
@@ -1900,6 +1903,8 @@
         "removed": "API-Schlüssel entfernt",
         "add_error": "API-Schlüssel konnte nicht erstellt werden",
         "remove_error": "API-Schlüssel konnte nicht entfernt werden",
+        "delete_title": "API-Schlüssel löschen?",
+        "delete_message": "Skripte und Integrationen, die {name} verwenden, verlieren den Zugriff.",
         "none": "Keine API-Schlüssel konfiguriert"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Verschlüsselung mit diesem Schlüssel aktivieren",
         "enable_button": "Aktivieren",
         "disable_tooltip": "Verschlüsselung deaktivieren",
+        "disable_title": "Verschlüsselung ruhender Daten ausschalten?",
+        "disable_message": "Neue E-Mails werden ab jetzt unverschlüsselt gespeichert.",
+        "disable_button": "Ausschalten",
         "enabled_success": "Verschlüsselung im Ruhezustand aktiviert"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "z.B. Mein Schlüssel",
         "key_label": "Öffentlicher Schlüssel (S/MIME oder PGP im ASCII-Format)",
         "key_placeholder": "Fügen Sie hier Ihren öffentlichen Schlüssel ein",
-        "none": "Keine öffentlichen Schlüssel konfiguriert"
+        "none": "Keine öffentlichen Schlüssel konfiguriert",
+        "title": "Öffentliche Schlüssel",
+        "added": "Öffentlicher Schlüssel hinzugefügt",
+        "removed": "Öffentlicher Schlüssel gelöscht",
+        "add_error": "Öffentlicher Schlüssel konnte nicht hinzugefügt werden",
+        "remove_error": "Öffentlicher Schlüssel konnte nicht gelöscht werden",
+        "delete_title": "Öffentlichen Schlüssel löschen?",
+        "delete_message": "{name} wird vom Server entfernt."
       },
       "sections": {
         "devices": "Andere Apps und Geräte",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Ungelesene und gesamt",
       "count_mode_none": "Kein Zähler",
       "delete": "Löschen",
+      "delete_title": "Ordner löschen?",
       "confirm_delete": "Möchten Sie \"{name}\" wirklich löschen? E-Mails in diesem Ordner werden in den Papierkorb verschoben.",
       "create": "Erstellen",
       "cancel": "Abbrechen",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "Nach Nachname sortieren",
       "sort_by_last_name_description": "Kontaktliste nach Nachnamen ordnen, damit Familienmitglieder zusammenstehen"
     },
+    "calendar_management": {
+      "delete_title": "Kalender löschen?",
+      "clear_title": "Alle Termine entfernen?",
+      "unsubscribe_title": "Dieses Kalenderabo beenden?"
+    },
     "downloads": {
       "title": "Downloads",
       "description": "Lege fest, wie heruntergeladene E-Mails und Anhänge benannt werden.",
@@ -2404,6 +2425,7 @@
       "match_type": "Übereinstimmungstyp",
       "reset_to_visual": "Zum visuellen Builder zurücksetzen",
       "reset_warning": "Dies verwirft das aktuelle Skript und beginnt von vorne.",
+      "reset_title": "Auf den visuellen Editor zurücksetzen?",
       "confirm_reset": "Zurücksetzen",
       "validation_empty_name": "Regelname ist erforderlich",
       "validation_empty_conditions": "Mindestens eine Bedingung mit einem Wert ist erforderlich",
diff --git a/locales/en/common.json b/locales/en/common.json
index 25bf64104..242da9e4c 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Other devices can't restore the accounts from it any more.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1895,6 +1896,8 @@
         "removed": "App password removed",
         "add_error": "Failed to create app password",
         "remove_error": "Failed to remove app password",
+        "delete_title": "Delete app password?",
+        "delete_message": "Apps that sign in with {name} can't sign in any more.",
         "none": "No app passwords configured"
       },
       "api_keys": {
@@ -1907,6 +1910,8 @@
         "removed": "API key removed",
         "add_error": "Failed to create API key",
         "remove_error": "Failed to remove API key",
+        "delete_title": "Delete API key?",
+        "delete_message": "Scripts and integrations that use {name} lose access.",
         "none": "No API keys configured"
       },
       "encryption": {
@@ -1926,6 +1931,9 @@
         "configure_title": "Enable encryption with this key",
         "enable_button": "Enable",
         "disable_tooltip": "Disable encryption",
+        "disable_title": "Turn off encryption at rest?",
+        "disable_message": "New mail is stored without encryption from now on.",
+        "disable_button": "Turn off",
         "enabled_success": "Encryption at rest enabled"
       },
       "public_keys": {
@@ -1933,7 +1941,14 @@
         "name_placeholder": "e.g. My Key",
         "key_label": "Public Key (S/MIME or PGP ASCII-armored)",
         "key_placeholder": "Paste your public key here",
-        "none": "No public keys configured"
+        "none": "No public keys configured",
+        "title": "Public keys",
+        "added": "Public key added",
+        "removed": "Public key deleted",
+        "add_error": "Couldn't add the public key",
+        "remove_error": "Couldn't delete the public key",
+        "delete_title": "Delete public key?",
+        "delete_message": "{name} is removed from the server."
       },
       "email_client": {
         "title": "Email Client Setup",
@@ -2111,6 +2126,7 @@
       "count_mode_all": "Unread and total",
       "count_mode_none": "No counter",
       "delete": "Delete",
+      "delete_title": "Delete folder?",
       "confirm_delete": "Are you sure you want to delete \"{name}\"? Emails in this folder will be moved to Trash.",
       "create": "Create",
       "cancel": "Cancel",
@@ -2257,6 +2273,11 @@
       "categories_description": "Rename contact categories",
       "no_categories": "No categories found"
     },
+    "calendar_management": {
+      "delete_title": "Delete calendar?",
+      "clear_title": "Clear all events?",
+      "unsubscribe_title": "Unsubscribe from this calendar?"
+    },
     "downloads": {
       "title": "Downloads",
       "description": "Customize how downloaded emails and attachments are named.",
@@ -2411,6 +2432,7 @@
       "match_type": "Match type",
       "reset_to_visual": "Reset to visual builder",
       "reset_warning": "This will discard the current script and start fresh.",
+      "reset_title": "Reset to the visual builder?",
       "confirm_reset": "Reset",
       "validation_empty_name": "Rule name is required",
       "validation_empty_conditions": "At least one condition with a value is required",
diff --git a/locales/es/common.json b/locales/es/common.json
index 18158ec71..878a02114 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Eliminar lista guardada",
         "cancel": "Cancelar",
         "delete_confirm": "¿Eliminar del servidor la lista de cuentas guardada?",
+        "delete_message": "Los demás dispositivos ya no podrán restaurar las cuentas desde ella.",
         "password": "Contraseña de la copia",
         "password_hint": "Al menos 10 caracteres. No se puede recuperar: si la olvidas, vuelve a guardar la lista con una nueva.",
         "restore_hint": "La contraseña elegida al guardar la lista.",
@@ -1882,6 +1883,8 @@
         "removed": "Contraseña de aplicación eliminada",
         "add_error": "No se pudo crear la contraseña de aplicación",
         "remove_error": "No se pudo eliminar la contraseña de aplicación",
+        "delete_title": "¿Eliminar la contraseña de aplicación?",
+        "delete_message": "Las aplicaciones que inician sesión con {name} ya no podrán hacerlo.",
         "none": "No hay contraseñas de aplicación configuradas",
         "done": "Hecho",
         "expires_label": "Caduca (opcional)",
@@ -1900,6 +1903,8 @@
         "removed": "Clave API eliminada",
         "add_error": "No se pudo crear la clave API",
         "remove_error": "No se pudo eliminar la clave API",
+        "delete_title": "¿Eliminar la clave de API?",
+        "delete_message": "Los scripts e integraciones que usan {name} pierden el acceso.",
         "none": "No hay claves API configuradas"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Habilitar el cifrado con esta clave",
         "enable_button": "Habilitar",
         "disable_tooltip": "Deshabilitar el cifrado",
+        "disable_title": "¿Desactivar el cifrado en reposo?",
+        "disable_message": "A partir de ahora, el correo nuevo se guarda sin cifrar.",
+        "disable_button": "Desactivar",
         "enabled_success": "Cifrado en reposo habilitado"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "ej. Mi clave",
         "key_label": "Clave pública (S/MIME o PGP en formato ASCII)",
         "key_placeholder": "Pega aquí tu clave pública",
-        "none": "No hay claves públicas configuradas"
+        "none": "No hay claves públicas configuradas",
+        "title": "Claves públicas",
+        "added": "Clave pública añadida",
+        "removed": "Clave pública eliminada",
+        "add_error": "No se pudo añadir la clave pública",
+        "remove_error": "No se pudo eliminar la clave pública",
+        "delete_title": "¿Eliminar la clave pública?",
+        "delete_message": "{name} se quita del servidor."
       },
       "sections": {
         "devices": "Otras aplicaciones y dispositivos",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "No leídos y total",
       "count_mode_none": "Sin contador",
       "delete": "Eliminar",
+      "delete_title": "¿Eliminar la carpeta?",
       "confirm_delete": "¿Está seguro de que desea eliminar \"{name}\"? Los correos de esta carpeta se moverán a la Papelera.",
       "create": "Crear",
       "cancel": "Cancelar",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "Ordenar por apellido",
       "sort_by_last_name_description": "Ordenar la lista de contactos por apellido para que los miembros de una familia aparezcan juntos"
     },
+    "calendar_management": {
+      "delete_title": "¿Eliminar el calendario?",
+      "clear_title": "¿Borrar todos los eventos?",
+      "unsubscribe_title": "¿Cancelar la suscripción a este calendario?"
+    },
     "downloads": {
       "title": "Descargas",
       "description": "Personaliza cómo se nombran los correos y archivos adjuntos descargados.",
@@ -2404,6 +2425,7 @@
       "match_type": "Tipo de coincidencia",
       "reset_to_visual": "Restablecer al constructor visual",
       "reset_warning": "Esto descartará el script actual y comenzará de nuevo.",
+      "reset_title": "¿Restablecer al editor visual?",
       "confirm_reset": "Restablecer",
       "validation_empty_name": "El nombre de la regla es obligatorio",
       "validation_empty_conditions": "Se requiere al menos una condición con un valor",
diff --git a/locales/et/common.json b/locales/et/common.json
index 5d4dd429f..8a86a5aca 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Kustuta salvestatud nimekiri",
         "cancel": "Tühista",
         "delete_confirm": "Kas kustutada salvestatud kontode nimekiri serverist?",
+        "delete_message": "Teised seadmed ei saa enam kontosid sellest taastada.",
         "password": "Varukoopia parool",
         "password_hint": "Vähemalt 10 märki. Seda ei saa taastada: kui unustad, salvesta nimekiri uuesti uue parooliga.",
         "restore_hint": "Parool, mille valisid nimekirja salvestamisel.",
@@ -1895,6 +1896,8 @@
         "removed": "Rakenduse parool eemaldatud",
         "add_error": "Rakenduse parooli loomine ebaõnnestus",
         "remove_error": "Rakenduse parooli eemaldamine ebaõnnestus",
+        "delete_title": "Kustutada rakenduse parool?",
+        "delete_message": "Rakendused, mis logivad sisse parooliga {name}, ei saa enam sisse logida.",
         "none": "Ühtegi rakenduse parooli pole seadistatud"
       },
       "api_keys": {
@@ -1907,6 +1910,8 @@
         "removed": "API võti eemaldatud",
         "add_error": "API võtme loomine ebaõnnestus",
         "remove_error": "API võtme eemaldamine ebaõnnestus",
+        "delete_title": "Kustutada API-võti?",
+        "delete_message": "Skriptid ja liidestused, mis kasutavad võtit {name}, kaotavad ligipääsu.",
         "none": "Ühtegi API võtit pole seadistatud"
       },
       "encryption": {
@@ -1926,6 +1931,9 @@
         "configure_title": "Luba krüpteerimine selle võtmega",
         "enable_button": "Luba",
         "disable_tooltip": "Keela krüpteerimine",
+        "disable_title": "Lülitada salvestatud andmete krüpteerimine välja?",
+        "disable_message": "Uued kirjad salvestatakse nüüdsest krüpteerimata.",
+        "disable_button": "Lülita välja",
         "enabled_success": "Salvestatud andmete krüpteerimine lubatud"
       },
       "public_keys": {
@@ -1933,7 +1941,14 @@
         "name_placeholder": "nt Minu võti",
         "key_label": "Avalik võti (S/MIME või PGP ASCII-armored)",
         "key_placeholder": "Kleebi oma avalik võti siia",
-        "none": "Ühtegi avalikku võtit pole seadistatud"
+        "none": "Ühtegi avalikku võtit pole seadistatud",
+        "title": "Avalikud võtmed",
+        "added": "Avalik võti lisatud",
+        "removed": "Avalik võti kustutatud",
+        "add_error": "Avalikku võtit ei õnnestunud lisada",
+        "remove_error": "Avalikku võtit ei õnnestunud kustutada",
+        "delete_title": "Kustutada avalik võti?",
+        "delete_message": "{name} eemaldatakse serverist."
       },
       "email_client": {
         "title": "E-posti kliendi seadistus",
@@ -2111,6 +2126,7 @@
       "count_mode_all": "Lugemata ja kokku",
       "count_mode_none": "Loendurit pole",
       "delete": "Kustuta",
+      "delete_title": "Kustutada kaust?",
       "confirm_delete": "Kas oled kindel, et soovid kustutada kausta \"{name}\"? Selles kaustas olevad kirjad liigutatakse prügikasti.",
       "create": "Loo",
       "cancel": "Tühista",
@@ -2257,6 +2273,11 @@
       "categories_description": "Nimeta kontaktikategooriad ümber",
       "no_categories": "Kategooriaid ei leitud"
     },
+    "calendar_management": {
+      "delete_title": "Kustutada kalender?",
+      "clear_title": "Tühjendada kõik sündmused?",
+      "unsubscribe_title": "Loobuda selle kalendri tellimusest?"
+    },
     "downloads": {
       "title": "Allalaadimised",
       "description": "Kohanda, kuidas allalaaditud kirjad ja manused nimetatakse.",
@@ -2411,6 +2432,7 @@
       "match_type": "Vastavuse tüüp",
       "reset_to_visual": "Lähtesta visuaalsele koostajale",
       "reset_warning": "See hülgab praeguse skripti ja alustab uuesti.",
+      "reset_title": "Lähtestada visuaalsele redaktorile?",
       "confirm_reset": "Lähtesta",
       "validation_empty_name": "Reegli nimi on kohustuslik",
       "validation_empty_conditions": "Vajalik on vähemalt üks väärtusega tingimus",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index b63b18391..6c19d8994 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "دستگاه‌های دیگر دیگر نمی‌توانند حساب‌ها را از آن بازیابی کنند.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1895,6 +1896,8 @@
         "removed": "حذف شد",
         "add_error": "خطای ایجاد",
         "remove_error": "خطای حذف",
+        "delete_title": "گذرواژه برنامه حذف شود؟",
+        "delete_message": "برنامه‌هایی که با {name} وارد می‌شوند دیگر نمی‌توانند وارد شوند.",
         "none": "پیکربندی نشده"
       },
       "api_keys": {
@@ -1907,6 +1910,8 @@
         "removed": "حذف شد",
         "add_error": "خطای ایجاد",
         "remove_error": "خطای حذف",
+        "delete_title": "کلید API حذف شود؟",
+        "delete_message": "اسکریپت‌ها و یکپارچه‌سازی‌هایی که از {name} استفاده می‌کنند دسترسی را از دست می‌دهند.",
         "none": "پیکربندی نشده"
       },
       "encryption": {
@@ -1926,6 +1931,9 @@
         "configure_title": "فعال‌سازی رمزنگاری با این کلید",
         "enable_button": "فعال‌سازی",
         "disable_tooltip": "غیرفعال‌سازی رمزنگاری",
+        "disable_title": "رمزگذاری داده‌های ذخیره‌شده خاموش شود؟",
+        "disable_message": "از این پس نامه‌های جدید بدون رمزگذاری ذخیره می‌شوند.",
+        "disable_button": "خاموش کردن",
         "enabled_success": "فعال شد"
       },
       "email_client": {
@@ -1974,7 +1982,14 @@
         "name_placeholder": "مثال: کلید من",
         "key_label": "کلید عمومی (S/MIME یا PGP با قالب ASCII)",
         "key_placeholder": "کلید عمومی خود را اینجا بچسبانید",
-        "none": "هیچ کلید عمومی‌ای تنظیم نشده است"
+        "none": "هیچ کلید عمومی‌ای تنظیم نشده است",
+        "title": "کلیدهای عمومی",
+        "added": "کلید عمومی افزوده شد",
+        "removed": "کلید عمومی حذف شد",
+        "add_error": "افزودن کلید عمومی ممکن نشد",
+        "remove_error": "حذف کلید عمومی ممکن نشد",
+        "delete_title": "کلید عمومی حذف شود؟",
+        "delete_message": "{name} از سرور حذف می‌شود."
       },
       "sections": {
         "devices": "برنامه‌ها و دستگاه‌های دیگر",
@@ -2111,6 +2126,7 @@
       "count_mode_all": "خوانده‌نشده و کل",
       "count_mode_none": "بدون شمارنده",
       "delete": "حذف",
+      "delete_title": "پوشه حذف شود؟",
       "confirm_delete": "آیا از حذف \"{name}\" اطمینان دارید؟ ایمیل‌های این پوشه به زباله‌دان منتقل می‌شوند.",
       "create": "ایجاد",
       "cancel": "انصراف",
@@ -2257,6 +2273,11 @@
       "categories_description": "تغییر نام دسته‌بندی‌های مخاطبین",
       "no_categories": "دسته‌بندی یافت نشد"
     },
+    "calendar_management": {
+      "delete_title": "تقویم حذف شود؟",
+      "clear_title": "همه رویدادها پاک شوند؟",
+      "unsubscribe_title": "اشتراک این تقویم لغو شود؟"
+    },
     "downloads": {
       "title": "دانلودها",
       "description": "سفارشی‌سازی نام فایل‌های ایمیل و پیوست دانلودی.",
@@ -2411,6 +2432,7 @@
       "match_type": "نوع مطابقت",
       "reset_to_visual": "بازنشانی به ویرایشگر بصری",
       "reset_warning": "این اسکریپت فعلی را دور می‌اندازد و از نو شروع می‌کند.",
+      "reset_title": "به سازنده تصویری بازنشانی شود؟",
       "confirm_reset": "بازنشانی",
       "validation_empty_name": "نام قانون الزامی است",
       "validation_empty_conditions": "حداقل یک شرط با مقدار الزامی است",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 553069342..ef4e3319b 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Supprimer la liste enregistrée",
         "cancel": "Annuler",
         "delete_confirm": "Supprimer du serveur la liste de comptes enregistrée ?",
+        "delete_message": "Les autres appareils ne pourront plus en restaurer les comptes.",
         "password": "Mot de passe de la sauvegarde",
         "password_hint": "Au moins 10 caractères. Il ne peut pas être récupéré : si vous l'oubliez, enregistrez à nouveau la liste avec un nouveau mot de passe.",
         "restore_hint": "Le mot de passe choisi lors de l'enregistrement de la liste.",
@@ -1882,6 +1883,8 @@
         "removed": "Mot de passe d'application supprimé",
         "add_error": "Impossible de créer le mot de passe d'application",
         "remove_error": "Impossible de supprimer le mot de passe d'application",
+        "delete_title": "Supprimer le mot de passe d'application ?",
+        "delete_message": "Les applications qui se connectent avec {name} ne pourront plus se connecter.",
         "none": "Aucun mot de passe d'application configuré",
         "done": "Terminé",
         "expires_label": "Expire (facultatif)",
@@ -1900,6 +1903,8 @@
         "removed": "Clé API supprimée",
         "add_error": "Échec de la création de la clé API",
         "remove_error": "Échec de la suppression de la clé API",
+        "delete_title": "Supprimer la clé d'API ?",
+        "delete_message": "Les scripts et intégrations qui utilisent {name} perdent l'accès.",
         "none": "Aucune clé API configurée"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Activer le chiffrement avec cette clé",
         "enable_button": "Activer",
         "disable_tooltip": "Désactiver le chiffrement",
+        "disable_title": "Désactiver le chiffrement au repos ?",
+        "disable_message": "Les nouveaux e-mails seront désormais stockés sans chiffrement.",
+        "disable_button": "Désactiver",
         "enabled_success": "Chiffrement au repos activé"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "ex. Ma clé",
         "key_label": "Clé publique (S/MIME ou PGP au format ASCII)",
         "key_placeholder": "Collez votre clé publique ici",
-        "none": "Aucune clé publique configurée"
+        "none": "Aucune clé publique configurée",
+        "title": "Clés publiques",
+        "added": "Clé publique ajoutée",
+        "removed": "Clé publique supprimée",
+        "add_error": "Impossible d'ajouter la clé publique",
+        "remove_error": "Impossible de supprimer la clé publique",
+        "delete_title": "Supprimer la clé publique ?",
+        "delete_message": "{name} est retirée du serveur."
       },
       "sections": {
         "devices": "Autres applications et appareils",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Non lus et total",
       "count_mode_none": "Aucun compteur",
       "delete": "Supprimer",
+      "delete_title": "Supprimer le dossier ?",
       "confirm_delete": "Êtes-vous sûr de vouloir supprimer \"{name}\" ? Les e-mails de ce dossier seront déplacés dans la Corbeille.",
       "create": "Créer",
       "cancel": "Annuler",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "Trier par nom de famille",
       "sort_by_last_name_description": "Classer la liste des contacts par nom de famille pour regrouper les membres d'une même famille"
     },
+    "calendar_management": {
+      "delete_title": "Supprimer le calendrier ?",
+      "clear_title": "Effacer tous les événements ?",
+      "unsubscribe_title": "Se désabonner de ce calendrier ?"
+    },
     "downloads": {
       "title": "Téléchargements",
       "description": "Personnalisez la façon dont les e-mails et pièces jointes téléchargés sont nommés.",
@@ -2404,6 +2425,7 @@
       "match_type": "Type de correspondance",
       "reset_to_visual": "Revenir au constructeur visuel",
       "reset_warning": "Cela supprimera le script actuel et recommencera à zéro.",
+      "reset_title": "Revenir à l'éditeur visuel ?",
       "confirm_reset": "Réinitialiser",
       "validation_empty_name": "Le nom de la règle est requis",
       "validation_empty_conditions": "Au moins une condition avec une valeur est requise",
diff --git a/locales/he/common.json b/locales/he/common.json
index 2545a435e..0608d497f 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -1752,6 +1752,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "מכשירים אחרים לא יוכלו עוד לשחזר ממנה את החשבונות.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1847,6 +1848,8 @@
         "removed": "סיסמת האפליקציה הוסרה",
         "add_error": "יצירת סיסמת האפליקציה נכשלה",
         "remove_error": "הסרת סיסמת האפליקציה נכשלה",
+        "delete_title": "למחוק את סיסמת האפליקציה?",
+        "delete_message": "אפליקציות שמתחברות עם {name} לא יוכלו להתחבר יותר.",
         "none": "לא הוגדרו סיסמאות לאפליקציה",
         "done": "בוצע",
         "expires_label": "פג תוקף (אופציונלי)",
@@ -1872,6 +1875,9 @@
         "configure_title": "הפעל הצפנה עם מפתח זה",
         "enable_button": "הפעל",
         "disable_tooltip": "השבת הצפנה",
+        "disable_title": "לכבות את ההצפנה במנוחה?",
+        "disable_message": "דואר חדש יישמר מעכשיו ללא הצפנה.",
+        "disable_button": "כיבוי",
         "enabled_success": "הצפנה במנוחה מופעלת"
       },
       "email_client": {
@@ -1892,6 +1898,8 @@
         "removed": "מפתח API הוסר",
         "add_error": "נכשל ביצירת מפתח API",
         "remove_error": "נכשל בהסרת מפתח API",
+        "delete_title": "למחוק את מפתח ה-API?",
+        "delete_message": "סקריפטים ושילובים שמשתמשים ב-{name} יאבדו את הגישה.",
         "none": "אין מפתחות API מוגדרים"
       },
       "link_device": {
@@ -1932,7 +1940,14 @@
         "name_placeholder": "לדוגמה: המפתח שלי",
         "key_label": "מפתח ציבורי (S/MIME או PGP בפורמט ASCII)",
         "key_placeholder": "הדבק כאן את המפתח הציבורי שלך",
-        "none": "לא הוגדרו מפתחות ציבוריים"
+        "none": "לא הוגדרו מפתחות ציבוריים",
+        "title": "מפתחות ציבוריים",
+        "added": "המפתח הציבורי נוסף",
+        "removed": "המפתח הציבורי נמחק",
+        "add_error": "לא ניתן היה להוסיף את המפתח הציבורי",
+        "remove_error": "לא ניתן היה למחוק את המפתח הציבורי",
+        "delete_title": "למחוק את המפתח הציבורי?",
+        "delete_message": "{name} יוסר מהשרת."
       },
       "sections": {
         "devices": "אפליקציות ומכשירים אחרים",
@@ -2068,6 +2083,7 @@
       "count_mode_all": "שלא נקראו וסך הכול",
       "count_mode_none": "ללא מונה",
       "delete": "לִמְחוֹק",
+      "delete_title": "למחוק את התיקיה?",
       "confirm_delete": "האם אתה בטוח שברצונך למחוק את \"{name}\"? הודעות אימייל בתיקייה זו יועברו לאשפה.",
       "create": "צור",
       "cancel": "לְבַטֵל",
@@ -2216,6 +2232,11 @@
       "sort_by_last_name_description": "סידור רשימת אנשי הקשר לפי שם משפחה כך שבני אותה משפחה יופיעו יחד",
       "group_by_letter_description": "הצג כותרות חלקים אלפביתיים ברשימת אנשי הקשר"
     },
+    "calendar_management": {
+      "delete_title": "למחוק את היומן?",
+      "clear_title": "לנקות את כל האירועים?",
+      "unsubscribe_title": "לבטל את המינוי ליומן הזה?"
+    },
     "filters": {
       "title": "מסנני דואר אלקטרוני",
       "description": "צור כללים למיון, תיוג וניהול אוטומטי של הודעות דוא\"ל נכנסות",
@@ -2324,6 +2345,7 @@
       "match_type": "סוג התאמה",
       "reset_to_visual": "איפוס לבונה חזותי",
       "reset_warning": "פעולה זו תמחק את הסקריפט הנוכחי ויתחיל מחדש.",
+      "reset_title": "לאפס לעורך החזותי?",
       "confirm_reset": "אִתחוּל",
       "validation_empty_name": "נדרש שם כלל",
       "validation_empty_conditions": "נדרש לפחות תנאי אחד עם ערך",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 7b7914cbc..d9f2cb9b3 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Más eszközök többé nem tudják visszaállítani belőle a fiókokat.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1891,6 +1892,8 @@
         "removed": "Alkalmazás jelszó eltávolítva",
         "add_error": "Nem sikerült létrehozni az alkalmazás jelszót",
         "remove_error": "Nem sikerült eltávolítani az alkalmazás jelszót",
+        "delete_title": "Törli az alkalmazásjelszót?",
+        "delete_message": "A(z) {name} jelszóval bejelentkező alkalmazások többé nem tudnak bejelentkezni.",
         "none": "Nincs alkalmazás jelszó beállítva"
       },
       "api_keys": {
@@ -1903,6 +1906,8 @@
         "removed": "API kulcs eltávolítva",
         "add_error": "Nem sikerült létrehozni az API kulcsot",
         "remove_error": "Nem sikerült eltávolítani az API kulcsot",
+        "delete_title": "Törli az API-kulcsot?",
+        "delete_message": "A(z) {name} kulcsot használó szkriptek és integrációk elveszítik a hozzáférést.",
         "none": "Nincs API kulcs beállítva"
       },
       "encryption": {
@@ -1922,6 +1927,9 @@
         "configure_title": "Titkosítás engedélyezése ezzel a kulccsal",
         "enable_button": "Engedélyezés",
         "disable_tooltip": "Titkosítás letiltása",
+        "disable_title": "Kikapcsolja a tárolt adatok titkosítását?",
+        "disable_message": "Az új leveleket mostantól titkosítás nélkül tárolja a szerver.",
+        "disable_button": "Kikapcsolás",
         "enabled_success": "Titkosítás nyugalmi állapotban engedélyezve"
       },
       "email_client": {
@@ -1970,7 +1978,14 @@
         "name_placeholder": "pl. A kulcsom",
         "key_label": "Nyilvános kulcs (S/MIME vagy PGP ASCII formátumban)",
         "key_placeholder": "Illessze be ide a nyilvános kulcsát",
-        "none": "Nincs beállítva nyilvános kulcs"
+        "none": "Nincs beállítva nyilvános kulcs",
+        "title": "Nyilvános kulcsok",
+        "added": "Nyilvános kulcs hozzáadva",
+        "removed": "Nyilvános kulcs törölve",
+        "add_error": "Nem sikerült hozzáadni a nyilvános kulcsot",
+        "remove_error": "Nem sikerült törölni a nyilvános kulcsot",
+        "delete_title": "Törli a nyilvános kulcsot?",
+        "delete_message": "A(z) {name} törlődik a szerverről."
       },
       "sections": {
         "devices": "Más alkalmazások és eszközök",
@@ -2107,6 +2122,7 @@
       "count_mode_all": "Olvasatlan és összes",
       "count_mode_none": "Nincs számláló",
       "delete": "Törlés",
+      "delete_title": "Törli a mappát?",
       "confirm_delete": "Biztosan törölni szeretnéd a \"{name}\" mappát? A mappában lévő e-mailek a Kukába kerülnek.",
       "create": "Létrehozás",
       "cancel": "Mégse",
@@ -2253,6 +2269,11 @@
       "categories_description": "Névjegy kategóriák átnevezése",
       "no_categories": "Nincs kategória"
     },
+    "calendar_management": {
+      "delete_title": "Törli a naptárt?",
+      "clear_title": "Törli az összes eseményt?",
+      "unsubscribe_title": "Leiratkozik erről a naptárról?"
+    },
     "downloads": {
       "title": "Letöltések",
       "description": "Letöltött e-mailek és csatolmányok elnevezésének testreszabása.",
@@ -2407,6 +2428,7 @@
       "match_type": "Egyezés típusa",
       "reset_to_visual": "Visszaállítás vizuális szerkesztőre",
       "reset_warning": "Ez elveti az aktuális szkriptet és újat kezd.",
+      "reset_title": "Visszaáll a vizuális szerkesztőre?",
       "confirm_reset": "Visszaállítás",
       "validation_empty_name": "A szabály neve kötelező",
       "validation_empty_conditions": "Legalább egy feltétel szükséges értékkel",
diff --git a/locales/it/common.json b/locales/it/common.json
index 432e30035..c0b3b1db5 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Elimina elenco salvato",
         "cancel": "Annulla",
         "delete_confirm": "Eliminare dal server l'elenco account salvato?",
+        "delete_message": "Gli altri dispositivi non potranno più ripristinare gli account da essa.",
         "password": "Password del backup",
         "password_hint": "Almeno 10 caratteri. Non si può recuperare: se la dimentichi, salva di nuovo l'elenco con una nuova password.",
         "restore_hint": "La password scelta quando l'elenco è stato salvato.",
@@ -1882,6 +1883,8 @@
         "removed": "Password per l'app rimossa",
         "add_error": "Impossibile creare la password per l'app",
         "remove_error": "Impossibile rimuovere la password per l'app",
+        "delete_title": "Eliminare la password per l'app?",
+        "delete_message": "Le app che accedono con {name} non potranno più accedere.",
         "none": "Nessuna password per le app configurata",
         "done": "Fatto",
         "expires_label": "Scadenza (facoltativa)",
@@ -1900,6 +1903,8 @@
         "removed": "Chiave API rimossa",
         "add_error": "Impossibile creare la chiave API",
         "remove_error": "Impossibile rimuovere la chiave API",
+        "delete_title": "Eliminare la chiave API?",
+        "delete_message": "Gli script e le integrazioni che usano {name} perdono l'accesso.",
         "none": "Nessuna chiave API configurata"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Abilita la crittografia con questa chiave",
         "enable_button": "Abilita",
         "disable_tooltip": "Disabilita la crittografia",
+        "disable_title": "Disattivare la crittografia a riposo?",
+        "disable_message": "D'ora in poi la nuova posta viene salvata senza crittografia.",
+        "disable_button": "Disattiva",
         "enabled_success": "Crittografia a riposo abilitata"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "es. La mia chiave",
         "key_label": "Chiave pubblica (S/MIME o PGP in formato ASCII)",
         "key_placeholder": "Incolla qui la tua chiave pubblica",
-        "none": "Nessuna chiave pubblica configurata"
+        "none": "Nessuna chiave pubblica configurata",
+        "title": "Chiavi pubbliche",
+        "added": "Chiave pubblica aggiunta",
+        "removed": "Chiave pubblica eliminata",
+        "add_error": "Impossibile aggiungere la chiave pubblica",
+        "remove_error": "Impossibile eliminare la chiave pubblica",
+        "delete_title": "Eliminare la chiave pubblica?",
+        "delete_message": "{name} viene rimossa dal server."
       },
       "sections": {
         "devices": "Altre app e dispositivi",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Non letti e totale",
       "count_mode_none": "Nessun contatore",
       "delete": "Elimina",
+      "delete_title": "Eliminare la cartella?",
       "confirm_delete": "Sei sicuro di voler eliminare \"{name}\"? Le e-mail in questa cartella verranno spostate nel Cestino.",
       "create": "Crea",
       "cancel": "Annulla",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "Ordina per cognome",
       "sort_by_last_name_description": "Ordina l'elenco dei contatti per cognome così i familiari compaiono insieme"
     },
+    "calendar_management": {
+      "delete_title": "Eliminare il calendario?",
+      "clear_title": "Cancellare tutti gli eventi?",
+      "unsubscribe_title": "Annullare l'iscrizione a questo calendario?"
+    },
     "downloads": {
       "title": "Download",
       "description": "Personalizza come vengono nominati gli email e gli allegati scaricati.",
@@ -2404,6 +2425,7 @@
       "match_type": "Tipo di corrispondenza",
       "reset_to_visual": "Ripristina il costruttore visuale",
       "reset_warning": "Questo eliminerà lo script attuale e ricomincerà da zero.",
+      "reset_title": "Tornare all'editor visuale?",
       "confirm_reset": "Ripristina",
       "validation_empty_name": "Il nome della regola è obbligatorio",
       "validation_empty_conditions": "È necessaria almeno una condizione con un valore",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 0b129b192..227996b6e 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "ほかのデバイスからこのリストでアカウントを復元できなくなります。",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1882,6 +1883,8 @@
         "removed": "アプリパスワードが削除されました",
         "add_error": "アプリパスワードを作成できませんでした",
         "remove_error": "アプリパスワードを削除できませんでした",
+        "delete_title": "アプリパスワードを削除しますか?",
+        "delete_message": "{name} でサインインしているアプリは、今後サインインできなくなります。",
         "none": "アプリパスワードは設定されていません",
         "done": "完了",
         "expires_label": "有効期限（任意）",
@@ -1900,6 +1903,8 @@
         "removed": "APIキーを削除しました",
         "add_error": "APIキーの作成に失敗しました",
         "remove_error": "APIキーの削除に失敗しました",
+        "delete_title": "API キーを削除しますか?",
+        "delete_message": "{name} を使うスクリプトや連携はアクセスできなくなります。",
         "none": "APIキーは設定されていません"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "この鍵で暗号化を有効にする",
         "enable_button": "有効にする",
         "disable_tooltip": "暗号化を無効にする",
+        "disable_title": "保存時の暗号化をオフにしますか?",
+        "disable_message": "今後、新しいメールは暗号化されずに保存されます。",
+        "disable_button": "オフにする",
         "enabled_success": "保存時の暗号化が有効になりました"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "例：マイキー",
         "key_label": "公開鍵（S/MIME または PGP の ASCII 形式）",
         "key_placeholder": "ここに公開鍵を貼り付けてください",
-        "none": "公開鍵が設定されていません"
+        "none": "公開鍵が設定されていません",
+        "title": "公開鍵",
+        "added": "公開鍵を追加しました",
+        "removed": "公開鍵を削除しました",
+        "add_error": "公開鍵を追加できませんでした",
+        "remove_error": "公開鍵を削除できませんでした",
+        "delete_title": "公開鍵を削除しますか?",
+        "delete_message": "{name} はサーバーから削除されます。"
       },
       "sections": {
         "devices": "他のアプリとデバイス",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "未読と合計",
       "count_mode_none": "カウンターなし",
       "delete": "削除",
+      "delete_title": "フォルダーを削除しますか?",
       "confirm_delete": "「{name}」を削除してもよろしいですか？このフォルダー内のメールはゴミ箱に移動されます。",
       "create": "作成",
       "cancel": "キャンセル",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "姓で並べ替え",
       "sort_by_last_name_description": "家族が並んで表示されるように、連絡先一覧を姓の順に並べ替えます"
     },
+    "calendar_management": {
+      "delete_title": "カレンダーを削除しますか?",
+      "clear_title": "すべての予定を消去しますか?",
+      "unsubscribe_title": "このカレンダーの購読を解除しますか?"
+    },
     "downloads": {
       "title": "ダウンロード",
       "description": "ダウンロードしたメールや添付ファイルの名前の付け方をカスタマイズします。",
@@ -2404,6 +2425,7 @@
       "match_type": "一致タイプ",
       "reset_to_visual": "ビジュアルビルダーにリセット",
       "reset_warning": "現在のスクリプトを破棄して最初からやり直します。",
+      "reset_title": "ビジュアルエディターに戻しますか?",
       "confirm_reset": "リセット",
       "validation_empty_name": "ルール名は必須です",
       "validation_empty_conditions": "値を持つ条件が少なくとも1つ必要です",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 64ed138ea..52bdb590d 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "다른 기기에서 더 이상 이 목록으로 계정을 복원할 수 없어요.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1882,6 +1883,8 @@
         "removed": "앱 비밀번호가 삭제되었어요",
         "add_error": "앱 비밀번호를 만들지 못했어요",
         "remove_error": "앱 비밀번호를 삭제하지 못했어요",
+        "delete_title": "앱 비밀번호를 삭제할까요?",
+        "delete_message": "{name}(으)로 로그인하는 앱은 더 이상 로그인할 수 없어요.",
         "none": "설정된 앱 비밀번호가 없어요",
         "done": "완료",
         "expires_label": "만료 (선택 사항)",
@@ -1900,6 +1903,8 @@
         "removed": "API 키가 삭제되었습니다",
         "add_error": "API 키 생성에 실패했습니다",
         "remove_error": "API 키 삭제에 실패했습니다",
+        "delete_title": "API 키를 삭제할까요?",
+        "delete_message": "{name}을(를) 사용하는 스크립트와 통합은 접근 권한을 잃어요.",
         "none": "구성된 API 키가 없습니다"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "이 키로 암호화 사용",
         "enable_button": "사용",
         "disable_tooltip": "암호화 사용 안 함",
+        "disable_title": "저장 데이터 암호화를 끌까요?",
+        "disable_message": "이제부터 새 메일은 암호화 없이 저장돼요.",
+        "disable_button": "끄기",
         "enabled_success": "저장 데이터 암호화가 켜졌어요"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "예: 내 키",
         "key_label": "공개 키(S/MIME 또는 PGP ASCII 형식)",
         "key_placeholder": "여기에 공개 키를 붙여넣으세요",
-        "none": "설정된 공개 키가 없어요"
+        "none": "설정된 공개 키가 없어요",
+        "title": "공개 키",
+        "added": "공개 키를 추가했어요",
+        "removed": "공개 키를 삭제했어요",
+        "add_error": "공개 키를 추가하지 못했어요",
+        "remove_error": "공개 키를 삭제하지 못했어요",
+        "delete_title": "공개 키를 삭제할까요?",
+        "delete_message": "{name}이(가) 서버에서 삭제돼요."
       },
       "sections": {
         "devices": "다른 앱 및 기기",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "읽지 않음 및 전체",
       "count_mode_none": "카운터 없음",
       "delete": "삭제",
+      "delete_title": "폴더를 삭제할까요?",
       "confirm_delete": "정말 \"{name}\" 폴더를 삭제할까요? 폴더 안의 메일은 휴지통으로 이동돼요.",
       "create": "만들기",
       "cancel": "취소",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "성으로 정렬",
       "sort_by_last_name_description": "가족 구성원이 함께 표시되도록 연락처 목록을 성 기준으로 정렬합니다"
     },
+    "calendar_management": {
+      "delete_title": "캘린더를 삭제할까요?",
+      "clear_title": "모든 일정을 지울까요?",
+      "unsubscribe_title": "이 캘린더 구독을 해지할까요?"
+    },
     "downloads": {
       "title": "다운로드",
       "description": "다운로드한 이메일과 첨부 파일의 이름을 지정하는 방식을 사용자 정의합니다.",
@@ -2404,6 +2425,7 @@
       "match_type": "일치 유형",
       "reset_to_visual": "시각적 에디터로 초기화",
       "reset_warning": "현재 스크립트가 지워지고 처음부터 다시 시작하게 돼요.",
+      "reset_title": "시각적 편집기로 재설정할까요?",
       "confirm_reset": "초기화",
       "validation_empty_name": "규칙 이름을 입력해 주세요",
       "validation_empty_conditions": "값을 포함한 조건이 하나 이상 필요해요",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index ca57a2623..258cca9a7 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Citas ierīces vairs nevarēs no tā atjaunot kontus.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1882,6 +1883,8 @@
         "removed": "Lietotnes parole izdzēsta",
         "add_error": "Neizdevās izveidot lietotnes paroli",
         "remove_error": "Neizdevās izdzēst lietotnes paroli",
+        "delete_title": "Dzēst lietotnes paroli?",
+        "delete_message": "Lietotnes, kas pierakstās ar {name}, vairs nevarēs pierakstīties.",
         "none": "Lietotņu paroles nav iestatītas",
         "done": "Gatavs",
         "expires_label": "Derīguma termiņš (pēc izvēles)",
@@ -1900,6 +1903,8 @@
         "removed": "API atslēga noņemta",
         "add_error": "Neizdevās izveidot API atslēgu",
         "remove_error": "Neizdevās noņemt API atslēgu",
+        "delete_title": "Dzēst API atslēgu?",
+        "delete_message": "Skripti un integrācijas, kas izmanto {name}, zaudēs piekļuvi.",
         "none": "API atslēgas nav konfigurētas"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Ieslēgt šifrēšanu ar šo atslēgu",
         "enable_button": "Ieslēgt",
         "disable_tooltip": "Izslēgt šifrēšanu",
+        "disable_title": "Izslēgt glabāto datu šifrēšanu?",
+        "disable_message": "Jaunais pasts turpmāk tiks glabāts bez šifrēšanas.",
+        "disable_button": "Izslēgt",
         "enabled_success": "Krātuves šifrēšana ir iespējota"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "piem., Mana atslēga",
         "key_label": "Publiskā atslēga (S/MIME vai PGP ASCII formātā)",
         "key_placeholder": "Ielīmējiet šeit savu publisko atslēgu",
-        "none": "Nav konfigurēta neviena publiskā atslēga"
+        "none": "Nav konfigurēta neviena publiskā atslēga",
+        "title": "Publiskās atslēgas",
+        "added": "Publiskā atslēga pievienota",
+        "removed": "Publiskā atslēga izdzēsta",
+        "add_error": "Neizdevās pievienot publisko atslēgu",
+        "remove_error": "Neizdevās izdzēst publisko atslēgu",
+        "delete_title": "Dzēst publisko atslēgu?",
+        "delete_message": "{name} tiks noņemta no servera."
       },
       "sections": {
         "devices": "Citas lietotnes un ierīces",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Nelasītie un kopā",
       "count_mode_none": "Bez skaitītāja",
       "delete": "Dzēst",
+      "delete_title": "Dzēst mapi?",
       "confirm_delete": "Vai tiešām vēlaties dzēst \"{name}\"? Vēstules tiks pārvietotas uz atkritni.",
       "create": "Izveidot",
       "cancel": "Atcelt",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "Kārtot pēc uzvārda",
       "sort_by_last_name_description": "Kārtot kontaktu sarakstu pēc uzvārda, lai ģimenes locekļi būtu kopā"
     },
+    "calendar_management": {
+      "delete_title": "Dzēst kalendāru?",
+      "clear_title": "Notīrīt visus notikumus?",
+      "unsubscribe_title": "Atteikties no šī kalendāra abonementa?"
+    },
     "downloads": {
       "title": "Lejupielādes",
       "description": "Pielāgojiet, kā tiek nosaukti lejupielādētie e-pasti un pielikumi.",
@@ -2404,6 +2425,7 @@
       "match_type": "Atbilstības veids",
       "reset_to_visual": "Atiestatīt uz vizuālo konstruktoru",
       "reset_warning": "Tas dzēsīs pašreizējo skriptu un sāks no jauna.",
+      "reset_title": "Atiestatīt uz vizuālo redaktoru?",
       "confirm_reset": "Atiestatīt",
       "validation_empty_name": "Nepieciešams noteikuma nosaukums",
       "validation_empty_conditions": "Nepieciešams vismaz viens nosacījums ar vērtību",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index c3ffc3e89..2b2ec3e20 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Бусад төхөөрөмж үүнээс бүртгэлүүдийг сэргээх боломжгүй болно.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1895,6 +1896,8 @@
         "removed": "Аппын нууц үгийг устгасан",
         "add_error": "Аппын нууц үгийг үүсгэж чадсангүй",
         "remove_error": "Аппын нууц үгийг устгаж чадсангүй",
+        "delete_title": "Аппын нууц үгийг устгах уу?",
+        "delete_message": "{name}-ээр нэвтэрдэг аппууд цаашид нэвтэрч чадахгүй.",
         "none": "Аппын нууц үгийг тохируулаагүй"
       },
       "api_keys": {
@@ -1907,6 +1910,8 @@
         "removed": "API түлхүүрийг устгасан",
         "add_error": "API түлхүүр үүсгэж чадсангүй",
         "remove_error": "API түлхүүрийг устгаж чадсангүй",
+        "delete_title": "API түлхүүрийг устгах уу?",
+        "delete_message": "{name}-ийг ашигладаг скрипт, холболтууд хандах эрхээ алдана.",
         "none": " API түлхүүр тохируулаагүй"
       },
       "encryption": {
@@ -1926,6 +1931,9 @@
         "configure_title": "Энэ түлхүүрээр шифрлэлтийг идэвхжүүлнэ",
         "enable_button": "Идэвхжүүлэх",
         "disable_tooltip": "Шифрлэлтийг идэвхгүй болгох",
+        "disable_title": "Хадгалсан өгөгдлийн шифрлэлтийг унтраах уу?",
+        "disable_message": "Одооноос шинэ захидлыг шифрлэлтгүй хадгална.",
+        "disable_button": "Унтраах",
         "enabled_success": "Амарсан үед шифрлэлт идэвхжсэн"
       },
       "public_keys": {
@@ -1933,7 +1941,14 @@
         "name_placeholder": "жишээ нь. Миний түлхүүр",
         "key_label": "Нийтийн түлхүүр (S/MIME эсвэл PGP ASCII хуягт)",
         "key_placeholder": "Нийтийн түлхүүрээ энд буулгана уу",
-        "none": "Нийтийн түлхүүр тохируулаагүй"
+        "none": "Нийтийн түлхүүр тохируулаагүй",
+        "title": "Нийтийн түлхүүрүүд",
+        "added": "Нийтийн түлхүүр нэмсэн",
+        "removed": "Нийтийн түлхүүр устгасан",
+        "add_error": "Нийтийн түлхүүр нэмж чадсангүй",
+        "remove_error": "Нийтийн түлхүүр устгаж чадсангүй",
+        "delete_title": "Нийтийн түлхүүрийг устгах уу?",
+        "delete_message": "{name}-ийг серверээс устгана."
       },
       "email_client": {
         "title": "И-мэйл үйлчлүүлэгчийн тохиргоо",
@@ -2111,6 +2126,7 @@
       "count_mode_all": "Уншаагүй ба нийт",
       "count_mode_none": "Тоолуургүй",
       "delete": "Устгах",
+      "delete_title": "Хавтсыг устгах уу?",
       "confirm_delete": "Та \"{name}\"-г устгахдаа итгэлтэй байна уу? Энэ хавтсанд байгаа имэйлийг Хогийн сав руу зөөх болно.",
       "create": "Үүсгэх",
       "cancel": "Цуцлах",
@@ -2257,6 +2273,11 @@
       "categories_description": "Харилцах ангиллын нэрийг өөрчлөх",
       "no_categories": "Ангилал олдсонгүй"
     },
+    "calendar_management": {
+      "delete_title": "Хуанлийг устгах уу?",
+      "clear_title": "Бүх үйл явдлыг цэвэрлэх үү?",
+      "unsubscribe_title": "Энэ хуанлийн захиалгыг цуцлах уу?"
+    },
     "downloads": {
       "title": "Татаж авах",
       "description": "Татаж авсан имэйл болон хавсралтуудыг хэрхэн нэрлэхийг тохируулах.",
@@ -2411,6 +2432,7 @@
       "match_type": "Тохирох төрөл",
       "reset_to_visual": "Visual builder руу дахин тохируулах",
       "reset_warning": "Энэ нь одоогийн скриптийг устгаж, шинээр эхэлнэ.",
+      "reset_title": "Харагдах засварлагч руу буцаах уу?",
       "confirm_reset": "Дахин тохируулах",
       "validation_empty_name": "Дүрмийн нэр шаардлагатай",
       "validation_empty_conditions": "Дор хаяж нэг утга бүхий нөхцөл шаардлагатай",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 5390f0e7f..d5a3f8090 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Andre enheter kan ikke lenger gjenopprette kontoene fra den.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1895,6 +1896,8 @@
         "removed": "App-passordet er fjernet",
         "add_error": "Kunne ikke opprette app-passord",
         "remove_error": "Kunne ikke fjerne app-passordet",
+        "delete_title": "Slette app-passordet?",
+        "delete_message": "Apper som logger på med {name}, kan ikke logge på lenger.",
         "none": "Ingen app-passord er opprettet"
       },
       "api_keys": {
@@ -1907,6 +1910,8 @@
         "removed": "API-nøkkelen er fjernet",
         "add_error": "Kunne ikke opprette API-nøkkel",
         "remove_error": "Kunne ikke fjerne API-nøkkelen",
+        "delete_title": "Slette API-nøkkelen?",
+        "delete_message": "Skript og integrasjoner som bruker {name}, mister tilgangen.",
         "none": "Ingen API-nøkler er opprettet"
       },
       "encryption": {
@@ -1926,6 +1931,9 @@
         "configure_title": "Aktiver kryptering med denne nøkkelen",
         "enable_button": "Aktiver",
         "disable_tooltip": "Deaktiver kryptering",
+        "disable_title": "Slå av kryptering av lagrede data?",
+        "disable_message": "Ny e-post lagres heretter uten kryptering.",
+        "disable_button": "Slå av",
         "enabled_success": "Kryptering av lagrede data er aktivert"
       },
       "public_keys": {
@@ -1933,7 +1941,14 @@
         "name_placeholder": "f.eks. Min nøkkel",
         "key_label": "Offentlig nøkkel (S/MIME eller ASCII-armert PGP)",
         "key_placeholder": "Lim inn den offentlige nøkkelen din her",
-        "none": "Ingen offentlige nøkler er lagt til"
+        "none": "Ingen offentlige nøkler er lagt til",
+        "title": "Offentlige nøkler",
+        "added": "Offentlig nøkkel lagt til",
+        "removed": "Offentlig nøkkel slettet",
+        "add_error": "Kunne ikke legge til den offentlige nøkkelen",
+        "remove_error": "Kunne ikke slette den offentlige nøkkelen",
+        "delete_title": "Slette den offentlige nøkkelen?",
+        "delete_message": "{name} fjernes fra serveren."
       },
       "email_client": {
         "title": "Oppsett av e-postklient",
@@ -2111,6 +2126,7 @@
       "count_mode_all": "Uleste og totalt",
       "count_mode_none": "Ingen teller",
       "delete": "Slett",
+      "delete_title": "Slette mappen?",
       "confirm_delete": "Er du sikker på at du vil slette «{name}»? E-postene i denne mappen flyttes til papirkurven.",
       "create": "Opprett",
       "cancel": "Avbryt",
@@ -2257,6 +2273,11 @@
       "categories_description": "Gi nytt navn til kontaktkategorier",
       "no_categories": "Ingen kategorier funnet"
     },
+    "calendar_management": {
+      "delete_title": "Slette kalenderen?",
+      "clear_title": "Fjerne alle hendelser?",
+      "unsubscribe_title": "Avslutte abonnementet på denne kalenderen?"
+    },
     "downloads": {
       "title": "Nedlastinger",
       "description": "Tilpass hvordan nedlastede e-poster og vedlegg navngis.",
@@ -2411,6 +2432,7 @@
       "match_type": "Samsvar",
       "reset_to_visual": "Gå tilbake til visuell redigering",
       "reset_warning": "Dette forkaster det gjeldende skriptet og lar deg begynne på nytt.",
+      "reset_title": "Tilbakestille til den visuelle redigereren?",
       "confirm_reset": "Tilbakestill",
       "validation_empty_name": "Regelnavn må fylles ut",
       "validation_empty_conditions": "Minst ett vilkår må ha en verdi",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 1f6d1337a..954ae8b06 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Andere apparaten kunnen de accounts er daarna niet meer uit herstellen.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1882,6 +1883,8 @@
         "removed": "App-wachtwoord verwijderd",
         "add_error": "Kan app-wachtwoord niet aanmaken",
         "remove_error": "Kan app-wachtwoord niet verwijderen",
+        "delete_title": "App-wachtwoord verwijderen?",
+        "delete_message": "Apps die zich aanmelden met {name} kunnen zich daarna niet meer aanmelden.",
         "none": "Geen app-wachtwoorden geconfigureerd",
         "done": "Klaar",
         "expires_label": "Verloopt (optioneel)",
@@ -1900,6 +1903,8 @@
         "removed": "API-sleutel verwijderd",
         "add_error": "API-sleutel aanmaken mislukt",
         "remove_error": "API-sleutel verwijderen mislukt",
+        "delete_title": "API-sleutel verwijderen?",
+        "delete_message": "Scripts en integraties die {name} gebruiken, verliezen hun toegang.",
         "none": "Geen API-sleutels geconfigureerd"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Versleuteling met deze sleutel inschakelen",
         "enable_button": "Inschakelen",
         "disable_tooltip": "Versleuteling uitschakelen",
+        "disable_title": "Versleuteling in rust uitschakelen?",
+        "disable_message": "Nieuwe e-mail wordt vanaf nu onversleuteld opgeslagen.",
+        "disable_button": "Uitschakelen",
         "enabled_success": "Versleuteling in rust ingeschakeld"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "bijv. Mijn sleutel",
         "key_label": "Openbare sleutel (S/MIME of PGP in ASCII-formaat)",
         "key_placeholder": "Plak hier uw openbare sleutel",
-        "none": "Geen openbare sleutels geconfigureerd"
+        "none": "Geen openbare sleutels geconfigureerd",
+        "title": "Openbare sleutels",
+        "added": "Openbare sleutel toegevoegd",
+        "removed": "Openbare sleutel verwijderd",
+        "add_error": "Kan openbare sleutel niet toevoegen",
+        "remove_error": "Kan openbare sleutel niet verwijderen",
+        "delete_title": "Openbare sleutel verwijderen?",
+        "delete_message": "{name} wordt van de server verwijderd."
       },
       "sections": {
         "devices": "Andere apps en apparaten",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Ongelezen en totaal",
       "count_mode_none": "Geen teller",
       "delete": "Verwijderen",
+      "delete_title": "Map verwijderen?",
       "confirm_delete": "Weet u zeker dat u \"{name}\" wilt verwijderen? E-mails in deze map worden naar de Prullenbak verplaatst.",
       "create": "Maken",
       "cancel": "Annuleren",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "Sorteren op achternaam",
       "sort_by_last_name_description": "Sorteer de contactenlijst op achternaam zodat gezinsleden bij elkaar staan"
     },
+    "calendar_management": {
+      "delete_title": "Agenda verwijderen?",
+      "clear_title": "Alle afspraken wissen?",
+      "unsubscribe_title": "Abonnement op deze agenda opzeggen?"
+    },
     "downloads": {
       "title": "Downloads",
       "description": "Pas aan hoe gedownloade e-mails en bijlagen worden genoemd.",
@@ -2404,6 +2425,7 @@
       "match_type": "Overeenkomsttype",
       "reset_to_visual": "Terugzetten naar visuele builder",
       "reset_warning": "Dit verwijdert het huidige script en begint opnieuw.",
+      "reset_title": "Terugzetten naar de visuele editor?",
       "confirm_reset": "Terugzetten",
       "validation_empty_name": "Regelnaam is verplicht",
       "validation_empty_conditions": "Minstens één voorwaarde met een waarde is vereist",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 1897737fa..99861fe57 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Inne urządzenia nie będą już mogły przywrócić z niej kont.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1882,6 +1883,8 @@
         "removed": "Hasło aplikacji zostało usunięte",
         "add_error": "Nie udało się utworzyć hasła aplikacji",
         "remove_error": "Nie udało się usunąć hasła aplikacji",
+        "delete_title": "Usunąć hasło aplikacji?",
+        "delete_message": "Aplikacje logujące się za pomocą {name} nie będą mogły się już zalogować.",
         "none": "Brak skonfigurowanych haseł aplikacji",
         "done": "Gotowe",
         "expires_label": "Wygasa (opcjonalnie)",
@@ -1900,6 +1903,8 @@
         "removed": "Klucz API usunięty",
         "add_error": "Nie udało się utworzyć klucza API",
         "remove_error": "Nie udało się usunąć klucza API",
+        "delete_title": "Usunąć klucz API?",
+        "delete_message": "Skrypty i integracje używające {name} stracą dostęp.",
         "none": "Brak skonfigurowanych kluczy API"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Włącz szyfrowanie tym kluczem",
         "enable_button": "Włącz",
         "disable_tooltip": "Wyłącz szyfrowanie",
+        "disable_title": "Wyłączyć szyfrowanie danych w spoczynku?",
+        "disable_message": "Nowa poczta będzie od teraz zapisywana bez szyfrowania.",
+        "disable_button": "Wyłącz",
         "enabled_success": "Szyfrowanie danych w spoczynku włączone"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "np. Mój klucz",
         "key_label": "Klucz publiczny (S/MIME lub PGP w formacie ASCII)",
         "key_placeholder": "Wklej tutaj swój klucz publiczny",
-        "none": "Nie skonfigurowano żadnych kluczy publicznych"
+        "none": "Nie skonfigurowano żadnych kluczy publicznych",
+        "title": "Klucze publiczne",
+        "added": "Dodano klucz publiczny",
+        "removed": "Usunięto klucz publiczny",
+        "add_error": "Nie udało się dodać klucza publicznego",
+        "remove_error": "Nie udało się usunąć klucza publicznego",
+        "delete_title": "Usunąć klucz publiczny?",
+        "delete_message": "{name} zostanie usunięty z serwera."
       },
       "sections": {
         "devices": "Inne aplikacje i urządzenia",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Nieprzeczytane i łącznie",
       "count_mode_none": "Bez licznika",
       "delete": "Usuń",
+      "delete_title": "Usunąć folder?",
       "confirm_delete": "Czy na pewno chcesz usunąć „{name}”? Wiadomości w tym folderze zostaną przeniesione do Kosza.",
       "create": "Utwórz",
       "cancel": "Anuluj",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "Sortuj według nazwiska",
       "sort_by_last_name_description": "Uporządkuj listę kontaktów według nazwiska, aby członkowie rodziny byli obok siebie"
     },
+    "calendar_management": {
+      "delete_title": "Usunąć kalendarz?",
+      "clear_title": "Wyczyścić wszystkie wydarzenia?",
+      "unsubscribe_title": "Anulować subskrypcję tego kalendarza?"
+    },
     "downloads": {
       "title": "Pobrane",
       "description": "Dostosuj sposób nazywania pobranych wiadomości i załączników.",
@@ -2404,6 +2425,7 @@
       "match_type": "Typ dopasowania",
       "reset_to_visual": "Resetuj do kreatora wizualnego",
       "reset_warning": "To odrzuci bieżący skrypt i pozwoli zacząć od nowa.",
+      "reset_title": "Przywrócić edytor wizualny?",
       "confirm_reset": "Resetuj",
       "validation_empty_name": "Nazwa reguły jest wymagana",
       "validation_empty_conditions": "Wymagany jest co najmniej jeden warunek z wartością",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 5c2d44af8..566cacd46 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Os outros dispositivos deixam de poder restaurar as contas a partir dela.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1882,6 +1883,8 @@
         "removed": "Senha de aplicativo removida",
         "add_error": "Não foi possível criar a senha de aplicativo",
         "remove_error": "Não foi possível remover a senha de aplicativo",
+        "delete_title": "Eliminar a palavra-passe de aplicação?",
+        "delete_message": "As aplicações que iniciam sessão com {name} deixam de conseguir fazê-lo.",
         "none": "Nenhuma senha de aplicativo configurada",
         "done": "Concluído",
         "expires_label": "Expira (opcional)",
@@ -1900,6 +1903,8 @@
         "removed": "Chave de API removida",
         "add_error": "Falha ao criar chave de API",
         "remove_error": "Falha ao remover chave de API",
+        "delete_title": "Eliminar a chave de API?",
+        "delete_message": "Os scripts e integrações que usam {name} perdem o acesso.",
         "none": "Nenhuma chave de API configurada"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Ativar criptografia com esta chave",
         "enable_button": "Ativar",
         "disable_tooltip": "Desativar criptografia",
+        "disable_title": "Desativar a encriptação em repouso?",
+        "disable_message": "A partir de agora, o correio novo é guardado sem encriptação.",
+        "disable_button": "Desativar",
         "enabled_success": "Criptografia em repouso habilitada"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "ex. A minha chave",
         "key_label": "Chave pública (S/MIME ou PGP em formato ASCII)",
         "key_placeholder": "Cole aqui a sua chave pública",
-        "none": "Nenhuma chave pública configurada"
+        "none": "Nenhuma chave pública configurada",
+        "title": "Chaves públicas",
+        "added": "Chave pública adicionada",
+        "removed": "Chave pública eliminada",
+        "add_error": "Não foi possível adicionar a chave pública",
+        "remove_error": "Não foi possível eliminar a chave pública",
+        "delete_title": "Eliminar a chave pública?",
+        "delete_message": "{name} é removida do servidor."
       },
       "sections": {
         "devices": "Outras aplicações e dispositivos",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Não lidas e total",
       "count_mode_none": "Sem contador",
       "delete": "Excluir",
+      "delete_title": "Eliminar a pasta?",
       "confirm_delete": "Tem certeza de que deseja excluir \"{name}\"? Os e-mails nesta pasta serão movidos para a Lixeira.",
       "create": "Criar",
       "cancel": "Cancelar",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "Ordenar por sobrenome",
       "sort_by_last_name_description": "Ordenar a lista de contatos por sobrenome para que os membros da família apareçam juntos"
     },
+    "calendar_management": {
+      "delete_title": "Eliminar o calendário?",
+      "clear_title": "Limpar todos os eventos?",
+      "unsubscribe_title": "Cancelar a subscrição deste calendário?"
+    },
     "downloads": {
       "title": "Downloads",
       "description": "Personalize como os e-mails e anexos baixados são nomeados.",
@@ -2404,6 +2425,7 @@
       "match_type": "Tipo de correspondência",
       "reset_to_visual": "Redefinir para o construtor visual",
       "reset_warning": "Isto irá descartar o script atual e começar do zero.",
+      "reset_title": "Repor o editor visual?",
       "confirm_reset": "Redefinir",
       "validation_empty_name": "O nome da regra é obrigatório",
       "validation_empty_conditions": "É necessária pelo menos uma condição com um valor",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 77f665533..8bf387f34 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Alte dispozitive nu vor mai putea restaura conturile din ea.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1895,6 +1896,8 @@
         "removed": "Parola aplicației a fost eliminată",
         "add_error": "Nu s-a putut crea parola aplicației",
         "remove_error": "Nu s-a reușit eliminarea parolei aplicației",
+        "delete_title": "Ștergeți parola de aplicație?",
+        "delete_message": "Aplicațiile care se conectează cu {name} nu se vor mai putea conecta.",
         "none": "Nu sunt configurate parole pentru aplicații"
       },
       "api_keys": {
@@ -1907,6 +1910,8 @@
         "removed": "API cheie eliminată",
         "add_error": "Nu s-a putut crea cheia dAPI",
         "remove_error": "Nu s-a putut elimina cheia „API”",
+        "delete_title": "Ștergeți cheia API?",
+        "delete_message": "Scripturile și integrările care folosesc {name} pierd accesul.",
         "none": "Nu sunt configurate tastele „API”"
       },
       "encryption": {
@@ -1926,6 +1931,9 @@
         "configure_title": "Activați criptarea cu această cheie",
         "enable_button": "Activați",
         "disable_tooltip": "Dezactivați criptarea",
+        "disable_title": "Dezactivați criptarea datelor stocate?",
+        "disable_message": "E-mailurile noi vor fi stocate de acum fără criptare.",
+        "disable_button": "Dezactivează",
         "enabled_success": "Criptarea datelor stocate este activată"
       },
       "email_client": {
@@ -1974,7 +1982,14 @@
         "name_placeholder": "de ex. Cheia mea",
         "key_label": "Cheie publică (S/MIME sau PGP în format ASCII)",
         "key_placeholder": "Lipiți aici cheia dvs. publică",
-        "none": "Nicio cheie publică configurată"
+        "none": "Nicio cheie publică configurată",
+        "title": "Chei publice",
+        "added": "Cheie publică adăugată",
+        "removed": "Cheie publică ștearsă",
+        "add_error": "Cheia publică nu a putut fi adăugată",
+        "remove_error": "Cheia publică nu a putut fi ștearsă",
+        "delete_title": "Ștergeți cheia publică?",
+        "delete_message": "{name} este eliminată de pe server."
       },
       "sections": {
         "devices": "Alte aplicații și dispozitive",
@@ -2111,6 +2126,7 @@
       "count_mode_all": "Necitite și total",
       "count_mode_none": "Fără contor",
       "delete": "Șterge",
+      "delete_title": "Ștergeți dosarul?",
       "confirm_delete": "Sunteți sigur că doriți să ștergeți „{name}”? E-mailurile din acest folder vor fi mutate în Coșul de gunoi.",
       "create": "Creați",
       "cancel": "Anulează",
@@ -2257,6 +2273,11 @@
       "categories_description": "Redenumiți categoriile de contacte",
       "no_categories": "Nu s-au găsit categorii"
     },
+    "calendar_management": {
+      "delete_title": "Ștergeți calendarul?",
+      "clear_title": "Ștergeți toate evenimentele?",
+      "unsubscribe_title": "Vă dezabonați de la acest calendar?"
+    },
     "downloads": {
       "title": "Descărcări",
       "description": "Personalizați modul în care sunt denumite e-mailurile și atașamentele descărcate.",
@@ -2411,6 +2432,7 @@
       "match_type": "Potriviți tipul",
       "reset_to_visual": "Reveniți la editorul vizual",
       "reset_warning": "Aceasta va anula scriptul curent și va începe de la zero.",
+      "reset_title": "Reveniți la editorul vizual?",
       "confirm_reset": "Resetare",
       "validation_empty_name": "Numele regulii este obligatoriu",
       "validation_empty_conditions": "Este necesară cel puțin o condiție cu o valoare",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index d1b5ce229..de2ffc1dc 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Другие устройства больше не смогут восстановить из него учётные записи.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1882,6 +1883,8 @@
         "removed": "Пароль приложения удалён",
         "add_error": "Не удалось создать пароль приложения",
         "remove_error": "Не удалось удалить пароль приложения",
+        "delete_title": "Удалить пароль приложения?",
+        "delete_message": "Приложения, которые входят с паролем {name}, больше не смогут войти.",
         "none": "Пароли приложений не настроены",
         "done": "Готово",
         "expires_label": "Срок действия (необязательно)",
@@ -1900,6 +1903,8 @@
         "removed": "API-ключ удалён",
         "add_error": "Не удалось создать API-ключ",
         "remove_error": "Не удалось удалить API-ключ",
+        "delete_title": "Удалить ключ API?",
+        "delete_message": "Скрипты и интеграции, использующие {name}, потеряют доступ.",
         "none": "API-ключи не настроены"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Включить шифрование с этим ключом",
         "enable_button": "Включить",
         "disable_tooltip": "Отключить шифрование",
+        "disable_title": "Отключить шифрование хранимых данных?",
+        "disable_message": "Новые письма теперь будут храниться без шифрования.",
+        "disable_button": "Отключить",
         "enabled_success": "Шифрование хранилища включено"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "напр., Мой ключ",
         "key_label": "Открытый ключ (S/MIME или PGP в формате ASCII)",
         "key_placeholder": "Вставьте сюда свой открытый ключ",
-        "none": "Открытые ключи не настроены"
+        "none": "Открытые ключи не настроены",
+        "title": "Открытые ключи",
+        "added": "Открытый ключ добавлен",
+        "removed": "Открытый ключ удалён",
+        "add_error": "Не удалось добавить открытый ключ",
+        "remove_error": "Не удалось удалить открытый ключ",
+        "delete_title": "Удалить открытый ключ?",
+        "delete_message": "Ключ {name} будет удалён с сервера."
       },
       "sections": {
         "devices": "Другие приложения и устройства",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Непрочитанные и всего",
       "count_mode_none": "Без счётчика",
       "delete": "Удалить",
+      "delete_title": "Удалить папку?",
       "confirm_delete": "Вы уверены, что хотите удалить \"{name}\"? Письма в этой папке будут перемещены в корзину.",
       "create": "Создать",
       "cancel": "Отмена",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "Сортировать по фамилии",
       "sort_by_last_name_description": "Упорядочить список контактов по фамилии, чтобы члены семьи шли подряд"
     },
+    "calendar_management": {
+      "delete_title": "Удалить календарь?",
+      "clear_title": "Очистить все события?",
+      "unsubscribe_title": "Отписаться от этого календаря?"
+    },
     "downloads": {
       "title": "Загрузки",
       "description": "Настройте, как именуются загруженные письма и вложения.",
@@ -2404,6 +2425,7 @@
       "match_type": "Тип совпадения",
       "reset_to_visual": "Сбросить до визуального конструктора",
       "reset_warning": "Это удалит текущий скрипт и начнёт заново.",
+      "reset_title": "Вернуться к визуальному редактору?",
       "confirm_reset": "Сбросить",
       "validation_empty_name": "Требуется название правила",
       "validation_empty_conditions": "Требуется хотя бы одно условие со значением",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 4d8477789..ed04161fb 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Iné zariadenia z neho už účty neobnovia.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1895,6 +1896,8 @@
         "removed": "Heslo aplikácie odstránené",
         "add_error": "Chyba pri vytváraní hesla aplikácie",
         "remove_error": "Chyba pri odstraňovaní hesla aplikácie",
+        "delete_title": "Odstrániť heslo aplikácie?",
+        "delete_message": "Aplikácie, ktoré sa prihlasujú pomocou {name}, sa už neprihlásia.",
         "none": "Žiadne heslá aplikácií"
       },
       "api_keys": {
@@ -1907,6 +1910,8 @@
         "removed": "API kľúč odstránený",
         "add_error": "Chyba pri vytváraní API kľúča",
         "remove_error": "Chyba pri odstraňovaní API kľúča",
+        "delete_title": "Odstrániť kľúč API?",
+        "delete_message": "Skripty a integrácie, ktoré používajú {name}, stratia prístup.",
         "none": "Žiadne API kľúče"
       },
       "encryption": {
@@ -1926,6 +1931,9 @@
         "configure_title": "Zapnúť šifrovanie týmto kľúčom",
         "enable_button": "Zapnúť",
         "disable_tooltip": "Vypnúť šifrovanie",
+        "disable_title": "Vypnúť šifrovanie uložených dát?",
+        "disable_message": "Nová pošta sa odteraz ukladá bez šifrovania.",
+        "disable_button": "Vypnúť",
         "enabled_success": "Šifrovanie dát v pokoji zapnuté"
       },
       "email_client": {
@@ -1974,7 +1982,14 @@
         "name_placeholder": "napr. Môj kľúč",
         "key_label": "Verejný kľúč (S/MIME alebo PGP vo formáte ASCII)",
         "key_placeholder": "Sem vložte svoj verejný kľúč",
-        "none": "Nie sú nastavené žiadne verejné kľúče"
+        "none": "Nie sú nastavené žiadne verejné kľúče",
+        "title": "Verejné kľúče",
+        "added": "Verejný kľúč bol pridaný",
+        "removed": "Verejný kľúč bol odstránený",
+        "add_error": "Verejný kľúč sa nepodarilo pridať",
+        "remove_error": "Verejný kľúč sa nepodarilo odstrániť",
+        "delete_title": "Odstrániť verejný kľúč?",
+        "delete_message": "{name} bude odobratý zo servera."
       },
       "sections": {
         "devices": "Ďalšie aplikácie a zariadenia",
@@ -2111,6 +2126,7 @@
       "count_mode_all": "Neprečítané a celkom",
       "count_mode_none": "Bez počítadla",
       "delete": "Odstrániť",
+      "delete_title": "Odstrániť priečinok?",
       "confirm_delete": "Naozaj chcete odstrániť priečinok \"{name}\"? E-maily v tomto priečinku budú presunuté do Koša.",
       "create": "Vytvoriť",
       "cancel": "Zrušiť",
@@ -2257,6 +2273,11 @@
       "categories_description": "Premenovať kategórie kontaktov",
       "no_categories": "Neboli nájdené žiadne kategórie"
     },
+    "calendar_management": {
+      "delete_title": "Odstrániť kalendár?",
+      "clear_title": "Vymazať všetky udalosti?",
+      "unsubscribe_title": "Zrušiť odber tohto kalendára?"
+    },
     "downloads": {
       "title": "Stiahnuté",
       "description": "Prispôsobte si, ako sa pomenúvajú stiahnuté e-maily a prílohy.",
@@ -2411,6 +2432,7 @@
       "match_type": "Typ zhody",
       "reset_to_visual": "Resetovať na vizuálneho sprievodcu",
       "reset_warning": "Tým zahodíte aktuálny skript a začnete odznova.",
+      "reset_title": "Obnoviť vizuálny editor?",
       "confirm_reset": "Resetovať",
       "validation_empty_name": "Názov pravidla je povinný",
       "validation_empty_conditions": "Je potrebná aspoň jedna podmienka s hodnotou",
diff --git a/locales/th/common.json b/locales/th/common.json
index 07851e3d5..6ef38acc9 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -3800,6 +3800,7 @@
         "delete": "ลบรายการที่บันทึกไว้",
         "cancel": "ยกเลิก",
         "delete_confirm": "ลบรายการบัญชีที่บันทึกไว้ออกจากเซิร์ฟเวอร์หรือไม่?",
+        "delete_message": "อุปกรณ์อื่นจะกู้คืนบัญชีจากรายการนี้ไม่ได้อีก",
         "password": "รหัสผ่านการสำรองข้อมูล",
         "password_hint": "อย่างน้อย 10 อักขระ รหัสผ่านนี้ไม่สามารถกู้คืนได้: หากคุณลืม ให้บันทึกรายการใหม่อีกครั้งด้วยรหัสผ่านใหม่",
         "restore_hint": "รหัสผ่านที่เลือกไว้เมื่อบันทึกรายการ",
@@ -3969,6 +3970,7 @@
       "count_mode_all": "ที่ยังไม่ได้อ่านและทั้งหมด",
       "count_mode_none": "ไม่แสดงตัวนับ",
       "delete": "ลบ",
+      "delete_title": "ลบโฟลเดอร์ไหม",
       "confirm_delete": "คุณแน่ใจหรือไม่ว่าต้องการลบ “{name}”? อีเมลในโฟลเดอร์นี้จะถูกย้ายไปยังถังขยะ",
       "create": "สร้าง",
       "cancel": "ยกเลิก",
@@ -4050,6 +4052,8 @@
         "removed": "ลบรหัสผ่านแอปแล้ว",
         "add_error": "สร้างรหัสผ่านแอปไม่สำเร็จ",
         "remove_error": "ลบรหัสผ่านแอปไม่สำเร็จ",
+        "delete_title": "ลบรหัสผ่านแอปไหม",
+        "delete_message": "แอปที่ลงชื่อเข้าใช้ด้วย {name} จะลงชื่อเข้าใช้ไม่ได้อีก",
         "none": "ไม่มีการกำหนดค่ารหัสผ่านแอป"
       },
       "api_keys": {
@@ -4062,6 +4066,8 @@
         "removed": "ลบคีย์ API แล้ว",
         "add_error": "สร้างคีย์ API ไม่สำเร็จ",
         "remove_error": "ลบคีย์ API ไม่สำเร็จ",
+        "delete_title": "ลบคีย์ API ไหม",
+        "delete_message": "สคริปต์และการเชื่อมต่อที่ใช้ {name} จะเข้าถึงไม่ได้อีก",
         "none": "ไม่มีการกำหนดค่าคีย์ API"
       },
       "encryption": {
@@ -4081,6 +4087,9 @@
         "configure_title": "เปิดใช้งานการเข้ารหัสด้วยคีย์นี้",
         "enable_button": "เปิดใช้งาน",
         "disable_tooltip": "ปิดใช้งานการเข้ารหัส",
+        "disable_title": "ปิดการเข้ารหัสข้อมูลที่จัดเก็บไหม",
+        "disable_message": "ต่อจากนี้อีเมลใหม่จะถูกจัดเก็บโดยไม่เข้ารหัส",
+        "disable_button": "ปิด",
         "enabled_success": "เปิดใช้งานการเข้ารหัสขณะจัดเก็บแล้ว"
       },
       "public_keys": {
@@ -4088,7 +4097,14 @@
         "name_placeholder": "เช่น My Key",
         "key_label": "พับลิกคีย์ (S/MIME หรือ PGP ASCII-armored)",
         "key_placeholder": "วางพับลิกคีย์ของคุณที่นี่",
-        "none": "ไม่มีการกำหนดค่าพับลิกคีย์"
+        "none": "ไม่มีการกำหนดค่าพับลิกคีย์",
+        "title": "คีย์สาธารณะ",
+        "added": "เพิ่มคีย์สาธารณะแล้ว",
+        "removed": "ลบคีย์สาธารณะแล้ว",
+        "add_error": "เพิ่มคีย์สาธารณะไม่ได้",
+        "remove_error": "ลบคีย์สาธารณะไม่ได้",
+        "delete_title": "ลบคีย์สาธารณะไหม",
+        "delete_message": "{name} จะถูกนำออกจากเซิร์ฟเวอร์"
       },
       "email_client": {
         "title": "การตั้งค่าโปรแกรมอีเมลภายนอก",
@@ -4267,6 +4283,11 @@
       "categories_description": "เปลี่ยนชื่อหมวดหมู่ผู้ติดต่อ",
       "no_categories": "ไม่พบหมวดหมู่"
     },
+    "calendar_management": {
+      "delete_title": "ลบปฏิทินไหม",
+      "clear_title": "ล้างกิจกรรมทั้งหมดไหม",
+      "unsubscribe_title": "เลิกติดตามปฏิทินนี้ไหม"
+    },
     "downloads": {
       "title": "การดาวน์โหลด",
       "description": "ปรับแต่งรูปแบบการตั้งชื่ออีเมลและไฟล์แนบที่ดาวน์โหลด",
@@ -4421,6 +4442,7 @@
       "match_type": "ประเภทการจับคู่",
       "reset_to_visual": "รีเซ็ตเป็นตัวสร้างแบบภาพ",
       "reset_warning": "การดำเนินการนี้จะละทิ้งสคริปต์ปัจจุบันและเริ่มต้นใหม่",
+      "reset_title": "รีเซ็ตเป็นตัวแก้ไขแบบภาพไหม",
       "confirm_reset": "รีเซ็ต",
       "validation_empty_name": "จำเป็นต้องระบุชื่อกฎ",
       "validation_empty_conditions": "จำเป็นต้องมีเงื่อนไขพร้อมค่าอย่างน้อยหนึ่งข้อ",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 54d6017e8..d879330a5 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Diğer cihazlar artık hesapları buradan geri yükleyemez.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1888,6 +1889,8 @@
         "removed": "Uygulama parolası kaldırıldı",
         "add_error": "Uygulama parolası oluşturulamadı",
         "remove_error": "Uygulama parolası kaldırılamadı",
+        "delete_title": "Uygulama parolası silinsin mi?",
+        "delete_message": "{name} ile oturum açan uygulamalar artık oturum açamaz.",
         "none": "Yapılandırılmış uygulama parolası yok"
       },
       "api_keys": {
@@ -1900,6 +1903,8 @@
         "removed": "API anahtarı kaldırıldı",
         "add_error": "API anahtarı oluşturulamadı",
         "remove_error": "API anahtarı kaldırılamadı",
+        "delete_title": "API anahtarı silinsin mi?",
+        "delete_message": "{name} kullanan betikler ve entegrasyonlar erişimi kaybeder.",
         "none": "Yapılandırılmış API anahtarı yok"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Bu anahtarla şifrelemeyi etkinleştir",
         "enable_button": "Etkinleştir",
         "disable_tooltip": "Şifrelemeyi devre dışı bırak",
+        "disable_title": "Bekleyen veri şifrelemesi kapatılsın mı?",
+        "disable_message": "Yeni postalar bundan sonra şifrelenmeden saklanır.",
+        "disable_button": "Kapat",
         "enabled_success": "Bekleme süresi şifrelemesi etkinleştirildi"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "ör. Anahtarım",
         "key_label": "Ortak anahtar (S/MIME veya PGP ASCII biçiminde)",
         "key_placeholder": "Ortak anahtarınızı buraya yapıştırın",
-        "none": "Yapılandırılmış ortak anahtar yok"
+        "none": "Yapılandırılmış ortak anahtar yok",
+        "title": "Açık anahtarlar",
+        "added": "Açık anahtar eklendi",
+        "removed": "Açık anahtar silindi",
+        "add_error": "Açık anahtar eklenemedi",
+        "remove_error": "Açık anahtar silinemedi",
+        "delete_title": "Açık anahtar silinsin mi?",
+        "delete_message": "{name} sunucudan kaldırılır."
       },
       "sections": {
         "devices": "Diğer uygulamalar ve cihazlar",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Okunmamış ve toplam",
       "count_mode_none": "Sayaç yok",
       "delete": "Sil",
+      "delete_title": "Klasör silinsin mi?",
       "confirm_delete": "\"{name}\" klasörünü silmek istediğinizden emin misiniz? Bu klasördeki e-postalar Çöp Kutusu'na taşınacak.",
       "create": "Oluştur",
       "cancel": "İptal",
@@ -2250,6 +2266,11 @@
       "categories_description": "Kişi kategorilerini yeniden adlandırın",
       "no_categories": "Kategori bulunamadı"
     },
+    "calendar_management": {
+      "delete_title": "Takvim silinsin mi?",
+      "clear_title": "Tüm etkinlikler temizlensin mi?",
+      "unsubscribe_title": "Bu takvim aboneliği iptal edilsin mi?"
+    },
     "downloads": {
       "title": "İndirilenler",
       "description": "İndirilen e-postaların ve eklerin nasıl adlandırılacağını özelleştirin.",
@@ -2404,6 +2425,7 @@
       "match_type": "Eşleşme türü",
       "reset_to_visual": "Görsel oluşturucuya sıfırla",
       "reset_warning": "Bu işlem mevcut betiği atacak ve yeniden başlatacak.",
+      "reset_title": "Görsel düzenleyiciye sıfırlansın mı?",
       "confirm_reset": "Sıfırla",
       "validation_empty_name": "Kural adı gerekli",
       "validation_empty_conditions": "En az bir değeri olan koşul gerekli",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index d54af636c..1cbc83ecb 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "Інші пристрої більше не зможуть відновити з нього облікові записи.",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1882,6 +1883,8 @@
         "removed": "Пароль програми видалено",
         "add_error": "Не вдалося створити пароль програми",
         "remove_error": "Не вдалося видалити пароль програми",
+        "delete_title": "Видалити пароль застосунку?",
+        "delete_message": "Застосунки, що входять із паролем {name}, більше не зможуть увійти.",
         "none": "Паролі програм не налаштовано",
         "done": "Готово",
         "expires_label": "Термін дії (необов’язково)",
@@ -1900,6 +1903,8 @@
         "removed": "API-ключ видалено",
         "add_error": "Не вдалося створити API-ключ",
         "remove_error": "Не вдалося видалити API-ключ",
+        "delete_title": "Видалити ключ API?",
+        "delete_message": "Скрипти й інтеграції, що використовують {name}, втратять доступ.",
         "none": "API-ключі не налаштовано"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "Увімкнути шифрування цим ключем",
         "enable_button": "Увімкнути",
         "disable_tooltip": "Вимкнути шифрування",
+        "disable_title": "Вимкнути шифрування збережених даних?",
+        "disable_message": "Нові листи відтепер зберігатимуться без шифрування.",
+        "disable_button": "Вимкнути",
         "enabled_success": "Шифрування в стані спокою ввімкнено"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "напр. Мій ключ",
         "key_label": "Відкритий ключ (S/MIME або PGP у форматі ASCII)",
         "key_placeholder": "Вставте сюди свій відкритий ключ",
-        "none": "Відкриті ключі не налаштовано"
+        "none": "Відкриті ключі не налаштовано",
+        "title": "Відкриті ключі",
+        "added": "Відкритий ключ додано",
+        "removed": "Відкритий ключ видалено",
+        "add_error": "Не вдалося додати відкритий ключ",
+        "remove_error": "Не вдалося видалити відкритий ключ",
+        "delete_title": "Видалити відкритий ключ?",
+        "delete_message": "Ключ {name} буде видалено із сервера."
       },
       "sections": {
         "devices": "Інші застосунки та пристрої",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "Непрочитані й усього",
       "count_mode_none": "Без лічильника",
       "delete": "Видалити",
+      "delete_title": "Видалити папку?",
       "confirm_delete": "Ви впевнені, що хочете видалити \"{name}\"? Електронні листи в цій папці буде переміщено в кошик.",
       "create": "Створити",
       "cancel": "Скасувати",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "Сортувати за прізвищем",
       "sort_by_last_name_description": "Упорядкувати список контактів за прізвищем, щоб члени родини були поруч"
     },
+    "calendar_management": {
+      "delete_title": "Видалити календар?",
+      "clear_title": "Очистити всі події?",
+      "unsubscribe_title": "Відписатися від цього календаря?"
+    },
     "downloads": {
       "title": "Завантаження",
       "description": "Налаштуйте, як називаються завантажені листи та вкладення.",
@@ -2404,6 +2425,7 @@
       "match_type": "Тип відповідності",
       "reset_to_visual": "Скинути до Visual Builder",
       "reset_warning": "Це призведе до скасування поточного сценарію та запуску заново.",
+      "reset_title": "Повернутися до візуального редактора?",
       "confirm_reset": "Скинути",
       "validation_empty_name": "Потрібно вказати назву правила",
       "validation_empty_conditions": "Потрібна принаймні одна умова зі значенням",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index c16795923..70d262888 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -1790,6 +1790,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "其他裝置將無法再從中還原帳號。",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1895,6 +1896,8 @@
         "removed": "已移除應用程式密碼",
         "add_error": "無法建立應用程式密碼",
         "remove_error": "無法移除應用程式密碼",
+        "delete_title": "刪除應用程式密碼?",
+        "delete_message": "使用 {name} 登入的應用程式將無法再登入。",
         "none": "尚未設定應用程式密碼"
       },
       "api_keys": {
@@ -1907,6 +1910,8 @@
         "removed": "API 金鑰已刪除",
         "add_error": "建立 API 金鑰失敗",
         "remove_error": "刪除 API 金鑰失敗",
+        "delete_title": "刪除 API 金鑰?",
+        "delete_message": "使用 {name} 的指令碼和整合將失去存取權。",
         "none": "未設定 API 金鑰"
       },
       "encryption": {
@@ -1926,6 +1931,9 @@
         "configure_title": "使用此金鑰啟用加密",
         "enable_button": "啟用",
         "disable_tooltip": "停用加密",
+        "disable_title": "關閉靜態加密?",
+        "disable_message": "從現在起,新郵件將不加密儲存。",
+        "disable_button": "關閉",
         "enabled_success": "已啟用靜態資料加密"
       },
       "public_keys": {
@@ -1933,7 +1941,14 @@
         "name_placeholder": "例如：我的金鑰",
         "key_label": "公開金鑰（S/MIME 或 PGP ASCII 裝甲格式）",
         "key_placeholder": "在此貼上您的公鑰",
-        "none": "未設定公鑰"
+        "none": "未設定公鑰",
+        "title": "公開金鑰",
+        "added": "已新增公開金鑰",
+        "removed": "已刪除公開金鑰",
+        "add_error": "無法新增公開金鑰",
+        "remove_error": "無法刪除公開金鑰",
+        "delete_title": "刪除公開金鑰?",
+        "delete_message": "{name} 將從伺服器中移除。"
       },
       "email_client": {
         "title": "郵件用戶端設定",
@@ -2111,6 +2126,7 @@
       "count_mode_all": "未讀與總數",
       "count_mode_none": "不顯示計數",
       "delete": "刪除",
+      "delete_title": "刪除信件匣?",
       "confirm_delete": "您確定要刪除「{name}」嗎？此信件匣中的郵件將移至垃圾桶。",
       "create": "建立",
       "cancel": "取消",
@@ -2257,6 +2273,11 @@
       "categories_description": "重新命名聯絡人類別",
       "no_categories": "找不到類別"
     },
+    "calendar_management": {
+      "delete_title": "刪除行事曆?",
+      "clear_title": "清除所有活動?",
+      "unsubscribe_title": "取消訂閱此行事曆?"
+    },
     "downloads": {
       "title": "下載",
       "description": "自訂下載的郵件和附件的命名方式。",
@@ -2411,6 +2432,7 @@
       "match_type": "比對方式",
       "reset_to_visual": "重設為視覺化建構工具",
       "reset_warning": "這會捨棄目前的指令碼並重新開始。",
+      "reset_title": "重設為視覺化編輯器?",
       "confirm_reset": "重設",
       "validation_empty_name": "規則名稱為必填欄位",
       "validation_empty_conditions": "至少需要一個具有值的條件",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 2acac04ab..d7fbc8861 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -1787,6 +1787,7 @@
         "delete": "Delete saved list",
         "cancel": "Cancel",
         "delete_confirm": "Delete the saved account list from the server?",
+        "delete_message": "其他设备将无法再从中恢复账户。",
         "password": "Backup password",
         "password_hint": "At least 10 characters. It cannot be recovered: if you forget it, save the list again with a new one.",
         "restore_hint": "The password chosen when the list was saved.",
@@ -1882,6 +1883,8 @@
         "removed": "应用密码已删除",
         "add_error": "创建应用密码失败",
         "remove_error": "无法删除应用密码",
+        "delete_title": "删除应用密码?",
+        "delete_message": "使用 {name} 登录的应用将无法再登录。",
         "none": "未配置应用密码",
         "done": "完成",
         "expires_label": "过期时间（可选）",
@@ -1900,6 +1903,8 @@
         "removed": "API 密钥已删除",
         "add_error": "创建 API 密钥失败",
         "remove_error": "删除 API 密钥失败",
+        "delete_title": "删除 API 密钥?",
+        "delete_message": "使用 {name} 的脚本和集成将失去访问权限。",
         "none": "未配置 API 密钥"
       },
       "encryption": {
@@ -1919,6 +1924,9 @@
         "configure_title": "使用此密钥启用加密",
         "enable_button": "启用",
         "disable_tooltip": "禁用加密",
+        "disable_title": "关闭静态加密?",
+        "disable_message": "从现在起,新邮件将不加密存储。",
+        "disable_button": "关闭",
         "enabled_success": "静态加密已启用"
       },
       "email_client": {
@@ -1967,7 +1975,14 @@
         "name_placeholder": "例如：我的密钥",
         "key_label": "公钥（S/MIME 或 PGP ASCII 格式）",
         "key_placeholder": "在此粘贴您的公钥",
-        "none": "未配置公钥"
+        "none": "未配置公钥",
+        "title": "公钥",
+        "added": "已添加公钥",
+        "removed": "已删除公钥",
+        "add_error": "无法添加公钥",
+        "remove_error": "无法删除公钥",
+        "delete_title": "删除公钥?",
+        "delete_message": "{name} 将从服务器中删除。"
       },
       "sections": {
         "devices": "其他应用和设备",
@@ -2104,6 +2119,7 @@
       "count_mode_all": "未读和总数",
       "count_mode_none": "不显示计数",
       "delete": "删除",
+      "delete_title": "删除文件夹?",
       "confirm_delete": "您确定要删除\"{name}\"吗？此文件夹中的邮件将被移至\"已删除\"。",
       "create": "创建",
       "cancel": "取消",
@@ -2250,6 +2266,11 @@
       "sort_by_last_name_label": "按姓氏排序",
       "sort_by_last_name_description": "按姓氏排列联系人列表，使家庭成员显示在一起"
     },
+    "calendar_management": {
+      "delete_title": "删除日历?",
+      "clear_title": "清除所有日程?",
+      "unsubscribe_title": "取消订阅此日历?"
+    },
     "downloads": {
       "title": "下载",
       "description": "自定义下载的邮件和附件的命名方式。",
@@ -2404,6 +2425,7 @@
       "match_type": "匹配类型",
       "reset_to_visual": "重置为可视化编辑器",
       "reset_warning": "这将丢弃当前脚本并重新开始。",
+      "reset_title": "重置为可视化编辑器?",
       "confirm_reset": "重置",
       "validation_empty_name": "规则名称为必填项",
       "validation_empty_conditions": "至少需要一个具有值的条件",