From 302101b186e7a0a6b3eeb83981724eda77837a0c Mon Sep 17 00:00:00 2001
From: Maurice <mauriceboe@icloud.com>
Date: Wed, 23 Sep 2026 20:50:29 +0200
Subject: [PATCH] fix(dayplan): the delete question names every date and night
 it changes

The question before a day goes now also says which day without a date takes over the last date, which stay running across the day loses a night and when it checks out, and what the cancelled booking costs, or that it has no expense at all; further bookings on the same stay are counted. Road trip boundaries follow their own days when the numbering still has a hole from the old delete, and ones left on no day are dropped.

A long list scrolls inside the confirm card on both shells with the buttons always in reach, Escape closes only the sheet on top and takes the trip dialog back from its review step to the form, and the panel of a deleted day closes, also when a fellow traveller deletes it. Undo steps on a deleted day are dropped, a restored place skips days that are gone, and an undo that fails says so. The day cache is written without holding up the answer once the server has it, the tip under a new start date points at the dated add button, and two Collab tests find the confirm button by its role instead of an old colour class.
---
 .../components/Collab/CollabLinks.test.tsx    |   6 +-
 .../components/Collab/CollabNotes.test.tsx    |   4 +-
 .../Planner/DayPlanSidebar.test.tsx           |   7 +-
 .../src/components/Planner/DayPlanSidebar.tsx |   9 +-
 .../components/Trips/TripFormModal.test.tsx   |  48 ++++++-
 client/src/components/Trips/TripFormModal.tsx |   5 +-
 .../components/shared/ConfirmDialog.test.tsx  |  15 +++
 .../src/components/shared/ConfirmDialog.tsx   |   8 +-
 client/src/hooks/usePlannerHistory.ts         |  37 +++++-
 client/src/hooks/useTripRangeGuard.test.ts    |  28 +++-
 client/src/hooks/useTripRangeGuard.ts         |  14 +-
 client/src/mobile/components/MSheet.tsx       |   9 +-
 .../mobile/screens/settings/MConfirmSheet.tsx |  18 ++-
 client/src/pages/tripPlanner/useDayDelete.ts  |  17 ++-
 .../pages/tripPlanner/useTripPlanner.test.tsx | 120 +++++++++++++++++-
 .../src/pages/tripPlanner/useTripPlanner.ts   |  34 +++--
 client/src/repo/dayRepo.test.ts               |  34 ++++-
 client/src/repo/dayRepo.ts                    |  20 ++-
 client/src/store/slices/remoteEventHandler.ts |   5 +-
 client/src/store/tripStore.ts                 |   4 +-
 client/src/utils/dayDeleteImpact.test.ts      |  93 +++++++++++++-
 client/src/utils/dayDeleteImpact.ts           | 109 ++++++++++++++--
 client/src/utils/dayImpactLines.test.ts       |  57 ++++++++-
 client/src/utils/dayImpactLines.ts            |  73 ++++++++++-
 client/src/utils/tripRangeImpact.test.ts      |   3 +-
 .../unit/hooks/usePlannerHistory.test.ts      |  41 ++++++
 client/tests/unit/mobile/MSheet.test.tsx      |  43 +++++++
 .../mobile/settings/MConfirmSheet.test.tsx    |  46 +++++++
 .../unit/mobile/trip/MDaysSheet.test.tsx      |   3 +-
 server/src/nest/days/day-removal.service.ts   |  36 ++++--
 .../unit/nest/day-removal.service.test.ts     |  28 +++-
 shared/src/i18n/ar/dashboard.ts               |   4 +-
 shared/src/i18n/ar/dayplan.ts                 |   9 ++
 shared/src/i18n/ar/undo.ts                    |   1 +
 shared/src/i18n/br/dashboard.ts               |   4 +-
 shared/src/i18n/br/dayplan.ts                 |   9 ++
 shared/src/i18n/br/undo.ts                    |   1 +
 shared/src/i18n/ca/dashboard.ts               |   4 +-
 shared/src/i18n/ca/dayplan.ts                 |   9 ++
 shared/src/i18n/ca/undo.ts                    |   1 +
 shared/src/i18n/cs/dashboard.ts               |   4 +-
 shared/src/i18n/cs/dayplan.ts                 |   9 ++
 shared/src/i18n/cs/undo.ts                    |   1 +
 shared/src/i18n/de/dashboard.ts               |   4 +-
 shared/src/i18n/de/dayplan.ts                 |   9 ++
 shared/src/i18n/de/undo.ts                    |   1 +
 shared/src/i18n/en/dashboard.ts               |   4 +-
 shared/src/i18n/en/dayplan.ts                 |   9 ++
 shared/src/i18n/en/undo.ts                    |   1 +
 shared/src/i18n/es/dashboard.ts               |   4 +-
 shared/src/i18n/es/dayplan.ts                 |   9 ++
 shared/src/i18n/es/undo.ts                    |   1 +
 shared/src/i18n/fr/dashboard.ts               |   4 +-
 shared/src/i18n/fr/dayplan.ts                 |   9 ++
 shared/src/i18n/fr/undo.ts                    |   1 +
 shared/src/i18n/gr/dashboard.ts               |   4 +-
 shared/src/i18n/gr/dayplan.ts                 |  11 ++
 shared/src/i18n/gr/undo.ts                    |   1 +
 shared/src/i18n/hu/dashboard.ts               |   4 +-
 shared/src/i18n/hu/dayplan.ts                 |   9 ++
 shared/src/i18n/hu/undo.ts                    |   1 +
 shared/src/i18n/id/dashboard.ts               |   4 +-
 shared/src/i18n/id/dayplan.ts                 |  11 ++
 shared/src/i18n/id/undo.ts                    |   1 +
 shared/src/i18n/it/dashboard.ts               |   4 +-
 shared/src/i18n/it/dayplan.ts                 |   9 ++
 shared/src/i18n/it/undo.ts                    |   1 +
 shared/src/i18n/ja/dashboard.ts               |   4 +-
 shared/src/i18n/ja/dayplan.ts                 |   9 ++
 shared/src/i18n/ja/undo.ts                    |   1 +
 shared/src/i18n/ko/dashboard.ts               |   4 +-
 shared/src/i18n/ko/dayplan.ts                 |   8 ++
 shared/src/i18n/ko/undo.ts                    |   1 +
 shared/src/i18n/nl/dashboard.ts               |   4 +-
 shared/src/i18n/nl/dayplan.ts                 |   9 ++
 shared/src/i18n/nl/undo.ts                    |   1 +
 shared/src/i18n/pl/dashboard.ts               |   4 +-
 shared/src/i18n/pl/dayplan.ts                 |   9 ++
 shared/src/i18n/pl/undo.ts                    |   1 +
 shared/src/i18n/ru/dashboard.ts               |   4 +-
 shared/src/i18n/ru/dayplan.ts                 |   9 ++
 shared/src/i18n/ru/undo.ts                    |   1 +
 shared/src/i18n/sv/dashboard.ts               |   4 +-
 shared/src/i18n/sv/dayplan.ts                 |   9 ++
 shared/src/i18n/sv/undo.ts                    |   1 +
 shared/src/i18n/tr/dashboard.ts               |   4 +-
 shared/src/i18n/tr/dayplan.ts                 |   9 ++
 shared/src/i18n/tr/undo.ts                    |   1 +
 shared/src/i18n/uk/dashboard.ts               |   4 +-
 shared/src/i18n/uk/dayplan.ts                 |   9 ++
 shared/src/i18n/uk/undo.ts                    |   1 +
 shared/src/i18n/vi/dashboard.ts               |   4 +-
 shared/src/i18n/vi/dayplan.ts                 |   9 ++
 shared/src/i18n/vi/undo.ts                    |   1 +
 shared/src/i18n/zh-TW/dashboard.ts            |   4 +-
 shared/src/i18n/zh-TW/dayplan.ts              |   8 ++
 shared/src/i18n/zh-TW/undo.ts                 |   1 +
 shared/src/i18n/zh/dashboard.ts               |   4 +-
 shared/src/i18n/zh/dayplan.ts                 |   8 ++
 shared/src/i18n/zh/undo.ts                    |   1 +
 wiki/Accommodations.md                        |   2 +-
 wiki/Day-Plans-and-Notes.md                   |  13 +-
 102 files changed, 1170 insertions(+), 142 deletions(-)
 create mode 100644 client/tests/unit/mobile/settings/MConfirmSheet.test.tsx

diff --git a/client/src/components/Collab/CollabLinks.test.tsx b/client/src/components/Collab/CollabLinks.test.tsx
index 779fd3cdb..ff648ad8d 100644
--- a/client/src/components/Collab/CollabLinks.test.tsx
+++ b/client/src/components/Collab/CollabLinks.test.tsx
@@ -12,7 +12,7 @@ vi.mock('../../api/websocket', () => ({
 
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { fireEvent, render, screen, waitFor } from '../../../tests/helpers/render';
+import { fireEvent, render, screen, waitFor, within } from '../../../tests/helpers/render';
 import userEvent from '@testing-library/user-event';
 import { http, HttpResponse } from 'msw';
 import { server } from '../../../tests/helpers/msw/server';
@@ -177,7 +177,9 @@ describe('CollabLinks', () => {
     expect(deleted).toBe(false);
     expect(screen.getByText('Ferry timetable')).toBeInTheDocument();
 
-    await user.click(document.querySelector('button.bg-red-600') as HTMLElement);
+    // The confirm button of the question itself, found by its role rather than a colour class.
+    const question = screen.getByText(/delete link\?|collab\.links\.confirmDeleteTitle/i).closest('.trek-modal-enter') as HTMLElement;
+    await user.click(within(question).getByRole('button', { name: /^(delete|common\.delete)$/i }));
     await waitFor(() => expect(deleted).toBe(true));
     await waitFor(() => expect(screen.queryByText('Ferry timetable')).not.toBeInTheDocument());
   });
diff --git a/client/src/components/Collab/CollabNotes.test.tsx b/client/src/components/Collab/CollabNotes.test.tsx
index 576029c1a..3b5e57d84 100644
--- a/client/src/components/Collab/CollabNotes.test.tsx
+++ b/client/src/components/Collab/CollabNotes.test.tsx
@@ -201,7 +201,9 @@ describe('CollabNotes', () => {
     // Deleting now asks for confirmation first — the note stays until confirmed.
     expect(screen.getByText('Delete note?')).toBeInTheDocument();
     expect(screen.getByText('Remove Me')).toBeInTheDocument();
-    await user.click(document.querySelector('button.bg-red-600') as HTMLElement);
+    // The confirm button of the question itself, found by its role rather than a colour class.
+    const question = screen.getByText('Delete note?').closest('.trek-modal-enter') as HTMLElement;
+    await user.click(within(question).getByRole('button', { name: 'Delete' }));
     await waitFor(() => expect(screen.queryByText('Remove Me')).not.toBeInTheDocument());
   });
 
diff --git a/client/src/components/Planner/DayPlanSidebar.test.tsx b/client/src/components/Planner/DayPlanSidebar.test.tsx
index bcd440d15..f5e692a95 100644
--- a/client/src/components/Planner/DayPlanSidebar.test.tsx
+++ b/client/src/components/Planner/DayPlanSidebar.test.tsx
@@ -2891,7 +2891,8 @@ describe('DayPlanSidebar', () => {
     expect(onRouteRefresh).toHaveBeenCalled()
     // The store carries the new slot per day so the merged list stays stable.
     expect(useTripStore.getState().reservations[0].day_positions).toEqual({ 10: expect.any(Number) })
-    // Undoing restores the original assignment order.
+    // Undoing restores the original assignment order; the step names its day, so deleting the day drops it.
+    expect(pushUndo.mock.calls[0][2]).toEqual([10])
     const undo = pushUndo.mock.calls[0][1] as () => Promise<void>
     await undo()
     expect(reorderAssignments).toHaveBeenCalledWith(1, 10, [11, 12])
@@ -3477,8 +3478,9 @@ describe('DayPlanSidebar', () => {
       fireEvent.drop(dayHeader('Day 2'), { dataTransfer: { getData: vi.fn(() => '') } })
       expect(onMoveToDay).toHaveBeenCalledWith(21, 10, 11, 1)
       expect(moveAssignment).not.toHaveBeenCalled()
-      // Still offered back once the planner has made the move.
+      // Still offered back once the planner has made the move, tagged with both days it touches.
       await waitFor(() => expect(pushUndo).toHaveBeenCalledTimes(1))
+      expect(pushUndo.mock.calls[0][2]).toEqual([11, 10])
     })
   })
 
@@ -4376,6 +4378,7 @@ describe('DayPlanSidebar', () => {
     render(<DayPlanSidebar {...makeDefaultProps({ days: [day], assignments, selectedDayId: 10, pushUndo, onReorder })} />)
     await user.click(screen.getByRole('button', { name: 'Optimize' }))
     await waitFor(() => expect(onReorder).toHaveBeenCalled())
+    expect(pushUndo.mock.calls[0][2]).toEqual([10])
     const undo = pushUndo.mock.calls[0][1] as () => Promise<void>
     await undo()
     expect(reorderAssignments).toHaveBeenCalledWith(1, 10, [11, 12, 13])
diff --git a/client/src/components/Planner/DayPlanSidebar.tsx b/client/src/components/Planner/DayPlanSidebar.tsx
index 54b4f1220..de6ee51dc 100644
--- a/client/src/components/Planner/DayPlanSidebar.tsx
+++ b/client/src/components/Planner/DayPlanSidebar.tsx
@@ -113,7 +113,8 @@ interface DayPlanSidebarProps {
   /** Open the place form already pointed at this day, to create a new place there. */
   onCreatePlaceForDay?: (dayId: number) => void
   onExpandedDaysChange?: (expandedDayIds: Set<number>) => void
-  pushUndo?: (label: string, undoFn: () => Promise<void> | void) => void
+  /** `dayIds`: the days the step acts on, so deleting one of them drops it. */
+  pushUndo?: (label: string, undoFn: () => Promise<void> | void, dayIds?: number[]) => void
   canUndo?: boolean
   lastActionLabel?: string | null
   onUndo?: () => void
@@ -898,7 +899,7 @@ function useDayPlanSidebar(props: DayPlanSidebarProps) {
         const capturedPrevIds = prevAssignmentIds
         pushUndo?.(t('undo.reorder'), async () => {
           await tripActions.reorderAssignments(tripId, capturedDayId, capturedPrevIds)
-        })
+        }, [capturedDayId])
       }
     } catch (err: unknown) {
       rollBackReservations()
@@ -1073,7 +1074,7 @@ function useDayPlanSidebar(props: DayPlanSidebarProps) {
     const capturedDayId = dayId
     pushUndo?.(t('undo.optimize'), async () => {
       await tripActions.reorderAssignments(tripId, capturedDayId, prevIds)
-    })
+    }, [capturedDayId])
   }
 
 
@@ -1097,7 +1098,7 @@ function useDayPlanSidebar(props: DayPlanSidebarProps) {
         .then(() => {
           pushUndo?.(t('undo.moveDay'), async () => {
             await tripActions.moveAssignment(tripId, Number(assignmentId), dayId, capturedFromDayId, capturedOrderIndex)
-          })
+          }, [Number(dayId), Number(capturedFromDayId)])
         })
         .catch((err: unknown) => toast.error(err instanceof Error ? err.message : t('common.unknownError')))
     } else if (noteId && fromDayId !== dayId) {
diff --git a/client/src/components/Trips/TripFormModal.test.tsx b/client/src/components/Trips/TripFormModal.test.tsx
index 8dbff70af..c53579d6f 100644
--- a/client/src/components/Trips/TripFormModal.test.tsx
+++ b/client/src/components/Trips/TripFormModal.test.tsx
@@ -1,4 +1,4 @@
-// FE-COMP-TRIPFORM-001 to FE-COMP-TRIPFORM-095
+// FE-COMP-TRIPFORM-001 to FE-COMP-TRIPFORM-097
 import type { Mock } from 'vitest';
 import { render, screen, waitFor, fireEvent, within } from '../../../tests/helpers/render';
 import userEvent from '@testing-library/user-event';
@@ -8,9 +8,9 @@ import { useTripStore } from '../../store/tripStore';
 import { useSettingsStore } from '../../store/settingsStore';
 import { usePermissionsStore } from '../../store/permissionsStore';
 import { resetAllStores, seedStore } from '../../../tests/helpers/store';
-import { buildUser, buildTrip, buildDay, buildAssignment, buildPlace, buildReservation } from '../../../tests/helpers/factories';
+import { buildUser, buildTrip, buildDay, buildAssignment, buildPlace, buildReservation, buildBudgetItem } from '../../../tests/helpers/factories';
 import { server } from '../../../tests/helpers/msw/server';
-import type { Accommodation, Reservation, Trip } from '../../types';
+import type { Accommodation, BudgetItem, Reservation, Trip } from '../../types';
 import { MAX_TRIP_DAYS } from '@trek/shared';
 import TripFormModal from './TripFormModal';
 
@@ -1295,7 +1295,7 @@ describe('TripFormModal', () => {
 
   /** A week in October with a place on its last two days, and the trip's bookings and stays. */
   const shrinkableTrip = () => buildTrip({ id: 1, title: 'Coast week', start_date: '2026-10-01', end_date: '2026-10-07' });
-  const seedTripDays = (extras: { reservations?: Reservation[]; accommodations?: Accommodation[]; empty?: boolean } = {}) => {
+  const seedTripDays = (extras: { reservations?: Reservation[]; accommodations?: Accommodation[]; budget?: BudgetItem[]; empty?: boolean } = {}) => {
     const days = Array.from({ length: 7 }, (_, i) => buildDay({
       id: 300 + i,
       trip_id: 1,
@@ -1307,6 +1307,7 @@ describe('TripFormModal', () => {
       http.get('/api/trips/:id/days', () => HttpResponse.json({ days })),
       http.get('/api/trips/:id/reservations', () => HttpResponse.json({ reservations: extras.reservations ?? [] })),
       http.get('/api/trips/:id/accommodations', () => HttpResponse.json({ accommodations: extras.accommodations ?? [] })),
+      http.get('/api/trips/:id/budget', () => HttpResponse.json({ items: extras.budget ?? [] })),
     );
   };
   const changeEndDate = async (user: ReturnType<typeof userEvent.setup>, iso: string) => {
@@ -1320,6 +1321,7 @@ describe('TripFormModal', () => {
     seedTripDays({
       accommodations: [{ id: 9, trip_id: 1, start_day_id: 304, end_day_id: 306, place_name: 'Harbour Hotel' } as Accommodation],
       reservations: [buildReservation({ id: 70, day_id: 304, type: 'hotel', title: 'Harbour, 2 nights', accommodation_id: 9 })],
+      budget: [buildBudgetItem({ reservation_id: 70, total_price: 240 })],
     });
     const user = userEvent.setup();
     const onSave = vi.fn().mockResolvedValue({});
@@ -1422,6 +1424,44 @@ describe('TripFormModal', () => {
     expect(onSave).not.toHaveBeenCalled();
   });
 
+  it('FE-COMP-TRIPFORM-096: Escape in the warning goes back to the form, like Back, and keeps the edit', async () => {
+    seedTripDays();
+    const user = userEvent.setup();
+    const onClose = vi.fn();
+    render(<TripFormModal {...defaultProps} onClose={onClose} trip={shrinkableTrip()} onSave={vi.fn()} />);
+
+    const title = screen.getByDisplayValue('Coast week');
+    await user.clear(title);
+    await user.type(title, 'Coast week, shorter');
+    await changeEndDate(user, '2026-10-05');
+    await user.click(screen.getByRole('button', { name: /Update/i }));
+    await screen.findByRole('list', { name: 'Remove days?' });
+
+    fireEvent.keyDown(document, { key: 'Escape' });
+    await waitFor(() => expect(screen.queryByRole('list', { name: 'Remove days?' })).not.toBeInTheDocument());
+    expect(onClose).not.toHaveBeenCalled();
+    expect(screen.getByDisplayValue('Coast week, shorter')).toBeInTheDocument();
+    // Out of the warning, Escape closes the dialog as before.
+    fireEvent.keyDown(document, { key: 'Escape' });
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+
+  it('FE-COMP-TRIPFORM-097: a removed stay whose booking carries no expense does not claim one', async () => {
+    seedTripDays({
+      accommodations: [{ id: 9, trip_id: 1, start_day_id: 304, end_day_id: 306, place_name: 'Harbour Hotel' } as Accommodation],
+      reservations: [buildReservation({ id: 70, day_id: 304, type: 'hotel', title: 'Harbour, 2 nights', accommodation_id: 9 })],
+    });
+    const user = userEvent.setup();
+    render(<TripFormModal {...defaultProps} trip={shrinkableTrip()} onSave={vi.fn()} />);
+
+    await changeEndDate(user, '2026-10-05');
+    await user.click(screen.getByRole('button', { name: /Update/i }));
+
+    const list = await screen.findByRole('list', { name: 'Remove days?' });
+    expect(within(list).getByText('Checks in or out on a removed day, so the whole stay is removed. Its booking "Harbour, 2 nights" stays under Bookings.')).toBeInTheDocument();
+    expect(within(list).queryByText(/its expense/)).not.toBeInTheDocument();
+  });
+
   it('FE-COMP-TRIPFORM-094: when the days cannot be read it still warns, in general terms', async () => {
     const spy = vi.spyOn(console, 'error').mockImplementation(() => {});
     server.use(http.get('/api/trips/:id/days', () => HttpResponse.json({ error: 'boom' }, { status: 500 })));
diff --git a/client/src/components/Trips/TripFormModal.tsx b/client/src/components/Trips/TripFormModal.tsx
index 0ba34d16e..e92b8e7ae 100644
--- a/client/src/components/Trips/TripFormModal.tsx
+++ b/client/src/components/Trips/TripFormModal.tsx
@@ -403,7 +403,10 @@ export default function TripFormModal({ isOpen, onClose, onSave, trip, onCoverUp
   return (
     <Modal
       isOpen={isOpen}
-      onClose={onClose}
+      // In the review step Escape, the close button and a click beside the
+      // dialog go back to the form, like Back, instead of throwing the whole
+      // edit away. Outside that step they close the dialog as before.
+      onClose={pendingReview ? () => { if (!busy) setPendingReview(null) } : onClose}
       title={pendingReview
         ? t(pendingReview.askShift ? 'dashboard.dateShiftTitle' : 'dashboard.shrinkTitle')
         : isEditing ? t('dashboard.editTrip') : t('dashboard.createTrip')}
diff --git a/client/src/components/shared/ConfirmDialog.test.tsx b/client/src/components/shared/ConfirmDialog.test.tsx
index 07975743c..8a673f56c 100644
--- a/client/src/components/shared/ConfirmDialog.test.tsx
+++ b/client/src/components/shared/ConfirmDialog.test.tsx
@@ -130,6 +130,21 @@ describe('ConfirmDialog', () => {
     expect(document.querySelector('.bg-danger-soft')).toBeNull();
   });
 
+  it('FE-COMP-CONFIRM-013: a long list scrolls inside the card, and the buttons stay outside it, always in reach', () => {
+    render(
+      <ConfirmDialog isOpen={true} onClose={onClose} onConfirm={onConfirm} message="Delete it?">
+        <ul aria-label="consequences">{Array.from({ length: 40 }, (_, i) => <li key={i}>Row {i}</li>)}</ul>
+      </ConfirmDialog>
+    );
+    const scroller = screen.getByRole('list', { name: 'consequences' }).closest('.overflow-y-auto') as HTMLElement;
+    expect(scroller).not.toBeNull();
+    expect(scroller.parentElement).toHaveClass('flex-col');
+    expect(scroller.parentElement!.className).toMatch(/max-h-\[/);
+    const confirm = screen.getByRole('button', { name: /delete/i });
+    expect(scroller.contains(confirm)).toBe(false);
+    expect(confirm.parentElement).toHaveClass('flex-none');
+  });
+
   it('FE-COMP-CONFIRM-008: clicking backdrop calls onClose', async () => {
     const user = userEvent.setup();
     render(<ConfirmDialog isOpen={true} onClose={onClose} onConfirm={onConfirm} message="msg" />);
diff --git a/client/src/components/shared/ConfirmDialog.tsx b/client/src/components/shared/ConfirmDialog.tsx
index 1cc920ba7..626e8db17 100644
--- a/client/src/components/shared/ConfirmDialog.tsx
+++ b/client/src/components/shared/ConfirmDialog.tsx
@@ -65,12 +65,14 @@ export default function ConfirmDialog({
       style={{ paddingBottom: 'var(--bottom-nav-h)' }}
       onClick={onClose}
     >
+      {/* Capped at the viewport: a long list of what goes along scrolls on its
+          own, and the two buttons below it always stay in reach. */}
       <div
         role="presentation"
-        className={`trek-modal-enter rounded-2xl shadow-2xl w-full ${children ? 'max-w-md' : 'max-w-sm'} p-6 bg-surface-card`}
+        className={`trek-modal-enter flex max-h-[calc(100dvh-2rem-var(--bottom-nav-h,0px))] flex-col rounded-2xl shadow-2xl w-full ${children ? 'max-w-md' : 'max-w-sm'} p-6 bg-surface-card`}
         onClick={e => e.stopPropagation()}
       >
-        <div className="flex items-start gap-4">
+        <div className="flex min-h-0 items-start gap-4 overflow-y-auto overscroll-contain">
           {danger && (
             <div className="flex-shrink-0 w-10 h-10 rounded-full bg-danger-soft flex items-center justify-center">
               <AlertTriangle className="w-5 h-5 text-danger" />
@@ -87,7 +89,7 @@ export default function ConfirmDialog({
           </div>
         </div>
 
-        <div className="flex justify-end gap-3 mt-6">
+        <div className="flex flex-none justify-end gap-3 mt-6">
           <button type="button"
             onClick={onClose}
             className="px-4 py-2 text-sm font-medium rounded-lg transition-colors text-content-secondary border border-edge-secondary"
diff --git a/client/src/hooks/usePlannerHistory.ts b/client/src/hooks/usePlannerHistory.ts
index fb8e79b70..050cd3c0a 100644
--- a/client/src/hooks/usePlannerHistory.ts
+++ b/client/src/hooks/usePlannerHistory.ts
@@ -1,29 +1,52 @@
-import { useRef, useReducer } from 'react'
+import { useCallback, useRef, useReducer } from 'react'
 
 export interface UndoEntry {
   label: string
   undo: () => Promise<void> | void
+  /** The days the step acts on. Deleting one of them drops the step. */
+  dayIds?: number[]
 }
 
 export function usePlannerHistory(maxEntries = 30) {
   const historyRef = useRef<UndoEntry[]>([])
   const [, forceUpdate] = useReducer((x: number) => x + 1, 0)
 
-  const pushUndo = (label: string, undoFn: () => Promise<void> | void) => {
-    historyRef.current = [{ label, undo: undoFn }, ...historyRef.current].slice(0, maxEntries)
+  const pushUndo = (label: string, undoFn: () => Promise<void> | void, dayIds?: number[]) => {
+    historyRef.current = [{ label, undo: undoFn, dayIds }, ...historyRef.current].slice(0, maxEntries)
     forceUpdate()
   }
 
-  const undo = async () => {
-    if (historyRef.current.length === 0) return
+  /**
+   * Take the last step back. Resolves true when it went through, false when it
+   * failed, and null when there was nothing to take back.
+   */
+  const undo = async (): Promise<boolean | null> => {
+    if (historyRef.current.length === 0) return null
     const [first, ...rest] = historyRef.current
     historyRef.current = rest
     forceUpdate()
-    try { await first.undo() } catch (e) { console.error('Undo failed:', e) }
+    try {
+      await first.undo()
+      return true
+    } catch (e) {
+      console.error('Undo failed:', e)
+      return false
+    }
   }
 
+  /**
+   * Drop the steps that act on a day that is gone. They could only fail now,
+   * and the undo button would point at one of them.
+   */
+  const forgetDay = useCallback((dayId: number) => {
+    const kept = historyRef.current.filter(entry => !entry.dayIds?.includes(dayId))
+    if (kept.length === historyRef.current.length) return
+    historyRef.current = kept
+    forceUpdate()
+  }, [])
+
   const canUndo = historyRef.current.length > 0
   const lastActionLabel = historyRef.current[0]?.label ?? null
 
-  return { pushUndo, undo, canUndo, lastActionLabel }
+  return { pushUndo, undo, forgetDay, canUndo, lastActionLabel }
 }
diff --git a/client/src/hooks/useTripRangeGuard.test.ts b/client/src/hooks/useTripRangeGuard.test.ts
index 6bfb705a0..5eec8aeae 100644
--- a/client/src/hooks/useTripRangeGuard.test.ts
+++ b/client/src/hooks/useTripRangeGuard.test.ts
@@ -1,5 +1,5 @@
 /**
- * FE-HOOK-RANGEGUARD-001 to FE-HOOK-RANGEGUARD-005: the question before a trip
+ * FE-HOOK-RANGEGUARD-001 to FE-HOOK-RANGEGUARD-006: the question before a trip
  * dialog saves new dates. The desktop dialog and the phone sheet both render
  * what this answers, so what it reads, when it reads nothing, and what it says
  * when it cannot read are pinned here once. The repos are mocked; the layout
@@ -9,18 +9,20 @@ import { createElement, type ReactNode } from 'react'
 import { act, renderHook } from '@testing-library/react'
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { TranslationProvider } from '../i18n/TranslationContext'
-import { buildAssignment, buildDay, buildPlace } from '../../tests/helpers/factories'
-import type { Accommodation, Day, Reservation } from '../types'
+import { buildAssignment, buildBudgetItem, buildDay, buildPlace, buildReservation } from '../../tests/helpers/factories'
+import type { Accommodation, BudgetItem, Day, Reservation } from '../types'
 import { useTripRangeGuard, type RangeCheck, type RangeRemoval } from './useTripRangeGuard'
 
 const repos = {
   days: vi.fn<() => Promise<{ days: Day[] }>>(),
   reservations: vi.fn<() => Promise<{ reservations: Reservation[] }>>(),
   accommodations: vi.fn<() => Promise<{ accommodations: Accommodation[] }>>(),
+  budget: vi.fn<() => Promise<{ items: BudgetItem[] }>>(),
 }
 vi.mock('../repo/dayRepo', () => ({ dayRepo: { list: () => repos.days() } }))
 vi.mock('../repo/reservationRepo', () => ({ reservationRepo: { list: () => repos.reservations() } }))
 vi.mock('../repo/accommodationRepo', () => ({ accommodationRepo: { list: () => repos.accommodations() } }))
+vi.mock('../repo/budgetRepo', () => ({ budgetRepo: { list: () => repos.budget() } }))
 
 const wrapper = ({ children }: { children: ReactNode }) => createElement(TranslationProvider, null, children)
 
@@ -48,6 +50,7 @@ beforeEach(() => {
   repos.days.mockReset().mockResolvedValue({ days: fiveDays([4, 5]) })
   repos.reservations.mockReset().mockResolvedValue({ reservations: [] })
   repos.accommodations.mockReset().mockResolvedValue({ accommodations: [] })
+  repos.budget.mockReset().mockResolvedValue({ items: [] })
 })
 
 describe('useTripRangeGuard', () => {
@@ -85,6 +88,25 @@ describe('useTripRangeGuard', () => {
     spy.mockRestore()
   })
 
+  it('FE-HOOK-RANGEGUARD-006: the expenses say whether the booking of a removed stay has one; unreadable ones cost no answer', async () => {
+    repos.accommodations.mockResolvedValue({ accommodations: [{ id: 9, trip_id: 7, start_day_id: 4, end_day_id: 5, place_name: 'Harbour Hotel' } as Accommodation] })
+    repos.reservations.mockResolvedValue({ reservations: [buildReservation({ id: 40, day_id: 4, type: 'hotel', title: 'Harbour, 1 night', accommodation_id: 9 })] })
+    const shrink = { start_date: '2026-10-01', end_date: '2026-10-03' }
+
+    // Read, and none written against the booking.
+    expect((await ask(shrink) as RangeRemoval).content.stays[0].expense).toBeNull()
+    // Read, with one: said, though not by its sum, since shortening keeps it.
+    repos.budget.mockResolvedValue({ items: [buildBudgetItem({ reservation_id: 40, total_price: 120 })] })
+    expect((await ask(shrink) as RangeRemoval).content.stays[0].expense).toEqual({ amount: null })
+    // Not readable: the warning still comes, and says the booking may have one.
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    repos.budget.mockRejectedValue(new Error('500'))
+    const answer = await ask(shrink) as RangeRemoval
+    expect(answer.content.stays[0]).toMatchObject({ booking: 'Harbour, 1 night', expense: { amount: null } })
+    expect(warn).toHaveBeenCalled()
+    warn.mockRestore()
+  })
+
   it('FE-HOOK-RANGEGUARD-005: a later start with the same end takes the last days and says the start moved', async () => {
     const answer = await ask({ start_date: '2026-10-03', end_date: '2026-10-05' }) as RangeRemoval
     expect(answer.removedDays.map(r => r.day.id)).toEqual([4, 5])
diff --git a/client/src/hooks/useTripRangeGuard.ts b/client/src/hooks/useTripRangeGuard.ts
index 47abd941f..e983425f6 100644
--- a/client/src/hooks/useTripRangeGuard.ts
+++ b/client/src/hooks/useTripRangeGuard.ts
@@ -4,6 +4,7 @@ import { useTranslation } from '../i18n'
 import { dayRepo } from '../repo/dayRepo'
 import { reservationRepo } from '../repo/reservationRepo'
 import { accommodationRepo } from '../repo/accommodationRepo'
+import { budgetRepo } from '../repo/budgetRepo'
 import { dayLabel } from '../utils/dayLabel'
 import { hasVisibleContent, tripRangeImpact, type TripRangeImpact } from '../utils/tripRangeImpact'
 import type { AssignmentsMap, DayNotesMap, Trip } from '../types'
@@ -32,7 +33,9 @@ export interface RangePayload {
  * and what is on them. It reads the trip's days, bookings and stays through the
  * repos and lays the days out with planDayGrid, the rule the server rebuilds
  * them by, so the warning names exactly the days the save takes. A save that
- * does not rebuild the days is answered without reading anything.
+ * does not rebuild the days is answered without reading anything. The expenses
+ * only tell whether a removed stay's booking has one; when they cannot be read,
+ * the warning says it may.
  *
  * Used by the desktop trip dialog and the phone's trip sheet alike; both only
  * render what comes back.
@@ -46,10 +49,14 @@ export function useTripRangeGuard(): { checking: boolean; check: (trip: Pick<Tri
     if (!range.regenerate) return null
     setChecking(true)
     try {
-      const [{ days }, { reservations }, { accommodations }] = await Promise.all([
+      const [{ days }, { reservations }, { accommodations }, expenses] = await Promise.all([
         dayRepo.list(trip.id),
         reservationRepo.list(trip.id),
         accommodationRepo.list(trip.id),
+        budgetRepo.list(trip.id).catch((err: unknown) => {
+          console.warn('Expenses not read for the warning before new dates:', err)
+          return null
+        }),
       ])
       const plan = planDayGrid({
         days: days.map(d => ({
@@ -72,7 +79,8 @@ export function useTripRangeGuard(): { checking: boolean; check: (trip: Pick<Tri
         dayNotes[String(day.id)] = day.notes_items ?? []
       }
       const startMoved = !!trip.start_date && !!range.newStart && !!range.newEnd && range.newStart !== trip.start_date
-      const impact = tripRangeImpact(plan, days, { assignments, dayNotes, reservations, accommodations }, { startMoved })
+      const budget = expenses ? { items: expenses.items } : undefined
+      const impact = tripRangeImpact(plan, days, { assignments, dayNotes, reservations, accommodations, budget }, { startMoved })
       if (!hasVisibleContent(impact)) return null
       return { ...impact, dayLabels: impact.removedDays.map(({ day, index }) => dayLabel(day, index, t, locale)) }
     } catch (err: unknown) {
diff --git a/client/src/mobile/components/MSheet.tsx b/client/src/mobile/components/MSheet.tsx
index 08d575756..9249d273b 100644
--- a/client/src/mobile/components/MSheet.tsx
+++ b/client/src/mobile/components/MSheet.tsx
@@ -90,10 +90,16 @@ export default function MSheet({
     return () => clearTimeout(t)
   }, [open])
 
+  // Escape belongs to the sheet on top only: a question opened over another
+  // sheet closes alone, and the sheet under it stays open with whatever was
+  // typed into it. Sheets portal in the order they open, so the top one is the
+  // last open panel in the document.
   useEffect(() => {
     if (!open) return
     const onKey = (e: KeyboardEvent) => {
-      if (e.key === 'Escape') onClose()
+      if (e.key !== 'Escape') return
+      const openPanels = document.querySelectorAll('[data-m-sheet="open"]')
+      if (openPanels[openPanels.length - 1] === panelRef.current) onClose()
     }
     document.addEventListener('keydown', onKey)
     return () => document.removeEventListener('keydown', onKey)
@@ -192,6 +198,7 @@ export default function MSheet({
           role="dialog"
           aria-modal="true"
           aria-label={ariaLabel}
+          data-m-sheet={open ? 'open' : 'closing'}
           tabIndex={-1}
           className={`relative flex flex-col overflow-hidden outline-none text-m-ink ${SHAPE[variant]} ${MATERIAL[resolvedMaterial]} ${animation} ${className}`}
           style={variant === 'bottom' ? dragStyle : undefined}
diff --git a/client/src/mobile/screens/settings/MConfirmSheet.tsx b/client/src/mobile/screens/settings/MConfirmSheet.tsx
index f8c6a2a97..b565c1691 100644
--- a/client/src/mobile/screens/settings/MConfirmSheet.tsx
+++ b/client/src/mobile/screens/settings/MConfirmSheet.tsx
@@ -16,7 +16,11 @@ interface MConfirmSheetProps {
   children?: ReactNode
 }
 
-/** Small confirm dialog as a centred floating card. Without onConfirm it is a plain notice. */
+/**
+ * Small confirm dialog as a centred floating card. Without onConfirm it is a
+ * plain notice. The card stops at the screen height: a long message or list
+ * scrolls between the title and the buttons, which always stay in reach.
+ */
 export default function MConfirmSheet({
   open,
   onClose,
@@ -31,11 +35,13 @@ export default function MConfirmSheet({
 }: MConfirmSheetProps) {
   return (
     <MSheet open={open} onClose={onClose} variant="card" material="opaque" ariaLabel={title}>
-      <div className="p-[18px]">
-        <div className="text-[0.9375rem] font-extrabold text-m-ink">{title}</div>
-        <p className="mt-2 text-[0.78125rem] leading-relaxed text-m-muted">{message}</p>
-        {children}
-        <div className="mt-4 flex justify-end gap-2">
+      <div className="flex min-h-0 flex-col p-[18px]">
+        <div className="flex-none text-[0.9375rem] font-extrabold text-m-ink">{title}</div>
+        <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain">
+          <p className="mt-2 text-[0.78125rem] leading-relaxed text-m-muted">{message}</p>
+          {children}
+        </div>
+        <div className="mt-4 flex flex-none justify-end gap-2">
           <MSetButton variant="ghost" onClick={onClose}>
             {cancelLabel}
           </MSetButton>
diff --git a/client/src/pages/tripPlanner/useDayDelete.ts b/client/src/pages/tripPlanner/useDayDelete.ts
index 9421c7544..40344368d 100644
--- a/client/src/pages/tripPlanner/useDayDelete.ts
+++ b/client/src/pages/tripPlanner/useDayDelete.ts
@@ -20,8 +20,11 @@ interface DayDeleteOptions {
   t: Translate
   locale: string
   toast: { success: (message: string) => unknown; error: (message: string) => unknown }
-  /** After a delete went through: the stays and the route of the selected day are the planner's to reload. */
-  onDeleted: () => void
+  /**
+   * After a delete went through, with the day that went: the stays, the route
+   * of the selected day, an open day panel and the undo steps are the planner's.
+   */
+  onDeleted: (dayId: number) => void
 }
 
 export interface DayDelete {
@@ -54,6 +57,7 @@ export function useDayDelete(options: DayDeleteOptions): DayDelete {
   const { offline } = useNetworkMode()
   const assignments = useTripStore(s => s.assignments)
   const dayNotes = useTripStore(s => s.dayNotes)
+  const budgetItems = useTripStore(s => s.budgetItems)
   const [deleteDayId, setDeleteDayId] = useState<number | null>(null)
 
   const deleteDayBlocked = deleteDayBlockedReason(days.length, offline, t)
@@ -69,9 +73,10 @@ export function useDayDelete(options: DayDeleteOptions): DayDelete {
 
   const deleteDayLines = useMemo(() => {
     if (!target) return []
-    const impact = dayDeleteImpact(target, days, { assignments, dayNotes, reservations, accommodations, places }, trip)
-    return buildDeleteDayLines(impact, t, iso => formatDate(iso, locale) ?? iso)
-  }, [target, days, assignments, dayNotes, reservations, accommodations, places, trip, t, locale])
+    const budget = { items: budgetItems, currency: trip?.currency, locale }
+    const impact = dayDeleteImpact(target, days, { assignments, dayNotes, reservations, accommodations, places, budget }, trip)
+    return buildDeleteDayLines(impact, t, iso => formatDate(iso, locale) ?? iso, (day, i) => dayLabel(day, i, t, locale))
+  }, [target, days, assignments, dayNotes, reservations, accommodations, places, budgetItems, trip, t, locale])
 
   const handleDeleteDay = useCallback((dayId: number) => {
     if (!canEditDays || deleteDayBlocked) return
@@ -91,7 +96,7 @@ export function useDayDelete(options: DayDeleteOptions): DayDelete {
       toast.error(t('dayplan.deleteDayError'))
       return
     }
-    onDeleted()
+    onDeleted(dayId)
     toast.success(t('dayplan.deleteDaySuccess'))
   }, [deleteDayId, tripId, toast, t, onDeleted])
 
diff --git a/client/src/pages/tripPlanner/useTripPlanner.test.tsx b/client/src/pages/tripPlanner/useTripPlanner.test.tsx
index 5c1168f62..fb745df1c 100644
--- a/client/src/pages/tripPlanner/useTripPlanner.test.tsx
+++ b/client/src/pages/tripPlanner/useTripPlanner.test.tsx
@@ -1,4 +1,4 @@
-// FE-TP-HOOK-001 to FE-TP-HOOK-129
+// FE-TP-HOOK-001 to FE-TP-HOOK-134
 import React from 'react'
 import { renderHook, act, waitFor } from '@testing-library/react'
 import { TranslationProvider } from '../../i18n/TranslationContext'
@@ -11,7 +11,7 @@ import { usePermissionsStore } from '../../store/permissionsStore'
 import { usePluginStore } from '../../store/pluginStore'
 import { useBackgroundTasksStore } from '../../store/backgroundTasksStore'
 import { resetAllStores, seedStore } from '../../../tests/helpers/store'
-import { buildUser, buildTrip, buildDay, buildPlace, buildAssignment, buildReservation } from '../../../tests/helpers/factories'
+import { buildUser, buildTrip, buildDay, buildPlace, buildAssignment, buildReservation, buildBudgetItem } from '../../../tests/helpers/factories'
 import {
   addonsApi, accommodationsApi, authApi, tripsApi, assignmentsApi,
   healthApi, airtrailApi, mapsApi,
@@ -19,7 +19,7 @@ import {
 import { accommodationRepo } from '../../repo/accommodationRepo'
 import { offlineDb } from '../../db/offlineDb'
 import { getCached, fetchPhoto } from '../../services/photoService'
-import type { Place, Reservation, Settings } from '../../types'
+import type { Accommodation, Place, Reservation, Settings } from '../../types'
 
 // ── Router ────────────────────────────────────────────────────────────────────
 // Only useParams/useNavigate/useSearchParams are consumed by the hook, so the
@@ -1207,6 +1207,7 @@ describe('useTripPlanner — place CRUD', () => {
     const place = buildPlace({ id: 1, lat: 1, lng: 2, route_geometry: '[[1,2]]', route_color: '#ff0000' })
     seedTrip({
       places: [place],
+      days: [buildDay({ id: 7, day_number: 1 })],
       assignments: { '7': [buildAssignment({ id: 10, day_id: 7, place, order_index: 2 })] },
     })
 
@@ -1248,6 +1249,7 @@ describe('useTripPlanner — place CRUD', () => {
     const b = buildPlace({ id: 2, lat: 3, lng: 4 })
     seedTrip({
       places: [a, b],
+      days: [buildDay({ id: 7, day_number: 1 })],
       assignments: { '7': [buildAssignment({ id: 10, day_id: 7, place: a, order_index: 0 })] },
     })
 
@@ -1265,6 +1267,30 @@ describe('useTripPlanner — place CRUD', () => {
     expect(actions.assignPlaceToDay).toHaveBeenCalledWith(42, 7, 900, 0)
   })
 
+  it('FE-TP-HOOK-134: bringing a deleted place back skips a day deleted since, and still restores the rest', async () => {
+    const place = buildPlace({ id: 1, lat: 1, lng: 2 })
+    seedTrip({
+      places: [place],
+      days: [buildDay({ id: 7, day_number: 1 }), buildDay({ id: 8, day_number: 2 })],
+      assignments: {
+        '7': [buildAssignment({ id: 10, day_id: 7, place, order_index: 0 })],
+        '8': [buildAssignment({ id: 11, day_id: 8, place, order_index: 3 })],
+      },
+    })
+    const { result } = await renderPlanner()
+    act(() => { result.current.handleDeletePlace(1) })
+    await act(async () => { await result.current.confirmDeletePlace() })
+
+    // Day 7 went in the meantime.
+    act(() => { useTripStore.setState({ days: [buildDay({ id: 8, day_number: 1 })] }) })
+    await act(async () => { await result.current.handleUndo() })
+
+    expect(actions.addPlace).toHaveBeenCalledTimes(1)
+    expect(actions.assignPlaceToDay).toHaveBeenCalledTimes(1)
+    expect(actions.assignPlaceToDay).toHaveBeenCalledWith(42, 8, 900, 3)
+    expect(toasts).toContainEqual(expect.objectContaining({ type: 'info', message: 'Undone: Place deleted' }))
+  })
+
   it('FE-TP-HOOK-059: an explicit id list leaves the queued bulk selection untouched', async () => {
     seedTrip({ places: [buildPlace({ id: 1, lat: 1, lng: 2 })] })
 
@@ -2377,6 +2403,94 @@ describe('useTripPlanner: deleting a day', () => {
     await act(async () => { await result.current.undo() })
     expect(actions.reorderDays).not.toHaveBeenCalled()
   })
+
+  it('FE-TP-HOOK-130: the open panel of the deleted day closes, here and when a fellow traveller deletes it', async () => {
+    seedDays()
+    const { result } = await renderPlanner()
+    const [first, second, third] = useTripStore.getState().days
+
+    act(() => { result.current.setShowDayDetail(second) })
+    expect(result.current.showDayDetail?.id).toBe(2)
+    act(() => { result.current.handleDeleteDay(2) })
+    await act(async () => { await result.current.confirmDeleteDay() })
+    expect(result.current.showDayDetail).toBeNull()
+
+    // A panel on another day stays open through the delete.
+    act(() => { result.current.setShowDayDetail(first) })
+    act(() => { result.current.handleDeleteDay(3) })
+    await act(async () => { await result.current.confirmDeleteDay() })
+    expect(result.current.showDayDetail?.id).toBe(1)
+
+    // Removed by someone else: the day leaves the store, and its panel goes with it.
+    act(() => { result.current.setShowDayDetail(third) })
+    act(() => { useTripStore.setState({ days: [first, second] }) })
+    expect(result.current.showDayDetail).toBeNull()
+  })
+
+  it('FE-TP-HOOK-131: undo steps on the deleted day are dropped, the others stay', async () => {
+    seedDays({ selectedDayId: 1, places: [buildPlace({ id: 70 })] } as Partial<TripStoreState>)
+    const { result } = await renderPlanner()
+
+    await act(async () => { await result.current.handleAssignToDay(70, 1) })
+    await act(async () => { await result.current.handleAssignToDay(70, 2) })
+    expect(result.current.canUndo).toBe(true)
+
+    act(() => { result.current.handleDeleteDay(2) })
+    await act(async () => { await result.current.confirmDeleteDay() })
+
+    // The step on day 2 is gone; the one on day 1 is still the next to undo.
+    actions.removeAssignment.mockClear()
+    await act(async () => { await result.current.handleUndo() })
+    expect(actions.removeAssignment).toHaveBeenCalledTimes(1)
+    expect(actions.removeAssignment).toHaveBeenCalledWith(42, 1, 555)
+    expect(result.current.canUndo).toBe(false)
+  })
+
+  it('FE-TP-HOOK-132: an undo that fails says so instead of claiming it was undone', async () => {
+    seedDays({ selectedDayId: 1, places: [buildPlace({ id: 70 })] } as Partial<TripStoreState>)
+    const { result } = await renderPlanner()
+    await act(async () => { await result.current.handleAssignToDay(70, 1) })
+    const spy = vi.spyOn(console, 'error').mockImplementation(() => {})
+    actions.removeAssignment.mockRejectedValueOnce(new Error('Not found'))
+
+    await act(async () => { await result.current.handleUndo() })
+
+    expect(toasts).toContainEqual(expect.objectContaining({ type: 'error', message: 'Could not undo: Place assigned to day' }))
+    expect(toasts.some(t => t.type === 'info' && t.message.startsWith('Undone'))).toBe(false)
+    spy.mockRestore()
+  })
+
+  it('FE-TP-HOOK-133: the question names the paid stay by its sum, the stay a night shorter and the day that takes the last date', async () => {
+    vi.mocked(accommodationRepo.list).mockResolvedValue({
+      accommodations: [
+        { id: 9, trip_id: 42, start_day_id: 1, end_day_id: 3, place_name: 'Harbour Hotel' },
+        { id: 10, trip_id: 42, start_day_id: 2, end_day_id: 3, place_name: 'Pension Alma' },
+      ] as Accommodation[],
+    })
+    seedDays({
+      days: [
+        buildDay({ id: 1, day_number: 1, date: '2026-06-01', title: null }),
+        buildDay({ id: 2, day_number: 2, date: '2026-06-02', title: null }),
+        buildDay({ id: 3, day_number: 3, date: '2026-06-03', title: null }),
+        buildDay({ id: 4, day_number: 4, date: null, title: null }),
+      ],
+      trip: buildTrip({ id: 42, start_date: '2026-06-01', end_date: '2026-06-03', currency: 'EUR' }),
+      reservations: [buildReservation({ id: 80, day_id: 2, type: 'hotel', title: 'Alma, 1 night', accommodation_id: 10 })],
+      budgetItems: [buildBudgetItem({ reservation_id: 80, total_price: 95, currency: null })],
+    } as Partial<TripStoreState>)
+    const { result } = await renderPlanner()
+    await waitFor(() => expect(result.current.tripAccommodations).toHaveLength(2))
+
+    act(() => { result.current.handleDeleteDay(2) })
+
+    const lines = result.current.deleteDayLines
+    expect(lines.map(l => l.key)).toEqual(['stay-10', 'stay-short-9', 'places', 'shift', 'spare'])
+    expect(lines[0].hint).toContain('together with the booking “Alma, 1 night” and its expense of')
+    expect(lines[0].hint).toContain('95')
+    expect(lines[1].text).toBe('Stay at Harbour Hotel: one night less')
+    expect(lines[1].hint).toMatch(/^It runs across this day and now checks out on .*Jun 2/)
+    expect(lines[4].text).toMatch(/^Day 4 takes the date .*Jun 3/)
+  })
 })
 
 describe('useTripPlanner: adding a day', () => {
diff --git a/client/src/pages/tripPlanner/useTripPlanner.ts b/client/src/pages/tripPlanner/useTripPlanner.ts
index 3e21105e6..5128a747a 100644
--- a/client/src/pages/tripPlanner/useTripPlanner.ts
+++ b/client/src/pages/tripPlanner/useTripPlanner.ts
@@ -122,12 +122,14 @@ export function useTripPlanner() {
   const tripActions = useRef(useTripStore.getState()).current
   const can = useCanDo()
   const canUploadFiles = can('file_upload', trip)
-  const { pushUndo, undo, canUndo, lastActionLabel } = usePlannerHistory()
+  const { pushUndo, undo, forgetDay, canUndo, lastActionLabel } = usePlannerHistory()
 
+  // A step that could not be taken back says so instead of claiming it was.
   const handleUndo = useCallback(async () => {
     const label = lastActionLabel
-    await undo()
-    toast.info(t('undo.done', { action: label ?? '' }))
+    const undone = await undo()
+    if (undone === false) toast.error(t('undo.failed', { action: label ?? '' }))
+    else if (undone) toast.info(t('undo.done', { action: label ?? '' }))
   }, [undo, lastActionLabel, toast])
 
   const [enabledAddons, setEnabledAddons] = useState<Record<string, boolean>>({ packing: true, budget: true, documents: true, collab: false, roadtrip: false, dawarich: false })
@@ -304,7 +306,10 @@ export function useTripPlanner() {
     startResizeLeft, startResizeRight,
   } = useResizablePanels()
   const { selectedPlaceId, selectedAssignmentId, setSelectedPlaceId, selectAssignment } = usePlaceSelection()
-  const [showDayDetail, setShowDayDetail] = useState<Day | null>(null)
+  const [dayDetail, setShowDayDetail] = useState<Day | null>(null)
+  // A day deleted while its panel is open, here or by a fellow traveller, takes
+  // the panel along instead of leaving it on a day that is gone.
+  const showDayDetail = dayDetail && days.some(d => d.id === dayDetail.id) ? dayDetail : null
   const [dayDetailCollapsed, setDayDetailCollapsed] = useState(false)
   const [showPlaceForm, setShowPlaceForm] = useState<boolean>(false)
   const [editingPlace, setEditingPlace] = useState<Place | null>(null)
@@ -2330,8 +2335,9 @@ export function useTripPlanner() {
             route_geometry: capturedPlace.route_geometry,
             route_color: capturedPlace.route_color,
           })
+          const live = new Set(useTripStore.getState().days.map(d => d.id))
           for (const { dayId, orderIndex } of capturedAssignments) {
-            await tripActions.assignPlaceToDay(tripId, dayId, newPlace.id, orderIndex)
+            if (live.has(dayId)) await tripActions.assignPlaceToDay(tripId, dayId, newPlace.id, orderIndex)
           }
         })
       }
@@ -2354,6 +2360,7 @@ export function useTripPlanner() {
       toast.success(t('trip.toast.placesDeleted', { count: capturedPlaces.length }))
       if (capturedPlaces.length > 0) {
         pushUndo(t('undo.deletePlaces'), async () => {
+          const live = new Set(useTripStore.getState().days.map(d => d.id))
           for (const place of capturedPlaces) {
             const newPlace = await tripActions.addPlace(tripId, {
               name: place.name, description: place.description,
@@ -2361,7 +2368,7 @@ export function useTripPlanner() {
               category_id: place.category_id, price: place.price,
               route_geometry: place.route_geometry, route_color: place.route_color,
             })
-            for (const a of capturedAssignments.filter(x => x.placeId === place.id)) {
+            for (const a of capturedAssignments.filter(x => x.placeId === place.id && live.has(x.dayId))) {
               await tripActions.assignPlaceToDay(tripId, a.dayId, newPlace.id, a.orderIndex)
             }
           }
@@ -2414,7 +2421,7 @@ export function useTripPlanner() {
         const capturedTarget = target
         pushUndo(t('undo.assignPlace'), async () => {
           await tripActions.removeAssignment(tripId, capturedTarget, capturedAssignmentId)
-        })
+        }, [capturedTarget])
       }
     } catch (err: unknown) { toast.error(err instanceof Error ? err.message : t('common.unknownError')) }
   }, [selectedDayId, tripId, toast, updateRouteForDay, pushUndo, t, places, storedAssignments, tripAccommodations, roadtripVias, viasAfterInsert])
@@ -2462,7 +2469,7 @@ export function useTripPlanner() {
         const capturedPos = capturedOrderIndex
         pushUndo(t('undo.removeAssignment'), async () => {
           await tripActions.assignPlaceToDay(tripId, capturedDayId, capturedPlaceId, capturedPos)
-        })
+        }, [capturedDayId])
       }
     }
     catch (err: unknown) { toast.error(err instanceof Error ? err.message : t('common.unknownError')) }
@@ -2491,7 +2498,7 @@ export function useTripPlanner() {
           const capturedPrevIds = prevIds
           pushUndo(t('undo.reorder'), async () => {
             await tripActions.reorderAssignments(tripId, capturedDayId, capturedPrevIds)
-          })
+          }, [capturedDayId])
         })
         .catch(err => toast.error(err instanceof Error ? err.message : t('trip.toast.reorderError')))
       updateRouteForDay(dayId)
@@ -2527,11 +2534,14 @@ export function useTripPlanner() {
   })
 
   // A deleted day can take a stay along, and the selected day's route may have
-  // lost its day or its stops.
-  const afterDayDeleted = useCallback(() => {
+  // lost its day or its stops. Its panel closes, and undo steps that would act
+  // on it are dropped rather than left to fail.
+  const afterDayDeleted = useCallback((dayId: number) => {
+    setShowDayDetail(open => (open?.id === dayId ? null : open))
+    forgetDay(dayId)
     loadAccommodations()
     updateRouteForDay(useTripStore.getState().selectedDayId)
-  }, [loadAccommodations, updateRouteForDay])
+  }, [loadAccommodations, updateRouteForDay, forgetDay])
   const dayDelete = useDayDelete({
     tripId, trip, days, places: allPlaces, reservations, accommodations: tripAccommodations,
     canEditDays: can('day_edit', trip), t, locale, toast, onDeleted: afterDayDeleted,
diff --git a/client/src/repo/dayRepo.test.ts b/client/src/repo/dayRepo.test.ts
index d679ad3bc..afcdf0e33 100644
--- a/client/src/repo/dayRepo.test.ts
+++ b/client/src/repo/dayRepo.test.ts
@@ -1,4 +1,4 @@
-// FE-REPO-DAY-001 to FE-REPO-DAY-008
+// FE-REPO-DAY-001 to FE-REPO-DAY-010
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
 import 'fake-indexeddb/auto'
 import { http, HttpResponse } from 'msw'
@@ -72,9 +72,9 @@ describe('dayRepo.remove', () => {
 
     expect(deleted).toBe('/api/trips/5/days/41')
     expect(result.trip).toMatchObject({ id: 5, end_date: '2026-06-02' })
-    expect(await offlineDb.days.get(41)).toBeUndefined()
+    await vi.waitFor(async () => expect(await offlineDb.days.get(41)).toBeUndefined())
     expect(await offlineDb.days.get(42)).toBeDefined()
-    expect(await offlineDb.trips.get(5)).toMatchObject({ end_date: '2026-06-02' })
+    await vi.waitFor(async () => expect(await offlineDb.trips.get(5)).toMatchObject({ end_date: '2026-06-02' }))
   })
 
   it('FE-REPO-DAY-006: offline, refuses without a request and keeps the cached row', async () => {
@@ -87,6 +87,20 @@ describe('dayRepo.remove', () => {
     expect(hit).not.toHaveBeenCalled()
     expect(await offlineDb.days.get(51)).toBeDefined()
   })
+
+  it('FE-REPO-DAY-009: a cache that fails after the server deleted the day does not turn the delete into a failure', async () => {
+    const trip = buildTrip({ id: 5, end_date: '2026-06-02' })
+    server.use(http.delete('/api/trips/5/days/41', () => HttpResponse.json({ success: true, trip })))
+    const cacheDelete = vi.spyOn(offlineDb.days, 'delete').mockRejectedValue(new Error('QuotaExceededError'))
+    const cacheTrip = vi.spyOn(offlineDb.trips, 'put').mockRejectedValue(new Error('QuotaExceededError'))
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    await expect(dayRepo.remove(5, 41)).resolves.toMatchObject({ trip: { id: 5, end_date: '2026-06-02' } })
+    expect(cacheDelete).toHaveBeenCalledWith(41)
+    expect(cacheTrip).toHaveBeenCalled()
+    // Not swallowed: said in the console.
+    await vi.waitFor(() => expect(warn).toHaveBeenCalledTimes(2))
+  })
 })
 
 describe('dayRepo.appendDated', () => {
@@ -103,7 +117,7 @@ describe('dayRepo.appendDated', () => {
 
     expect(body).toEqual({ dated: true })
     expect(result).toMatchObject({ day: { id: 61, date: '2026-06-04' }, trip: { end_date: '2026-06-04' } })
-    expect(await offlineDb.trips.get(5)).toMatchObject({ end_date: '2026-06-04' })
+    await vi.waitFor(async () => expect(await offlineDb.trips.get(5)).toMatchObject({ end_date: '2026-06-04' }))
   })
 
   it('FE-REPO-DAY-008: offline, refuses without a request', async () => {
@@ -114,4 +128,16 @@ describe('dayRepo.appendDated', () => {
     await expect(dayRepo.appendDated(5)).rejects.toThrow('Adding a day needs a connection')
     expect(hit).not.toHaveBeenCalled()
   })
+
+  it('FE-REPO-DAY-010: a cache that fails after the server added the day still hands the day back', async () => {
+    const trip = buildTrip({ id: 5, end_date: '2026-06-04' })
+    const day = buildDay({ id: 61, trip_id: 5, day_number: 4, date: '2026-06-04' })
+    server.use(http.post('/api/trips/5/days', () => HttpResponse.json({ day, trip }, { status: 201 })))
+    const cacheTrip = vi.spyOn(offlineDb.trips, 'put').mockRejectedValue(new Error('DatabaseClosedError'))
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    await expect(dayRepo.appendDated(5)).resolves.toMatchObject({ day: { id: 61 }, trip: { end_date: '2026-06-04' } })
+    expect(cacheTrip).toHaveBeenCalled()
+    await vi.waitFor(() => expect(warn).toHaveBeenCalledWith('Offline cache not updated after adding a day:', expect.any(Error)))
+  })
 })
diff --git a/client/src/repo/dayRepo.ts b/client/src/repo/dayRepo.ts
index 0fe662259..337118675 100644
--- a/client/src/repo/dayRepo.ts
+++ b/client/src/repo/dayRepo.ts
@@ -4,6 +4,11 @@ import { isEffectivelyOffline } from '../sync/networkMode'
 import { onlineThenCache } from './withOfflineFallback'
 import type { Day, Trip } from '../types'
 
+/** A cache write after the server already answered: its failure is logged, not the caller's. */
+function cacheAfterWrite(write: Promise<unknown>, what: string): void {
+  write.catch((err: unknown) => console.warn(`Offline cache not updated after ${what}:`, err))
+}
+
 export const dayRepo = {
   async list(tripId: number | string): Promise<{ days: Day[] }> {
     return onlineThenCache(
@@ -27,12 +32,16 @@ export const dayRepo = {
    * queued offline write could not replay that faithfully. The cached row goes
    * right away, since this tab never hears its own day:deleted, and the trip the
    * server answers with (new day count, maybe a new end date) replaces the cached one.
+   *
+   * The cache is written without waiting, the way the other repos write after an
+   * online call: once the server has deleted the day, a failing IndexedDB (full,
+   * closed, blocked) must not report the delete as failed.
    */
   async remove(tripId: number | string, dayId: number): Promise<{ trip?: Trip }> {
     if (isEffectivelyOffline()) throw new Error('Deleting a day needs a connection')
     const result = await daysApi.delete(tripId, dayId)
-    await offlineDb.days.delete(dayId)
-    if (result.trip) await upsertTrip(result.trip)
+    cacheAfterWrite(offlineDb.days.delete(dayId), 'deleting a day')
+    if (result.trip) cacheAfterWrite(upsertTrip(result.trip), 'deleting a day')
     return { trip: result.trip }
   },
 
@@ -41,13 +50,14 @@ export const dayRepo = {
    * one day. Online only, like remove: the server picks the date and moves the
    * days without one back, and a queued offline write replayed later could land
    * on a date the trip has grown past by then. The trip the server answers with
-   * (new end date, new day count) replaces the cached one; the days are the
-   * caller's to refresh, since the ones behind the new day moved.
+   * (new end date, new day count) replaces the cached one, without waiting, as
+   * in remove; the days are the caller's to refresh, since the ones behind the
+   * new day moved.
    */
   async appendDated(tripId: number | string): Promise<{ day: Day; trip?: Trip }> {
     if (isEffectivelyOffline()) throw new Error('Adding a day needs a connection')
     const result = await daysApi.create(tripId, { dated: true })
-    if (result.trip) await upsertTrip(result.trip)
+    if (result.trip) cacheAfterWrite(upsertTrip(result.trip), 'adding a day')
     return { day: result.day, trip: result.trip }
   },
 }
diff --git a/client/src/store/slices/remoteEventHandler.ts b/client/src/store/slices/remoteEventHandler.ts
index bec79a6af..da9702484 100644
--- a/client/src/store/slices/remoteEventHandler.ts
+++ b/client/src/store/slices/remoteEventHandler.ts
@@ -557,7 +557,10 @@ export function handleRemoteEvent(set: SetState, get: GetState, event: WebSocket
   }
 
   // A deleted day cancels a stay that checked in or out on it, and the stays
-  // live in page-local planner state rather than this store.
+  // live in page-local planner state rather than this store. This rides the
+  // planner's existing accommodations:refresh event on purpose, the legacy
+  // window bus the place image and trip date handlers here use as well.
+  // Retiring it means moving the stays into a store slice, a change of its own.
   if (type === 'day:deleted') window.dispatchEvent(new CustomEvent('accommodations:refresh'))
 
   // A reorder/insert re-pins dates and re-stamps booking times server-side, so
diff --git a/client/src/store/tripStore.ts b/client/src/store/tripStore.ts
index 58dc3d473..c007b1fa8 100644
--- a/client/src/store/tripStore.ts
+++ b/client/src/store/tripStore.ts
@@ -220,7 +220,9 @@ export const useTripStore = create<TripStoreState>((set, get) => ({
       set({ trip: result.trip })
       // New dates rebuild the day rows, and a stay on a day that went is gone
       // with it. Stays live in the planner, not here, so every caller of this
-      // action (the phone's trip dialog too) nudges the planner to reload them.
+      // action (the phone's trip dialog too) nudges the planner to reload them,
+      // through the existing legacy accommodations:refresh window event rather
+      // than a second channel; a store slice for stays would retire both.
       if (before?.start_date !== result.trip?.start_date || before?.end_date !== result.trip?.end_date) {
         window.dispatchEvent(new CustomEvent('accommodations:refresh'))
       }
diff --git a/client/src/utils/dayDeleteImpact.test.ts b/client/src/utils/dayDeleteImpact.test.ts
index 85903aa49..e18473052 100644
--- a/client/src/utils/dayDeleteImpact.test.ts
+++ b/client/src/utils/dayDeleteImpact.test.ts
@@ -1,7 +1,8 @@
-// FE-UTIL-DAYDEL-001 to FE-UTIL-DAYDEL-012
+// FE-UTIL-DAYDEL-001 to FE-UTIL-DAYDEL-016
 import { describe, it, expect } from 'vitest'
-import { buildAssignment, buildDay, buildDayNote, buildPlace, buildReservation } from '../../tests/helpers/factories'
+import { buildAssignment, buildBudgetItem, buildDay, buildDayNote, buildPlace, buildReservation } from '../../tests/helpers/factories'
 import { contentOnDays, dayDeleteImpact, deleteDayBlockedReason, type DayContentData } from './dayDeleteImpact'
+import { formatMoney } from './formatters'
 import type { Accommodation, Day } from '../types'
 
 const stay = (overrides: Partial<Accommodation>): Accommodation =>
@@ -79,9 +80,10 @@ describe('contentOnDays', () => {
       reservations: [buildReservation({ id: 30, title: 'Harbour Hotel, 1 night', accommodation_id: 1 })],
     }
     expect(contentOnDays([buildDay({ id: 7 })], data).stays).toEqual([
-      { id: 1, name: 'Harbour Hotel', booking: 'Harbour Hotel, 1 night' },
-      { id: 2, name: 'Pension Alma', booking: 'Alma, two nights' },
-      { id: 3, name: '', booking: null },
+      // Expenses not read: a linked booking may carry one, so the warning says it may.
+      { id: 1, name: 'Harbour Hotel', booking: 'Harbour Hotel, 1 night', moreBookings: 0, expense: { amount: null } },
+      { id: 2, name: 'Pension Alma', booking: 'Alma, two nights', moreBookings: 0, expense: null },
+      { id: 3, name: '', booking: null, moreBookings: 0, expense: null },
     ])
   })
 })
@@ -101,6 +103,47 @@ describe('dayDeleteImpact', () => {
     expect(dayDeleteImpact(days[1], days, data, range)).toMatchObject({ shiftedDays: 1, shiftedBookings: 2, newEndDate: null, isLastDay: false })
   })
 
+  it('FE-UTIL-DAYDEL-013: the first day without a date takes over the last date, and the question names it', () => {
+    const days = datedDays(true)
+    // A middle day goes: day 3 moves up to 2 June, the spare day takes 3 June.
+    expect(dayDeleteImpact(days[1], days, empty(), range)).toMatchObject({
+      shiftedDays: 1,
+      datedSpare: { day: expect.objectContaining({ id: 4 }), index: 3, date: '2026-06-03' },
+      newEndDate: null,
+    })
+    // The last dated day goes: nothing dated moves, the spare day still takes its date.
+    expect(dayDeleteImpact(days[2], days, empty(), range)).toMatchObject({ shiftedDays: 0, datedSpare: { index: 3, date: '2026-06-03' } })
+    // The spare day itself goes, or there is none: no day gets a date.
+    expect(dayDeleteImpact(days[3], days, empty(), range).datedSpare).toBeNull()
+    expect(dayDeleteImpact(datedDays()[1], datedDays(), empty(), range).datedSpare).toBeNull()
+    // Only the first of two spare days is dated.
+    const two = [...days, buildDay({ id: 5, day_number: 5, date: null })]
+    expect(dayDeleteImpact(two[0], two, empty(), range).datedSpare).toMatchObject({ day: { id: 4 }, date: '2026-06-03' })
+  })
+
+  it('FE-UTIL-DAYDEL-014: a stay that only runs across the day keeps standing, one night shorter', () => {
+    const days = datedDays(true)
+    const data: DayContentData = {
+      ...empty(),
+      accommodations: [
+        stay({ id: 9, start_day_id: 1, end_day_id: 3, place_name: 'Harbour Hotel' }),
+        stay({ id: 10, start_day_id: 2, end_day_id: 3, place_name: 'Pension Alma' }),
+        stay({ id: 11, start_day_id: 1, end_day_id: 2, place_name: 'Dune Lodge' }),
+      ],
+    }
+    const impact = dayDeleteImpact(days[1], days, data, range)
+    // Its check-out day moves up to the deleted day's slot, and takes 2 June.
+    expect(impact.shortenedStays).toEqual([{ id: 9, name: 'Harbour Hotel', checkOut: '2026-06-02' }])
+    // The stays checking in or out on the day are cancelled instead.
+    expect(impact.stays.map(s => s.id)).toEqual([10, 11])
+
+    // On a trip without dates the stay still ends a day earlier, without a date to name.
+    const undated = [1, 2, 3].map(n => buildDay({ id: n, day_number: n, date: null }))
+    expect(dayDeleteImpact(undated[1], undated, data, null).shortenedStays).toEqual([{ id: 9, name: 'Harbour Hotel', checkOut: null }])
+    // A day outside the stay leaves it alone.
+    expect(dayDeleteImpact(days[3], days, data, range).shortenedStays).toEqual([])
+  })
+
   it('FE-UTIL-DAYDEL-007: with no spare day the last date goes, and a dated trip ends on the one before', () => {
     const days = datedDays()
     expect(dayDeleteImpact(days[0], days, empty(), range)).toMatchObject({ shiftedDays: 2, newEndDate: '2026-06-02' })
@@ -123,6 +166,44 @@ describe('dayDeleteImpact', () => {
   })
 })
 
+describe('contentOnDays: what a cancelled stay costs', () => {
+  const hotelStay = (): DayContentData => ({
+    ...empty(),
+    accommodations: [stay({ id: 9, start_day_id: 7, end_day_id: 8, place_name: 'Harbour Hotel' })],
+    reservations: [buildReservation({ id: 40, day_id: 7, type: 'hotel', title: 'Harbour, 1 night', accommodation_id: 9 })],
+  })
+
+  it('FE-UTIL-DAYDEL-015: the expense on the stay booking is named with its sum, in the trip currency when it has none', () => {
+    const budget = {
+      items: [
+        buildBudgetItem({ id: 1, reservation_id: 40, total_price: 180, currency: null }),
+        buildBudgetItem({ id: 2, reservation_id: 40, total_price: 20, currency: 'EUR' }),
+        buildBudgetItem({ id: 3, reservation_id: 41, total_price: 999 }),
+      ],
+      currency: 'EUR',
+      locale: 'en',
+    }
+    const [paid] = contentOnDays([buildDay({ id: 7 })], { ...hotelStay(), budget }).stays
+    // 180 without a currency of its own is in the trip currency, so it adds up with the 20 EUR.
+    expect(paid.expense?.amount).toBe(formatMoney(200, 'EUR', 'en'))
+
+    // Read, and none on the booking: there is no expense to lose.
+    expect(contentOnDays([buildDay({ id: 7 })], { ...hotelStay(), budget: { ...budget, items: [budget.items[2]] } }).stays[0].expense).toBeNull()
+    // Read without a currency to name the sum in: there is one, sum unknown.
+    expect(contentOnDays([buildDay({ id: 7 })], { ...hotelStay(), budget: { items: budget.items } }).stays[0].expense).toEqual({ amount: null })
+    // An expense of nothing names no sum either.
+    const free = { ...budget, items: [buildBudgetItem({ reservation_id: 40, total_price: 0 })] }
+    expect(contentOnDays([buildDay({ id: 7 })], { ...hotelStay(), budget: free }).stays[0].expense).toEqual({ amount: null })
+  })
+
+  it('FE-UTIL-DAYDEL-016: every booking linked to the stay goes, the first by name and the rest counted', () => {
+    const data = hotelStay()
+    data.reservations.push(buildReservation({ id: 41, day_id: 7, type: 'hotel', title: 'Harbour, breakfast', accommodation_id: '9' }))
+    const [cancelled] = contentOnDays([buildDay({ id: 7 })], { ...data, budget: { items: [], currency: 'EUR', locale: 'en' } }).stays
+    expect(cancelled).toEqual({ id: 9, name: 'Harbour Hotel', booking: 'Harbour, 1 night', moreBookings: 1, expense: null })
+  })
+})
+
 describe('contentOnDays over several days (the shrink warning)', () => {
   it('FE-UTIL-DAYDEL-009: counts across all the days at once', () => {
     const data = {
@@ -141,7 +222,7 @@ describe('contentOnDays over several days (the shrink warning)', () => {
   it('FE-UTIL-DAYDEL-010: a stay from one of the days to another counts once', () => {
     const data = { ...empty(), accommodations: [stay({ id: 9, start_day_id: 7, end_day_id: 8, place_name: 'Harbour Hotel' })] }
     expect(contentOnDays([buildDay({ id: 7 }), buildDay({ id: 8 })], data).stays).toEqual([
-      { id: 9, name: 'Harbour Hotel', booking: null },
+      { id: 9, name: 'Harbour Hotel', booking: null, moreBookings: 0, expense: null },
     ])
   })
 
diff --git a/client/src/utils/dayDeleteImpact.ts b/client/src/utils/dayDeleteImpact.ts
index 793c1f7b4..e14f98f88 100644
--- a/client/src/utils/dayDeleteImpact.ts
+++ b/client/src/utils/dayDeleteImpact.ts
@@ -1,4 +1,16 @@
-import type { Accommodation, AssignmentsMap, Day, DayNotesMap, Place, Reservation, Trip } from '../types'
+import { formatMoneySum } from './formatters'
+import type { Accommodation, AssignmentsMap, BudgetItem, Day, DayNotesMap, Place, Reservation, Trip } from '../types'
+
+/**
+ * The trip's expenses, for what the booking of a stay has cost. With a currency
+ * and a locale the amount is named; without them only whether there is one.
+ */
+export interface DayContentBudget {
+  items: BudgetItem[]
+  /** The trip currency, which an expense without a currency of its own is in. */
+  currency?: string
+  locale?: string
+}
 
 /** What the trip holds on its days, as the store and the planner have it. */
 export interface DayContentData {
@@ -7,6 +19,8 @@ export interface DayContentData {
   reservations: Reservation[]
   accommodations: Accommodation[]
   places?: Place[]
+  /** Left out when the expenses could not be read. */
+  budget?: DayContentBudget
 }
 
 /** A stay that goes with the days: checked in or out on one of them. */
@@ -15,6 +29,29 @@ export interface StayImpact {
   name: string
   /** Title of the booking that goes with it, or null when none is linked. */
   booking: string | null
+  /** Further bookings linked to the same stay. The server takes all of them along. */
+  moreBookings: number
+  /**
+   * The expense written against those bookings, or null when there is none.
+   * Its amount is null when the expenses were not read or name no sum.
+   */
+  expense: { amount: string | null } | null
+}
+
+/** A stay that only runs across the deleted day: it stays, one night shorter. */
+export interface ShortenedStay {
+  id: number
+  name: string
+  /** The date its check-out day takes, or null on a day without a date. */
+  checkOut: string | null
+}
+
+/** The first day without a date, which takes over the last date of the trip. */
+export interface DatedSpare {
+  day: Day
+  /** Its place in the day list now, for "Day n". */
+  index: number
+  date: string
 }
 
 /** What sits on a set of days and would go with them. */
@@ -37,6 +74,10 @@ export interface DayDeleteImpact extends DayContent {
   shiftedBookings: number
   /** The trip's new last date when the delete takes the last date along. */
   newEndDate: string | null
+  /** Stays that run across the day, which keep standing with one night less. */
+  shortenedStays: ShortenedStay[]
+  /** The day without a date that gets one, when a dated day goes. */
+  datedSpare: DatedSpare | null
   isLastDay: boolean
 }
 
@@ -45,6 +86,31 @@ const byNumber = (a: Day, b: Day): number => (a.day_number ?? 0) - (b.day_number
 /** A reservation's link to a stay, which the wire carries as a number or a string. */
 const stayOf = (r: Reservation): number | null => (r.accommodation_id == null ? null : Number(r.accommodation_id))
 
+/** The bookings linked to a stay, its first booking title, and the name the list gives it. */
+function describeStay(stay: Accommodation, data: DayContentData) {
+  const linked = data.reservations.filter(r => stayOf(r) === stay.id)
+  const booking = linked[0]?.title ?? stay.reservation_title ?? null
+  const name = stay.place_name ?? data.places?.find(p => p.id === stay.place_id)?.name ?? booking ?? ''
+  return { linked, booking, name }
+}
+
+/**
+ * What the bookings of a cancelled stay have cost: the expenses the server
+ * deletes with them (budget_items.reservation_id). Unread expenses count as one
+ * without a sum, so the warning says too much rather than too little.
+ */
+function stayExpense(linked: Reservation[], budget: DayContentBudget | undefined): StayImpact['expense'] {
+  if (linked.length === 0) return null
+  if (!budget) return { amount: null }
+  const ids = new Set(linked.map(r => r.id))
+  const items = budget.items.filter(item => item.reservation_id != null && ids.has(item.reservation_id))
+  if (items.length === 0) return null
+  if (!budget.currency || !budget.locale) return { amount: null }
+  const base = budget.currency
+  const entries = items.map(item => ({ amount: item.total_price, currency: item.currency || base }))
+  return { amount: formatMoneySum(entries, base, budget.locale) }
+}
+
 /**
  * Count what sits on the given days, the way the server treats it when they go.
  *
@@ -79,9 +145,8 @@ export function contentOnDays(days: Pick<Day, 'id' | 'title' | 'notes'>[], data:
     texts,
     bookings,
     stays: stays.map(stay => {
-      const booking = data.reservations.find(r => stayOf(r) === stay.id)?.title ?? stay.reservation_title ?? null
-      const name = stay.place_name ?? data.places?.find(p => p.id === stay.place_id)?.name ?? booking ?? ''
-      return { id: stay.id, name, booking }
+      const { linked, booking, name } = describeStay(stay, data)
+      return { id: stay.id, name, booking, moreBookings: Math.max(0, linked.length - 1), expense: stayExpense(linked, data.budget) }
     }),
   }
 }
@@ -89,9 +154,10 @@ export function contentOnDays(days: Pick<Day, 'id' | 'title' | 'notes'>[], data:
 /**
  * What deleting one day does, as the server will do it (DayRemovalService): the
  * dates stay on their positions, so every later dated day takes the date one slot
- * earlier and the bookings on it are re-stamped along. When no day without a date
- * is left to take the last date, the last date goes and a dated trip ends a day
- * earlier.
+ * earlier and the bookings on it are re-stamped along, and the first day without
+ * a date takes the last date. When no day without a date is left to take it, the
+ * last date goes and a dated trip ends a day earlier. A stay that only runs
+ * across the day keeps standing; its check-out day moves up, so it loses a night.
  */
 export function dayDeleteImpact(
   day: Day,
@@ -101,14 +167,19 @@ export function dayDeleteImpact(
 ): DayDeleteImpact {
   const content = contentOnDays([day], data)
   const ordered = [...days].sort(byNumber)
+  const position = new Map(ordered.map((d, i) => [d.id, i]))
+  const at = position.get(day.id) ?? -1
   const remaining = ordered.filter(d => d.id !== day.id)
   const dates = ordered.map(d => d.date).filter((d): d is string => !!d).sort()
 
   const moved = new Set<number>()
-  remaining.forEach((d, i) => {
+  let datedSpare: DatedSpare | null = null
+  for (const [i, d] of remaining.entries()) {
     const next = dates[i]
-    if (d.date && next && next !== d.date) moved.add(d.id)
-  })
+    if (!next || next === d.date) continue
+    if (d.date) moved.add(d.id)
+    else datedSpare ??= { day: d, index: position.get(d.id) ?? i, date: next }
+  }
   const cancelled = new Set(content.stays.map(stay => stay.id))
   const shiftedBookings = data.reservations.filter(r => {
     if (cancelled.has(stayOf(r) ?? -1)) return false
@@ -117,10 +188,26 @@ export function dayDeleteImpact(
     return start || end
   }).length
 
+  const shortenedStays = data.accommodations.flatMap((stay): ShortenedStay[] => {
+    const from = position.get(stay.start_day_id)
+    const to = position.get(stay.end_day_id)
+    if (cancelled.has(stay.id) || from === undefined || to === undefined || from >= at || to <= at) return []
+    // The check-out day moves up one place and takes the date of that place.
+    return [{ id: stay.id, name: describeStay(stay, data).name, checkOut: dates[to - 1] ?? null }]
+  })
+
   const dropsDate = remaining.length < dates.length
   const newEndDate = dropsDate && trip?.start_date && trip.end_date ? (dates[remaining.length - 1] ?? null) : null
 
-  return { ...content, shiftedDays: moved.size, shiftedBookings, newEndDate, isLastDay: days.length <= 1 }
+  return {
+    ...content,
+    shiftedDays: moved.size,
+    shiftedBookings,
+    newEndDate,
+    shortenedStays,
+    datedSpare,
+    isLastDay: days.length <= 1,
+  }
 }
 
 /**
diff --git a/client/src/utils/dayImpactLines.test.ts b/client/src/utils/dayImpactLines.test.ts
index 2d706fd4b..be8e8272f 100644
--- a/client/src/utils/dayImpactLines.test.ts
+++ b/client/src/utils/dayImpactLines.test.ts
@@ -1,23 +1,27 @@
-// FE-UTIL-DAYLINES-001 to FE-UTIL-DAYLINES-008
+// FE-UTIL-DAYLINES-001 to FE-UTIL-DAYLINES-010
 import { describe, it, expect } from 'vitest'
-import { BedDouble, CalendarCheck, CalendarClock } from 'lucide-react'
+import { BedDouble, BedSingle, CalendarCheck, CalendarClock, CalendarPlus } from 'lucide-react'
 import { dayChips, deleteDayLines, impactLines, shrinkTripLines } from './dayImpactLines'
-import type { DayDeleteImpact } from './dayDeleteImpact'
+import type { DayDeleteImpact, StayImpact } from './dayDeleteImpact'
 import type { TripRangeImpact } from './tripRangeImpact'
+import { buildDay } from '../../tests/helpers/factories'
 
 const t = (key: string, params?: Record<string, string | number>) =>
   params ? `${key}(${Object.entries(params).map(([k, v]) => `${k}=${v}`).join(',')})` : key
 
 const nothing: DayDeleteImpact = {
   places: 0, notes: 0, texts: 0, bookings: 0, stays: [],
-  shiftedDays: 0, shiftedBookings: 0, newEndDate: null, isLastDay: false,
+  shiftedDays: 0, shiftedBookings: 0, newEndDate: null, shortenedStays: [], datedSpare: null, isLastDay: false,
 }
 
+const stayOf = (overrides: Partial<StayImpact>): StayImpact =>
+  ({ id: 9, name: 'Harbour Hotel', booking: null, moreBookings: 0, expense: null, ...overrides })
+
 describe('impactLines', () => {
   it('FE-UTIL-DAYLINES-001: stays come first in the danger tone, then every kind that has something in it', () => {
     const lines = impactLines({
       places: 3, notes: 2, texts: 1, bookings: 4,
-      stays: [{ id: 9, name: 'Harbour Hotel', booking: 'HH 1 night' }, { id: 10, name: 'Pension Alma', booking: null }],
+      stays: [stayOf({ booking: 'HH 1 night', expense: { amount: null } }), stayOf({ id: 10, name: 'Pension Alma' })],
     }, t, 'deleteDay')
 
     expect(lines.map(l => [l.key, l.tone, l.text, l.hint])).toEqual([
@@ -54,6 +58,32 @@ describe('deleteDayLines', () => {
     const lines = deleteDayLines(nothing, t, formatDate)
     expect(lines).toEqual([{ key: 'empty', icon: CalendarCheck, tone: 'muted', text: 'dayplan.deleteDayEmpty' }])
   })
+
+  it('FE-UTIL-DAYLINES-010: a stay a night shorter follows the cancelled ones, the day taking the last date follows the shift', () => {
+    const spareDay = buildDay({ id: 4, title: null, date: null })
+    const lines = deleteDayLines({
+      ...nothing,
+      notes: 1,
+      stays: [stayOf({ id: 10, name: 'Pension Alma' })],
+      shortenedStays: [{ id: 9, name: 'Harbour Hotel', checkOut: '2026-06-02' }, { id: 11, name: 'Dune Lodge', checkOut: null }],
+      shiftedDays: 1,
+      datedSpare: { day: spareDay, index: 3, date: '2026-06-03' },
+    }, t, formatDate, (day, index) => `name(${day.id},${index})`)
+
+    expect(lines.map(l => [l.key, l.tone, l.text, l.hint])).toEqual([
+      ['stay-10', 'danger', 'dayplan.impactStay(name=Pension Alma)', 'dayplan.deleteDayStayHint'],
+      ['stay-short-9', 'warning', 'dayplan.impactStayShorter(name=Harbour Hotel)', 'dayplan.deleteDayStayShorterHint(date=<2026-06-02>)'],
+      ['stay-short-11', 'warning', 'dayplan.impactStayShorter(name=Dune Lodge)', 'dayplan.deleteDayStayShorterUndatedHint'],
+      ['notes', 'neutral', 'dayplan.impactNotes(count=1)', 'dayplan.impactDeletedHint'],
+      ['shift', 'warning', 'dayplan.deleteDayShift(count=1)', 'dayplan.deleteDayShiftHint'],
+      ['spare', 'warning', 'dayplan.deleteDaySpareDated(day=name(4,3),date=<2026-06-03>)', 'dayplan.deleteDaySpareDatedHint'],
+    ])
+    expect(lines[1].icon).toBe(BedSingle)
+    expect(lines[5].icon).toBe(CalendarPlus)
+    // Without a way to name days, a day is "Day n" by its place in the list.
+    const plain = deleteDayLines({ ...nothing, datedSpare: { day: spareDay, index: 3, date: '2026-06-03' } }, t, formatDate)
+    expect(plain[0].text).toBe('dayplan.deleteDaySpareDated(day=dayplan.dayN(n=4),date=<2026-06-03>)')
+  })
 })
 
 describe('shrinkTripLines', () => {
@@ -64,7 +94,7 @@ describe('shrinkTripLines', () => {
   })
 
   it('FE-UTIL-DAYLINES-005: the same rows, with the shortening hints: a removed stay leaves its booking behind', () => {
-    const lines = shrinkTripLines(shrink({ places: 2, stays: [{ id: 9, name: 'Harbour Hotel', booking: 'HH' }, { id: 10, name: 'Alma', booking: null }] }), t)
+    const lines = shrinkTripLines(shrink({ places: 2, stays: [stayOf({ booking: 'HH', expense: { amount: null } }), stayOf({ id: 10, name: 'Alma' })] }), t)
     expect(lines.map(l => [l.key, l.tone, l.hint])).toEqual([
       ['stay-9', 'danger', 'dashboard.shrinkStayBookedHint(booking=HH)'],
       ['stay-10', 'danger', 'dashboard.shrinkStayHint'],
@@ -93,6 +123,21 @@ describe('shrinkTripLines', () => {
     expect(shrinkTripLines(shrink({ notes: 1 }), t).map(l => l.key)).toEqual(['notes'])
   })
 
+  it('FE-UTIL-DAYLINES-009: a stay hint says what goes with the stay: its bookings, and the sum only where the expense is lost', () => {
+    const hint = (stay: Partial<StayImpact>, variant: 'deleteDay' | 'shrinkTrip') =>
+      impactLines({ places: 0, notes: 0, texts: 0, bookings: 0, stays: [stayOf(stay)] }, t, variant)[0].hint
+
+    expect(hint({ booking: 'HH' }, 'deleteDay')).toBe('dayplan.deleteDayStayBookingHint(booking=HH)')
+    expect(hint({ booking: 'HH', expense: { amount: null } }, 'deleteDay')).toBe('dayplan.deleteDayStayBookedHint(booking=HH)')
+    expect(hint({ booking: 'HH', expense: { amount: '€200.00' } }, 'deleteDay')).toBe('dayplan.deleteDayStayPaidHint(booking=HH,amount=€200.00)')
+    expect(hint({ booking: 'HH', moreBookings: 2 }, 'deleteDay')).toBe('dayplan.deleteDayStayBookingHint(booking=HH dashboard.shrinkMoreDays(count=2))')
+
+    // Shortening leaves the expense in place: said when there is one, never by its sum.
+    expect(hint({ booking: 'HH' }, 'shrinkTrip')).toBe('dashboard.shrinkStayBookingHint(booking=HH)')
+    expect(hint({ booking: 'HH', expense: { amount: '€200.00' } }, 'shrinkTrip')).toBe('dashboard.shrinkStayBookedHint(booking=HH)')
+    expect(hint({}, 'shrinkTrip')).toBe('dashboard.shrinkStayHint')
+  })
+
   it('FE-UTIL-DAYLINES-008: day chips name six days and sum up the rest', () => {
     const labels = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun', 'Day 8']
     expect(dayChips(labels.slice(0, 6), t)).toEqual(labels.slice(0, 6))
diff --git a/client/src/utils/dayImpactLines.ts b/client/src/utils/dayImpactLines.ts
index 92725bb3d..4625188ea 100644
--- a/client/src/utils/dayImpactLines.ts
+++ b/client/src/utils/dayImpactLines.ts
@@ -1,6 +1,7 @@
-import { BedDouble, CalendarCheck, CalendarClock, CalendarMinus, MapPin, StickyNote, Ticket, Type } from 'lucide-react'
+import { BedDouble, BedSingle, CalendarCheck, CalendarClock, CalendarMinus, CalendarPlus, MapPin, StickyNote, Ticket, Type } from 'lucide-react'
 import type { LucideIcon } from 'lucide-react'
-import type { DayContent, DayDeleteImpact } from './dayDeleteImpact'
+import type { Day } from '../types'
+import type { DayContent, DayDeleteImpact, StayImpact } from './dayDeleteImpact'
 import type { TripRangeImpact } from './tripRangeImpact'
 
 type Translate = (key: string, params?: Record<string, string | number>) => string
@@ -32,19 +33,50 @@ export type ImpactVariant = 'deleteDay' | 'shrinkTrip'
 /** How bookings follow new dates, as the trip dialog lets the traveller choose. */
 export type ShiftMode = 'keep_bookings' | 'shift_all'
 
-const HINTS: Record<ImpactVariant, { bookings: string; stay: string; stayBooked: string }> = {
+interface StayHints {
+  bookings: string
+  /** A stay without a booking. */
+  stay: string
+  /** A stay with a booking and no expense on it. */
+  stayBooking: string
+  /** A stay with a booking and an expense whose sum is not known. */
+  stayBooked: string
+  /** A stay with a booking and an expense, sum named. Only where the expense is lost. */
+  stayPaid?: string
+}
+
+const HINTS: Record<ImpactVariant, StayHints> = {
   deleteDay: {
     bookings: 'dayplan.deleteDayBookingsHint',
     stay: 'dayplan.deleteDayStayHint',
+    stayBooking: 'dayplan.deleteDayStayBookingHint',
     stayBooked: 'dayplan.deleteDayStayBookedHint',
+    stayPaid: 'dayplan.deleteDayStayPaidHint',
   },
+  // A shortened trip leaves the booking and its expense where they are, so the
+  // sum is no loss worth naming.
   shrinkTrip: {
     bookings: 'dashboard.shrinkBookingsHint',
     stay: 'dashboard.shrinkStayHint',
+    stayBooking: 'dashboard.shrinkStayBookingHint',
     stayBooked: 'dashboard.shrinkStayBookedHint',
   },
 }
 
+/**
+ * What goes with a stay: its booking by name, with the count of any further
+ * ones, and the expense, by its sum where the variant loses it.
+ */
+function stayHint(stay: StayImpact, hints: StayHints, t: Translate): string {
+  if (!stay.booking) return t(hints.stay)
+  const booking = stay.moreBookings > 0
+    ? `${stay.booking} ${t('dashboard.shrinkMoreDays', { count: stay.moreBookings })}`
+    : stay.booking
+  if (!stay.expense) return t(hints.stayBooking, { booking })
+  if (stay.expense.amount && hints.stayPaid) return t(hints.stayPaid, { booking, amount: stay.expense.amount })
+  return t(hints.stayBooked, { booking })
+}
+
 /**
  * The rows for what sits on the days that go: stays first, because they cost
  * money, then places, notes, day texts and bookings. Kinds with nothing in them
@@ -66,7 +98,7 @@ export function impactLines(
     icon: BedDouble,
     tone: 'danger',
     text: t('dayplan.impactStay', { name: stay.name }),
-    hint: stay.booking ? t(hints.stayBooked, { booking: stay.booking }) : t(hints.stay),
+    hint: stayHint(stay, hints, t),
   }))
   if (content.places > 0) {
     lines.push({ key: 'places', icon: MapPin, tone: 'neutral', text: t('dayplan.impactPlaces', { count: content.places }), hint: t('dayplan.impactPlacesHint') })
@@ -84,11 +116,28 @@ export function impactLines(
 }
 
 /**
- * The full list for the delete question: the content rows, then what happens to
- * the dates, and a single quiet row for a day with nothing on it.
+ * The full list for the delete question: the cancelled stays, then the ones that
+ * lose a night, the rest of the content, then what happens to the dates, and a
+ * single quiet row for a day with nothing on it. `dayName` names a day the way
+ * the day list beside the question does; without it a day is "Day n".
  */
-export function deleteDayLines(impact: DayDeleteImpact, t: Translate, formatDate: (iso: string) => string): ImpactLine[] {
+export function deleteDayLines(
+  impact: DayDeleteImpact,
+  t: Translate,
+  formatDate: (iso: string) => string,
+  dayName: (day: Day, index: number) => string = (_, index) => t('dayplan.dayN', { n: index + 1 }),
+): ImpactLine[] {
   const lines = impactLines(impact, t, 'deleteDay')
+  // Right behind the cancelled stays: a stay is kept, but a night of it is gone.
+  lines.splice(impact.stays.length, 0, ...impact.shortenedStays.map((stay): ImpactLine => ({
+    key: `stay-short-${stay.id}`,
+    icon: BedSingle,
+    tone: 'warning',
+    text: t('dayplan.impactStayShorter', { name: stay.name }),
+    hint: stay.checkOut
+      ? t('dayplan.deleteDayStayShorterHint', { date: formatDate(stay.checkOut) })
+      : t('dayplan.deleteDayStayShorterUndatedHint'),
+  })))
   if (impact.shiftedDays > 0) {
     lines.push({
       key: 'shift',
@@ -100,6 +149,16 @@ export function deleteDayLines(impact: DayDeleteImpact, t: Translate, formatDate
         : t('dayplan.deleteDayShiftHint'),
     })
   }
+  if (impact.datedSpare) {
+    const { day, index, date } = impact.datedSpare
+    lines.push({
+      key: 'spare',
+      icon: CalendarPlus,
+      tone: 'warning',
+      text: t('dayplan.deleteDaySpareDated', { day: dayName(day, index), date: formatDate(date) }),
+      hint: t('dayplan.deleteDaySpareDatedHint'),
+    })
+  }
   if (impact.newEndDate) {
     lines.push({
       key: 'shrink',
diff --git a/client/src/utils/tripRangeImpact.test.ts b/client/src/utils/tripRangeImpact.test.ts
index 858c6801a..1bf48ff81 100644
--- a/client/src/utils/tripRangeImpact.test.ts
+++ b/client/src/utils/tripRangeImpact.test.ts
@@ -99,7 +99,8 @@ describe('tripRangeImpact', () => {
       buildReservation({ id: 41, day_id: 10, title: 'Ferry' }),
     ]
     const impact = impactFor('2026-10-01', '2026-10-08', { startMoved: false }, days, data)
-    expect(impact.content.stays).toEqual([{ id: 5, name: 'Harbour Hotel', booking: 'Harbour, 2 nights' }])
+    // No expenses handed in: the booking may carry one, which the list then says.
+    expect(impact.content.stays).toEqual([{ id: 5, name: 'Harbour Hotel', booking: 'Harbour, 2 nights', moreBookings: 0, expense: { amount: null } }])
     expect(impact.content.bookings).toBe(1)
   })
 
diff --git a/client/tests/unit/hooks/usePlannerHistory.test.ts b/client/tests/unit/hooks/usePlannerHistory.test.ts
index 9fb0d31d1..f63b9f8cd 100644
--- a/client/tests/unit/hooks/usePlannerHistory.test.ts
+++ b/client/tests/unit/hooks/usePlannerHistory.test.ts
@@ -89,4 +89,45 @@ describe('usePlannerHistory', () => {
     expect(result.current.canUndo).toBe(false);
     expect(result.current.lastActionLabel).toBeNull();
   });
+
+  it('FE-HOOK-HIST-009: undo tells whether the step went through, failed, or there was none', async () => {
+    const { result } = renderHook(() => usePlannerHistory());
+    const spy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    act(() => {
+      result.current.pushUndo('Works', vi.fn());
+      result.current.pushUndo('Fails', vi.fn().mockRejectedValue(new Error('Not found')));
+    });
+    let outcome: boolean | null = null;
+    await act(async () => { outcome = await result.current.undo(); });
+    expect(outcome).toBe(false);
+    await act(async () => { outcome = await result.current.undo(); });
+    expect(outcome).toBe(true);
+    await act(async () => { outcome = await result.current.undo(); });
+    expect(outcome).toBeNull();
+    spy.mockRestore();
+  });
+
+  it('FE-HOOK-HIST-010: forgetting a day drops the steps tagged with it and keeps the rest in order', async () => {
+    const { result } = renderHook(() => usePlannerHistory());
+    const untagged = vi.fn();
+    const otherDay = vi.fn();
+    act(() => {
+      result.current.pushUndo('Untagged', untagged);
+      result.current.pushUndo('Day 3', otherDay, [3]);
+      result.current.pushUndo('Day 2', vi.fn(), [2]);
+      result.current.pushUndo('Move 2 to 3', vi.fn(), [3, 2]);
+    });
+    act(() => { result.current.forgetDay(2); });
+    expect(result.current.lastActionLabel).toBe('Day 3');
+
+    // A day no step is tagged with changes nothing.
+    act(() => { result.current.forgetDay(99); });
+    expect(result.current.lastActionLabel).toBe('Day 3');
+
+    await act(async () => { await result.current.undo(); });
+    expect(otherDay).toHaveBeenCalledOnce();
+    await act(async () => { await result.current.undo(); });
+    expect(untagged).toHaveBeenCalledOnce();
+    expect(result.current.canUndo).toBe(false);
+  });
 });
diff --git a/client/tests/unit/mobile/MSheet.test.tsx b/client/tests/unit/mobile/MSheet.test.tsx
index 4c22d4704..27bae8295 100644
--- a/client/tests/unit/mobile/MSheet.test.tsx
+++ b/client/tests/unit/mobile/MSheet.test.tsx
@@ -249,4 +249,47 @@ describe('MSheet', () => {
     );
     expect(document.body.style.overflow).toBe('');
   });
+
+  it('FE-MOB-SHEET-016: Escape closes only the sheet on top, the one under it on the next press', () => {
+    const onCloseBase = vi.fn();
+    const onCloseTop = vi.fn();
+    const { rerender } = render(
+      <>
+        <MSheet open onClose={onCloseBase} ariaLabel="Trip"><span>Trip form</span></MSheet>
+        <MSheet open onClose={onCloseTop} ariaLabel="Remove days?"><span>Question</span></MSheet>
+      </>,
+    );
+
+    fireEvent.keyDown(document, { key: 'Escape' });
+    expect(onCloseTop).toHaveBeenCalledTimes(1);
+    expect(onCloseBase).not.toHaveBeenCalled();
+
+    rerender(
+      <>
+        <MSheet open onClose={onCloseBase} ariaLabel="Trip"><span>Trip form</span></MSheet>
+        <MSheet open={false} onClose={onCloseTop} ariaLabel="Remove days?"><span>Question</span></MSheet>
+      </>,
+    );
+    fireEvent.keyDown(document, { key: 'Escape' });
+    expect(onCloseBase).toHaveBeenCalledTimes(1);
+    expect(onCloseTop).toHaveBeenCalledTimes(1);
+  });
+
+  it('FE-MOB-SHEET-017: a sheet re-rendered with a fresh onClose stays under the one opened after it', () => {
+    const onCloseTop = vi.fn();
+    const baseCalls: number[] = [];
+    const renderBoth = (round: number) => (
+      <>
+        <MSheet open onClose={() => baseCalls.push(round)} ariaLabel="Trip"><span>Trip form {round}</span></MSheet>
+        <MSheet open onClose={onCloseTop} ariaLabel="Remove days?"><span>Question</span></MSheet>
+      </>
+    );
+    const { rerender } = render(renderBoth(1));
+    // Typing into the form under the question re-renders it with a new handler.
+    rerender(renderBoth(2));
+
+    fireEvent.keyDown(document, { key: 'Escape' });
+    expect(onCloseTop).toHaveBeenCalledTimes(1);
+    expect(baseCalls).toEqual([]);
+  });
 });
diff --git a/client/tests/unit/mobile/settings/MConfirmSheet.test.tsx b/client/tests/unit/mobile/settings/MConfirmSheet.test.tsx
new file mode 100644
index 000000000..fe9a08ce1
--- /dev/null
+++ b/client/tests/unit/mobile/settings/MConfirmSheet.test.tsx
@@ -0,0 +1,46 @@
+import { describe, it, expect, vi } from 'vitest'
+import { fireEvent, render, screen } from '@testing-library/react'
+import MConfirmSheet from '../../../../src/mobile/screens/settings/MConfirmSheet'
+
+// FE-MOB-CONFIRM-001 to FE-MOB-CONFIRM-003
+
+describe('MConfirmSheet', () => {
+  it('FE-MOB-CONFIRM-001: a long list scrolls between the title and the buttons, which stay in reach', () => {
+    render(
+      <MConfirmSheet open onClose={vi.fn()} title="Remove days?" message="Saving removes these days:" confirmLabel="Remove days and save" cancelLabel="Cancel" danger onConfirm={vi.fn()}>
+        <ul aria-label="consequences">{Array.from({ length: 40 }, (_, i) => <li key={i}>Row {i}</li>)}</ul>
+      </MConfirmSheet>,
+    )
+    const scroller = screen.getByRole('list', { name: 'consequences' }).closest('.overflow-y-auto') as HTMLElement
+    expect(scroller).not.toBeNull()
+    expect(scroller).toHaveClass('min-h-0', 'flex-1')
+    expect(scroller).toHaveTextContent('Saving removes these days:')
+    // Title and buttons sit outside the scrolling part.
+    expect(scroller.contains(screen.getByText('Remove days?'))).toBe(false)
+    const confirm = screen.getByRole('button', { name: 'Remove days and save' })
+    expect(scroller.contains(confirm)).toBe(false)
+    expect(confirm.parentElement).toHaveClass('flex-none')
+  })
+
+  it('FE-MOB-CONFIRM-002: confirm and cancel reach their handlers, busy turns the confirm off', () => {
+    const onClose = vi.fn()
+    const onConfirm = vi.fn()
+    const { rerender } = render(
+      <MConfirmSheet open onClose={onClose} title="Delete Tue, Oct 13?" message="Gone for good." confirmLabel="Delete day" cancelLabel="Cancel" onConfirm={onConfirm} />,
+    )
+    fireEvent.click(screen.getByRole('button', { name: 'Delete day' }))
+    fireEvent.click(screen.getByRole('button', { name: 'Cancel' }))
+    expect(onConfirm).toHaveBeenCalledTimes(1)
+    expect(onClose).toHaveBeenCalledTimes(1)
+
+    rerender(
+      <MConfirmSheet open onClose={onClose} title="Delete Tue, Oct 13?" message="Gone for good." confirmLabel="Delete day" cancelLabel="Cancel" onConfirm={onConfirm} busy />,
+    )
+    expect(screen.getByRole('button', { name: 'Delete day' })).toBeDisabled()
+  })
+
+  it('FE-MOB-CONFIRM-003: without onConfirm it is a notice with a single button', () => {
+    render(<MConfirmSheet open onClose={vi.fn()} title="Heads up" message="Nothing to confirm." cancelLabel="OK" />)
+    expect(screen.getAllByRole('button').map(b => b.textContent)).toEqual(['OK'])
+  })
+})
diff --git a/client/tests/unit/mobile/trip/MDaysSheet.test.tsx b/client/tests/unit/mobile/trip/MDaysSheet.test.tsx
index 199938f1e..428e1db27 100644
--- a/client/tests/unit/mobile/trip/MDaysSheet.test.tsx
+++ b/client/tests/unit/mobile/trip/MDaysSheet.test.tsx
@@ -153,7 +153,8 @@ describe('MDaysSheet', () => {
 
     it('FE-MOB-DAYSS-016: two tiles, the next date and a day without one, each with what it does', () => {
       const { planner } = renderSheet({ dayAdd: dayAdd() })
-      expect(datedTile()).toHaveTextContent(/Extends the trip by one day, until .*Oct 13\./)
+      // formatDate adds the year once the date lies outside the current year.
+      expect(datedTile()).toHaveTextContent(/Extends the trip by one day, until .*Oct 13(, \d{4})?\./)
       expect(undatedTile()).toHaveTextContent('The trip dates stay as they are.')
       expect(screen.queryByRole('button', { name: 'Add day' })).not.toBeInTheDocument()
 
diff --git a/server/src/nest/days/day-removal.service.ts b/server/src/nest/days/day-removal.service.ts
index 3d8e8b023..2a5fd8205 100644
--- a/server/src/nest/days/day-removal.service.ts
+++ b/server/src/nest/days/day-removal.service.ts
@@ -94,9 +94,9 @@ export class DayRemovalService {
       // assignments, notes, stops, roads and booking positions along by cascade.
       this.db.run('DELETE FROM roadtrip_day_boundaries WHERE trip_id = ? AND day_number = ?', trip, target.day_number);
       this.db.run('DELETE FROM days WHERE id = ?', id);
-      this.shiftBoundaries(trip, target.day_number);
 
       const remaining = rows.filter(r => r.id !== id);
+      this.shiftBoundaries(trip, rows, remaining);
       const endDate = this.renumber(trip, rows, remaining);
 
       const boundariesAfter = this.boundaries(trip);
@@ -170,18 +170,34 @@ export class DayRemovalService {
   }
 
   /**
-   * Boundaries are keyed by day number, not by day, so the ones after the deleted
-   * day move up with their days. One at a time and in ascending order: the key is
-   * the primary key, and a CHECK keeps it at 1 or above, so the negative two-step
-   * the days use is not available here.
+   * Boundaries are keyed by day number, not by day, so each one follows its day
+   * to the position that day takes in the closed-up numbering. Not simply one
+   * less: a trip can still carry a hole in its numbering from the old delete,
+   * which the renumbering closes too, and a flat step of one would leave every
+   * boundary behind the hole a day off. A boundary on a number no day holds
+   * applies to no day: inside the list it has no slot left and goes, past the
+   * last day it keeps its distance to the end, the way the flat step kept it.
+   *
+   * One at a time and in ascending order: the key is the primary key, and a
+   * CHECK keeps it at 1 or above, so the negative two-step the days use is not
+   * available here. Ascending is safe, since no number moves up and the order
+   * between them stays.
    */
-  private shiftBoundaries(tripId: number, deletedNumber: number): void {
-    const later = this.db.all<{ day_number: number }>(
-      'SELECT day_number FROM roadtrip_day_boundaries WHERE trip_id = ? AND day_number > ? ORDER BY day_number',
-      tripId, deletedNumber,
+  private shiftBoundaries(tripId: number, rows: DayRow[], remaining: DayRow[]): void {
+    const position = new Map(remaining.map((r, i) => [r.day_number, i + 1]));
+    const lastNumber = rows[rows.length - 1].day_number;
+    const pastEnd = lastNumber - remaining.length;
+    const boundaries = this.db.all<{ day_number: number }>(
+      'SELECT day_number FROM roadtrip_day_boundaries WHERE trip_id = ? ORDER BY day_number',
+      tripId,
     );
+    const drop = this.db.prepare('DELETE FROM roadtrip_day_boundaries WHERE trip_id = ? AND day_number = ?');
     const move = this.db.prepare('UPDATE roadtrip_day_boundaries SET day_number = ? WHERE trip_id = ? AND day_number = ?');
-    for (const row of later) move.run(row.day_number - 1, tripId, row.day_number);
+    for (const { day_number: from } of boundaries) {
+      const to = position.get(from) ?? (from > lastNumber ? from - pastEnd : null);
+      if (to === null) drop.run(tripId, from);
+      else if (to !== from) move.run(to, tripId, from);
+    }
   }
 
   /**
diff --git a/server/tests/unit/nest/day-removal.service.test.ts b/server/tests/unit/nest/day-removal.service.test.ts
index 28815b58c..e59621d59 100644
--- a/server/tests/unit/nest/day-removal.service.test.ts
+++ b/server/tests/unit/nest/day-removal.service.test.ts
@@ -1,6 +1,6 @@
 /**
  * DayRemovalService: deleting one day, the way the reorder dialog, the MCP tool
- * and the plugin RPC all do it. DAY-DEL-001 to DAY-DEL-018.
+ * and the plugin RPC all do it. DAY-DEL-001 to DAY-DEL-019.
  *
  * Real in-memory SQLite with the real accommodations and assignments services,
  * so the foreign key cascades and the stay cancellation are the ones production runs.
@@ -367,6 +367,32 @@ describe('DayRemovalService.remove', () => {
       vias: [{ dayId: rows[0].id, vias: [] }],
     }]);
   });
+
+  it('DAY-DEL-019 a hole left in the numbering closes too, and the boundaries follow their own days into it', () => {
+    const { user, trip, rows } = datedTrip('2026-01-01', '2026-01-05');
+    const place = createPlace(testDb, trip.id);
+    const stops = rows.map(r => createDayAssignment(testDb, r.id, place.id));
+    // Days 1, 2, 4 and 5: the third went through the old bare delete, which left
+    // its number empty and one boundary on it. Another one sits past the last day.
+    boundary(trip.id, 2, stops[1].id);
+    boundary(trip.id, 3, stops[0].id);
+    boundary(trip.id, 4, stops[3].id);
+    boundary(trip.id, 5, stops[4].id);
+    boundary(trip.id, 7, stops[0].id);
+    testDb.prepare('DELETE FROM days WHERE id = ?').run(rows[2].id);
+
+    const result = removal.remove(trip.id, rows[1].id, { userId: user.id });
+
+    expect(dayRows(trip.id).map(r => [r.id, r.day_number])).toEqual([[rows[0].id, 1], [rows[3].id, 2], [rows[4].id, 3]]);
+    const expected = [
+      { day_number: 2, from_assignment_id: stops[3].id, to_assignment_id: null, fraction: 1 },
+      { day_number: 3, from_assignment_id: stops[4].id, to_assignment_id: null, fraction: 1 },
+      { day_number: 5, from_assignment_id: stops[0].id, to_assignment_id: null, fraction: 1 },
+    ];
+    expect(testDb.prepare('SELECT day_number, from_assignment_id, to_assignment_id, fraction FROM roadtrip_day_boundaries WHERE trip_id = ? ORDER BY day_number').all(trip.id))
+      .toEqual(expected);
+    expect(result.boundaries).toEqual(expected);
+  });
 });
 
 describe('DayRemovalService.announce', () => {
diff --git a/shared/src/i18n/ar/dashboard.ts b/shared/src/i18n/ar/dashboard.ts
index 8b0bb8915..6a2e7e453 100644
--- a/shared/src/i18n/ar/dashboard.ts
+++ b/shared/src/i18n/ar/dashboard.ts
@@ -96,7 +96,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'نقل كل شيء',
   'dashboard.dateShiftAllDesc': 'ينتقل خط سير الرحلة بالكامل مع التواريخ الجديدة، بما في ذلك الحجوزات وأماكن الإقامة.',
   'dashboard.dateShiftHint':
-    'نصيحة: لنقل جزء من خط سير الرحلة فقط، أضف يومًا من "إعادة ترتيب الأيام" في مخطط الرحلة ثم انقله إلى المكان الذي يجب أن تكون فيه الفجوة.',
+    'نصيحة: لنقل جزء من خط سير الرحلة فقط، افتح "إعادة ترتيب الأيام" في مخطط الرحلة، وأضف اليوم التالي لنهاية الرحلة بالزر الذي يعرض تاريخه، ثم انقل هذا اليوم إلى المكان الذي يجب أن تكون فيه الفجوة.',
   'dashboard.shrinkTitle': 'إزالة أيام؟',
   'dashboard.shrinkIntro': 'عند حفظ التواريخ الجديدة تُزال هذه الأيام:',
   'dashboard.shrinkMoreDays': '+{count} أخرى',
@@ -108,6 +108,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'يقع تسجيل الوصول أو المغادرة في يوم تتم إزالته، لذا تُزال الإقامة بالكامل.',
   'dashboard.shrinkStayBookedHint':
     'يقع تسجيل الوصول أو المغادرة في يوم تتم إزالته، لذا تُزال الإقامة بالكامل. ويبقى حجزها "{booking}" ومصروفه ضمن الحجوزات.',
+  'dashboard.shrinkStayBookingHint':
+    'يقع تسجيل الوصول أو المغادرة في يوم تتم إزالته، لذا تُزال الإقامة بالكامل. ويبقى حجزها "{booking}" ضمن الحجوزات.',
   'dashboard.shrinkConfirm': 'إزالة الأيام والحفظ',
   'dashboard.shrinkUnknown':
     'تعذّر التحقق من أيام هذه الرحلة. إذا كانت التواريخ الجديدة تضم أيامًا أقل، فإن الحفظ يزيل الأيام الأخيرة وكل ما خُطط فيها.',
diff --git a/shared/src/i18n/ar/dayplan.ts b/shared/src/i18n/ar/dayplan.ts
index 528e6111f..2c3fda81b 100644
--- a/shared/src/i18n/ar/dayplan.ts
+++ b/shared/src/i18n/ar/dayplan.ts
@@ -103,11 +103,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'يقع تسجيل الوصول أو المغادرة في هذا اليوم، لذا تُلغى الإقامة.',
   'dayplan.deleteDayStayBookedHint':
     'يقع تسجيل الوصول أو المغادرة في هذا اليوم، لذا تُلغى الإقامة مع الحجز "{booking}" ومصروفه.',
+  'dayplan.deleteDayStayBookingHint':
+    'يقع تسجيل الوصول أو المغادرة في هذا اليوم، لذا تُلغى الإقامة مع الحجز "{booking}".',
+  'dayplan.deleteDayStayPaidHint':
+    'يقع تسجيل الوصول أو المغادرة في هذا اليوم، لذا تُلغى الإقامة مع الحجز "{booking}" ومصروفه البالغ {amount}.',
   'dayplan.deleteDayShift': 'الأيام اللاحقة: {count}',
   'dayplan.deleteDayShiftHint': 'ينتقل كل منها إلى التاريخ السابق.',
   'dayplan.deleteDayShiftBookingsHint': 'ينتقل كل منها إلى التاريخ السابق. الحجوزات التي تنتقل معها: {count}',
   'dayplan.deleteDayShrink': 'تنتهي الرحلة الآن في {date}',
   'dayplan.deleteDayShrinkHint': 'لا يوجد يوم بلا تاريخ ليأخذ التاريخ الأخير.',
+  'dayplan.impactStayShorter': 'الإقامة في {name}: ليلة أقل',
+  'dayplan.deleteDayStayShorterHint': 'تمتد عبر هذا اليوم، وأصبحت المغادرة الآن في {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'تمتد عبر هذا اليوم، وأصبحت تنتهي الآن قبل يوم واحد.',
+  'dayplan.deleteDaySpareDated': 'يأخذ {day} التاريخ {date}',
+  'dayplan.deleteDaySpareDatedHint': 'إنه أول يوم بلا تاريخ، ويأخذ آخر تاريخ في الرحلة.',
   'dayplan.deleteDayLast': 'تحتاج الرحلة إلى يوم واحد على الأقل',
   'dayplan.daysOffline': 'تغيير الأيام يتطلب اتصالًا',
   'dayplan.deleteDaySuccess': 'تم حذف اليوم',
diff --git a/shared/src/i18n/ar/undo.ts b/shared/src/i18n/ar/undo.ts
index fe5e099c4..08ff7f079 100644
--- a/shared/src/i18n/ar/undo.ts
+++ b/shared/src/i18n/ar/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'استيراد خرائط Naver',
   'undo.addPlace': 'تمت إضافة المكان',
   'undo.done': 'تم التراجع: {action}',
+  'undo.failed': 'تعذر التراجع: {action}',
   'undo.importBooking': 'استيراد تأكيد الحجز',
 };
 export default undo;
diff --git a/shared/src/i18n/br/dashboard.ts b/shared/src/i18n/br/dashboard.ts
index ef9696d87..03d4a8683 100644
--- a/shared/src/i18n/br/dashboard.ts
+++ b/shared/src/i18n/br/dashboard.ts
@@ -96,7 +96,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'Mover tudo',
   'dashboard.dateShiftAllDesc': 'Todo o itinerário acompanha as novas datas, incluindo reservas e hospedagens.',
   'dashboard.dateShiftHint':
-    'Dica: para mover apenas parte do itinerário, adicione um dia em “Reordenar dias” no planejador e mova-o para onde a lacuna deve ficar.',
+    'Dica: para mover apenas parte do itinerário, abra “Reordenar dias” no planejador, adicione o dia seguinte ao fim da viagem pelo botão que mostra a data dele e mova esse dia para onde a lacuna deve ficar.',
   'dashboard.shrinkTitle': 'Remover dias?',
   'dashboard.shrinkIntro': 'Ao salvar as novas datas, estes dias serão removidos:',
   'dashboard.shrinkMoreDays': '+{count} outros',
@@ -109,6 +109,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'O check-in ou o check-out é em um dia removido, então a hospedagem inteira é removida.',
   'dashboard.shrinkStayBookedHint':
     'O check-in ou o check-out é em um dia removido, então a hospedagem inteira é removida. A reserva “{booking}” e a despesa dela continuam em Reservas.',
+  'dashboard.shrinkStayBookingHint':
+    'O check-in ou o check-out é em um dia removido, então a hospedagem inteira é removida. A reserva “{booking}” continua em Reservas.',
   'dashboard.shrinkConfirm': 'Remover dias e salvar',
   'dashboard.shrinkUnknown':
     'Não foi possível verificar os dias desta viagem. Se as novas datas tiverem menos dias, salvar remove os últimos dias e tudo o que está planejado neles.',
diff --git a/shared/src/i18n/br/dayplan.ts b/shared/src/i18n/br/dayplan.ts
index 7efbbe8c2..142159bd9 100644
--- a/shared/src/i18n/br/dayplan.ts
+++ b/shared/src/i18n/br/dayplan.ts
@@ -104,11 +104,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'O check-in ou o check-out é neste dia, então a hospedagem é cancelada.',
   'dayplan.deleteDayStayBookedHint':
     'O check-in ou o check-out é neste dia, então a hospedagem é cancelada, junto com a reserva “{booking}” e a despesa dela.',
+  'dayplan.deleteDayStayBookingHint':
+    'O check-in ou o check-out é neste dia, então a hospedagem é cancelada, junto com a reserva “{booking}”.',
+  'dayplan.deleteDayStayPaidHint':
+    'O check-in ou o check-out é neste dia, então a hospedagem é cancelada, junto com a reserva “{booking}” e a despesa dela de {amount}.',
   'dayplan.deleteDayShift': 'Dias seguintes: {count}',
   'dayplan.deleteDayShiftHint': 'Cada um passa para a data anterior.',
   'dayplan.deleteDayShiftBookingsHint': 'Cada um passa para a data anterior. Reservas que vão junto: {count}',
   'dayplan.deleteDayShrink': 'A viagem agora termina em {date}',
   'dayplan.deleteDayShrinkHint': 'Não há nenhum dia sem data para assumir a última data.',
+  'dayplan.impactStayShorter': 'Hospedagem em {name}: uma noite a menos',
+  'dayplan.deleteDayStayShorterHint': 'Ela passa por este dia e agora o check-out é em {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Ela passa por este dia e agora termina um dia antes.',
+  'dayplan.deleteDaySpareDated': '{day} recebe a data {date}',
+  'dayplan.deleteDaySpareDatedHint': 'É o primeiro dia sem data e assume a última data da viagem.',
   'dayplan.deleteDayLast': 'Uma viagem precisa de pelo menos um dia',
   'dayplan.daysOffline': 'Alterar os dias exige conexão',
   'dayplan.deleteDaySuccess': 'Dia excluído',
diff --git a/shared/src/i18n/br/undo.ts b/shared/src/i18n/br/undo.ts
index c086d52a2..58e026307 100644
--- a/shared/src/i18n/br/undo.ts
+++ b/shared/src/i18n/br/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Importação do Naver Maps',
   'undo.addPlace': 'Local adicionado',
   'undo.done': 'Desfeito: {action}',
+  'undo.failed': 'Não foi possível desfazer: {action}',
   'undo.importBooking': 'Importação de confirmação de reserva',
 };
 export default undo;
diff --git a/shared/src/i18n/ca/dashboard.ts b/shared/src/i18n/ca/dashboard.ts
index a3a4318a7..1a865d408 100644
--- a/shared/src/i18n/ca/dashboard.ts
+++ b/shared/src/i18n/ca/dashboard.ts
@@ -181,7 +181,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'Mou-ho tot',
   'dashboard.dateShiftAllDesc': "Tot l'itinerari es mou amb les noves dates, incloses les reserves i els allotjaments.",
   'dashboard.dateShiftHint':
-    "Consell: per moure només una part de l'itinerari, afegeix un dia a «Reordena els dies» del planificador i mou-lo on ha de quedar el buit.",
+    "Consell: per moure només una part de l'itinerari, obre «Reordena els dies» al planificador, afegeix el dia posterior al viatge amb el botó que mostra la seva data i mou aquest dia on ha de quedar el buit.",
   'dashboard.shrinkTitle': 'Vols treure dies?',
   'dashboard.shrinkIntro': 'En desar les noves dates es treuen aquests dies:',
   'dashboard.shrinkMoreDays': '+{count} més',
@@ -194,6 +194,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': "L'entrada o la sortida és un dia que es treu, així que es treu tota l'estada.",
   'dashboard.shrinkStayBookedHint':
     "L'entrada o la sortida és un dia que es treu, així que es treu tota l'estada. La seva reserva «{booking}» i la seva despesa es queden a Reserves.",
+  'dashboard.shrinkStayBookingHint':
+    "L'entrada o la sortida és un dia que es treu, així que es treu tota l'estada. La seva reserva «{booking}» es queda a Reserves.",
   'dashboard.shrinkConfirm': 'Treu els dies i desa',
   'dashboard.shrinkUnknown':
     "No s'han pogut comprovar els dies d'aquest viatge. Si les noves dates tenen menys dies, en desar es treuen els últims dies i tot el que hi ha planificat.",
diff --git a/shared/src/i18n/ca/dayplan.ts b/shared/src/i18n/ca/dayplan.ts
index 78f21c2af..e9dbab809 100644
--- a/shared/src/i18n/ca/dayplan.ts
+++ b/shared/src/i18n/ca/dayplan.ts
@@ -104,11 +104,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': "L'entrada o la sortida és aquest dia, així que l'estada es cancel·la.",
   'dayplan.deleteDayStayBookedHint':
     "L'entrada o la sortida és aquest dia, així que l'estada es cancel·la, juntament amb la reserva «{booking}» i la seva despesa.",
+  'dayplan.deleteDayStayBookingHint':
+    "L'entrada o la sortida és aquest dia, així que l'estada es cancel·la, juntament amb la reserva «{booking}».",
+  'dayplan.deleteDayStayPaidHint':
+    "L'entrada o la sortida és aquest dia, així que l'estada es cancel·la, juntament amb la reserva «{booking}» i la seva despesa de {amount}.",
   'dayplan.deleteDayShift': 'Dies posteriors: {count}',
   'dayplan.deleteDayShiftHint': 'Cadascun passa a la data anterior.',
   'dayplan.deleteDayShiftBookingsHint': 'Cadascun passa a la data anterior. Reserves que es mouen amb ells: {count}',
   'dayplan.deleteDayShrink': 'Ara el viatge acaba el {date}',
   'dayplan.deleteDayShrinkHint': "No queda cap dia sense data que pugui agafar l'última data.",
+  'dayplan.impactStayShorter': 'Estada a {name}: una nit menys',
+  'dayplan.deleteDayStayShorterHint': 'Travessa aquest dia i ara la sortida és el {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Travessa aquest dia i ara acaba un dia abans.',
+  'dayplan.deleteDaySpareDated': '{day} pren la data {date}',
+  'dayplan.deleteDaySpareDatedHint': "És el primer dia sense data i passa a tenir l'última data del viatge.",
   'dayplan.deleteDayLast': 'Un viatge necessita com a mínim un dia',
   'dayplan.daysOffline': 'Per canviar els dies cal connexió',
   'dayplan.deleteDaySuccess': 'Dia eliminat',
diff --git a/shared/src/i18n/ca/undo.ts b/shared/src/i18n/ca/undo.ts
index 4fda550da..b04a14e7e 100644
--- a/shared/src/i18n/ca/undo.ts
+++ b/shared/src/i18n/ca/undo.ts
@@ -18,6 +18,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Importació de Naver Maps',
   'undo.addPlace': 'Lloc afegit',
   'undo.done': 'Desfet: {action}',
+  'undo.failed': "No s'ha pogut desfer: {action}",
   'undo.importBooking': 'Importa confirmació de reserva',
 
   'undo.changeCategory': 'Categoria canviada',
diff --git a/shared/src/i18n/cs/dashboard.ts b/shared/src/i18n/cs/dashboard.ts
index 77342c4c9..88fe3bbde 100644
--- a/shared/src/i18n/cs/dashboard.ts
+++ b/shared/src/i18n/cs/dashboard.ts
@@ -96,7 +96,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'Posunout vše',
   'dashboard.dateShiftAllDesc': 'Celý itinerář se posune podle nových termínů, včetně rezervací a ubytování.',
   'dashboard.dateShiftHint':
-    'Tip: pokud chcete posunout jen část itineráře, přidejte v plánovači v „Změnit pořadí dnů“ den a přesuňte ho tam, kde má vzniknout mezera.',
+    'Tip: pokud chcete posunout jen část itineráře, otevřete v plánovači „Změnit pořadí dnů“, přidejte den po konci cesty tlačítkem s jeho datem a přesuňte ho tam, kde má vzniknout mezera.',
   'dashboard.shrinkTitle': 'Odebrat dny?',
   'dashboard.shrinkIntro': 'Uložením nových dat se odeberou tyto dny:',
   'dashboard.shrinkMoreDays': '+{count} další',
@@ -109,6 +109,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'Příjezd nebo odjezd připadá na odebíraný den, proto se odebere celé ubytování.',
   'dashboard.shrinkStayBookedHint':
     'Příjezd nebo odjezd připadá na odebíraný den, proto se odebere celé ubytování. Jeho rezervace „{booking}“ a její výdaj zůstanou v Rezervacích.',
+  'dashboard.shrinkStayBookingHint':
+    'Příjezd nebo odjezd připadá na odebíraný den, proto se odebere celé ubytování. Jeho rezervace „{booking}“ zůstane v Rezervacích.',
   'dashboard.shrinkConfirm': 'Odebrat dny a uložit',
   'dashboard.shrinkUnknown':
     'Dny této cesty se nepodařilo ověřit. Pokud mají nová data méně dnů, uložení odebere poslední dny a vše, co je na nich naplánováno.',
diff --git a/shared/src/i18n/cs/dayplan.ts b/shared/src/i18n/cs/dayplan.ts
index c4f14ffd4..4c21f6222 100644
--- a/shared/src/i18n/cs/dayplan.ts
+++ b/shared/src/i18n/cs/dayplan.ts
@@ -104,12 +104,21 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Příjezd nebo odjezd připadá na tento den, proto se ubytování zruší.',
   'dayplan.deleteDayStayBookedHint':
     'Příjezd nebo odjezd připadá na tento den, proto se ubytování zruší spolu s rezervací „{booking}“ a jejím výdajem.',
+  'dayplan.deleteDayStayBookingHint':
+    'Příjezd nebo odjezd připadá na tento den, proto se ubytování zruší spolu s rezervací „{booking}“.',
+  'dayplan.deleteDayStayPaidHint':
+    'Příjezd nebo odjezd připadá na tento den, proto se ubytování zruší spolu s rezervací „{booking}“ a jejím výdajem {amount}.',
   'dayplan.deleteDayShift': 'Pozdější dny: {count}',
   'dayplan.deleteDayShiftHint': 'Každý se posune o jedno datum dříve.',
   'dayplan.deleteDayShiftBookingsHint':
     'Každý se posune o jedno datum dříve. Rezervace, které se posunou s nimi: {count}',
   'dayplan.deleteDayShrink': 'Cesta nyní končí {date}',
   'dayplan.deleteDayShrinkHint': 'Nezbývá žádný den bez data, který by převzal poslední datum.',
+  'dayplan.impactStayShorter': 'Ubytování v {name}: o noc kratší',
+  'dayplan.deleteDayStayShorterHint': 'Zasahuje přes tento den, odjezd je teď {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Zasahuje přes tento den, teď končí o den dříve.',
+  'dayplan.deleteDaySpareDated': '{day} dostane datum {date}',
+  'dayplan.deleteDaySpareDatedHint': 'Je to první den bez data a převezme poslední datum cesty.',
   'dayplan.deleteDayLast': 'Cesta musí mít alespoň jeden den',
   'dayplan.daysOffline': 'Změna dnů vyžaduje připojení',
   'dayplan.deleteDaySuccess': 'Den smazán',
diff --git a/shared/src/i18n/cs/undo.ts b/shared/src/i18n/cs/undo.ts
index 59191b3c7..b2ad2a2e0 100644
--- a/shared/src/i18n/cs/undo.ts
+++ b/shared/src/i18n/cs/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Import z Naver Maps',
   'undo.addPlace': 'Místo přidáno',
   'undo.done': 'Vráceno zpět: {action}',
+  'undo.failed': 'Nelze vrátit zpět: {action}',
   'undo.importBooking': 'Import potvrzení rezervace',
 };
 export default undo;
diff --git a/shared/src/i18n/de/dashboard.ts b/shared/src/i18n/de/dashboard.ts
index b029e5841..ac1299635 100644
--- a/shared/src/i18n/de/dashboard.ts
+++ b/shared/src/i18n/de/dashboard.ts
@@ -99,7 +99,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAllDesc':
     'Der gesamte Reiseplan wandert mit den neuen Daten, einschließlich Reservierungen und Unterkünften.',
   'dashboard.dateShiftHint':
-    'Tipp: Um nur einen Teil deines Reiseplans zu verschieben, füge im Planer unter „Tage neu anordnen“ einen Tag hinzu und schiebe ihn an die Stelle, an der die Lücke entstehen soll.',
+    'Tipp: Um nur einen Teil deines Reiseplans zu verschieben, öffne im Planer „Tage neu anordnen“, füge dort den Tag nach der Reise über den Knopf mit seinem Datum hinzu und schiebe ihn an die Stelle, an der die Lücke entstehen soll.',
   'dashboard.shrinkTitle': 'Tage entfernen?',
   'dashboard.shrinkIntro': 'Mit den neuen Daten entfallen beim Speichern diese Tage:',
   'dashboard.shrinkMoreDays': '+{count} weitere',
@@ -113,6 +113,8 @@ const dashboard: TranslationStrings = {
     'Check-in oder Check-out an einem entfallenden Tag, deshalb wird die ganze Unterkunft entfernt.',
   'dashboard.shrinkStayBookedHint':
     'Check-in oder Check-out an einem entfallenden Tag, deshalb wird die ganze Unterkunft entfernt. Ihre Buchung „{booking}“ und deren Ausgabe bleiben unter Buchungen.',
+  'dashboard.shrinkStayBookingHint':
+    'Check-in oder Check-out an einem entfallenden Tag, deshalb wird die ganze Unterkunft entfernt. Ihre Buchung „{booking}“ bleibt unter Buchungen.',
   'dashboard.shrinkConfirm': 'Tage entfernen und speichern',
   'dashboard.shrinkUnknown':
     'Die Tage dieser Reise ließen sich nicht prüfen. Haben die neuen Daten weniger Tage, entfernt das Speichern die letzten Tage mit allem, was darauf geplant ist.',
diff --git a/shared/src/i18n/de/dayplan.ts b/shared/src/i18n/de/dayplan.ts
index 49ff4f114..093319f20 100644
--- a/shared/src/i18n/de/dayplan.ts
+++ b/shared/src/i18n/de/dayplan.ts
@@ -104,12 +104,21 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Check-in oder Check-out an diesem Tag, sie wird storniert.',
   'dayplan.deleteDayStayBookedHint':
     'Check-in oder Check-out an diesem Tag, sie wird storniert, zusammen mit der Buchung „{booking}“ und ihrer Ausgabe.',
+  'dayplan.deleteDayStayBookingHint':
+    'Check-in oder Check-out an diesem Tag, sie wird storniert, zusammen mit der Buchung „{booking}“.',
+  'dayplan.deleteDayStayPaidHint':
+    'Check-in oder Check-out an diesem Tag, sie wird storniert, zusammen mit der Buchung „{booking}“ und ihrer Ausgabe über {amount}.',
   'dayplan.deleteDayShift': 'Spätere Tage: {count}',
   'dayplan.deleteDayShiftHint': 'Jeder rückt um einen Kalendertag nach vorn.',
   'dayplan.deleteDayShiftBookingsHint':
     'Jeder rückt um einen Kalendertag nach vorn. Buchungen, die mitwandern: {count}',
   'dayplan.deleteDayShrink': 'Die Reise endet jetzt am {date}',
   'dayplan.deleteDayShrinkHint': 'Es gibt keinen Tag ohne Datum, der das letzte Datum übernehmen könnte.',
+  'dayplan.impactStayShorter': 'Übernachtung in {name}: eine Nacht weniger',
+  'dayplan.deleteDayStayShorterHint': 'Sie läuft über diesen Tag, der Check-out ist jetzt am {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Sie läuft über diesen Tag und endet jetzt einen Tag früher.',
+  'dayplan.deleteDaySpareDated': '{day} bekommt das Datum {date}',
+  'dayplan.deleteDaySpareDatedHint': 'Er ist der erste Tag ohne Datum und übernimmt das letzte Datum der Reise.',
   'dayplan.deleteDayLast': 'Eine Reise braucht mindestens einen Tag',
   'dayplan.daysOffline': 'Tage ändern geht nur mit Verbindung',
   'dayplan.deleteDaySuccess': 'Tag gelöscht',
diff --git a/shared/src/i18n/de/undo.ts b/shared/src/i18n/de/undo.ts
index e1e9f8716..04d0dd313 100644
--- a/shared/src/i18n/de/undo.ts
+++ b/shared/src/i18n/de/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Naver Maps-Import',
   'undo.addPlace': 'Ort hinzugefügt',
   'undo.done': 'Rückgängig gemacht: {action}',
+  'undo.failed': 'Rückgängig machen fehlgeschlagen: {action}',
   'undo.importBooking': 'Buchungsbestätigung-Import',
 };
 export default undo;
diff --git a/shared/src/i18n/en/dashboard.ts b/shared/src/i18n/en/dashboard.ts
index 5423f37f8..9a2724737 100644
--- a/shared/src/i18n/en/dashboard.ts
+++ b/shared/src/i18n/en/dashboard.ts
@@ -111,7 +111,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAllDesc':
     'The entire itinerary moves with the new dates, including reservations and accommodations.',
   'dashboard.dateShiftHint':
-    'Tip: to shift only part of your itinerary, add a day under "Reorder days" in the planner and move it to where the gap belongs.',
+    'Tip: to shift only part of your itinerary, open "Reorder days" in the planner, add the day after the trip with the button that shows its date, and move that day to where the gap belongs.',
   'dashboard.shrinkTitle': 'Remove days?',
   'dashboard.shrinkIntro': 'Saving the new dates removes these days:',
   'dashboard.shrinkMoreDays': '+{count} more',
@@ -124,6 +124,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'Checks in or out on a removed day, so the whole stay is removed.',
   'dashboard.shrinkStayBookedHint':
     'Checks in or out on a removed day, so the whole stay is removed. Its booking "{booking}" and its expense stay under Bookings.',
+  'dashboard.shrinkStayBookingHint':
+    'Checks in or out on a removed day, so the whole stay is removed. Its booking "{booking}" stays under Bookings.',
   'dashboard.shrinkConfirm': 'Remove days and save',
   'dashboard.shrinkUnknown':
     'The days of this trip could not be checked. If the new dates hold fewer days, saving removes the last days and everything planned on them.',
diff --git a/shared/src/i18n/en/dayplan.ts b/shared/src/i18n/en/dayplan.ts
index 45b572ccd..3783c581e 100644
--- a/shared/src/i18n/en/dayplan.ts
+++ b/shared/src/i18n/en/dayplan.ts
@@ -104,11 +104,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Checks in or out on this day and is cancelled.',
   'dayplan.deleteDayStayBookedHint':
     'Checks in or out on this day and is cancelled, together with the booking “{booking}” and its expense.',
+  'dayplan.deleteDayStayBookingHint':
+    'Checks in or out on this day and is cancelled, together with the booking “{booking}”.',
+  'dayplan.deleteDayStayPaidHint':
+    'Checks in or out on this day and is cancelled, together with the booking “{booking}” and its expense of {amount}.',
   'dayplan.deleteDayShift': 'Later days: {count}',
   'dayplan.deleteDayShiftHint': 'Each moves one date earlier.',
   'dayplan.deleteDayShiftBookingsHint': 'Each moves one date earlier. Bookings moving along: {count}',
   'dayplan.deleteDayShrink': 'Trip now ends on {date}',
   'dayplan.deleteDayShrinkHint': 'There is no day without a date to take over the last date.',
+  'dayplan.impactStayShorter': 'Stay at {name}: one night less',
+  'dayplan.deleteDayStayShorterHint': 'It runs across this day and now checks out on {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'It runs across this day and now ends one day earlier.',
+  'dayplan.deleteDaySpareDated': '{day} takes the date {date}',
+  'dayplan.deleteDaySpareDatedHint': 'It is the first day without a date, and it takes over the last date of the trip.',
   'dayplan.deleteDayLast': 'A trip needs at least one day',
   'dayplan.daysOffline': 'Changing days needs a connection',
   'dayplan.deleteDaySuccess': 'Day deleted',
diff --git a/shared/src/i18n/en/undo.ts b/shared/src/i18n/en/undo.ts
index 47d569dca..f661cb9d7 100644
--- a/shared/src/i18n/en/undo.ts
+++ b/shared/src/i18n/en/undo.ts
@@ -20,5 +20,6 @@ const undo: TranslationStrings = {
   'undo.importBooking': 'Booking confirmation import',
   'undo.addPlace': 'Place added',
   'undo.done': 'Undone: {action}',
+  'undo.failed': 'Could not undo: {action}',
 };
 export default undo;
diff --git a/shared/src/i18n/es/dashboard.ts b/shared/src/i18n/es/dashboard.ts
index 75baacfac..669a1e51b 100644
--- a/shared/src/i18n/es/dashboard.ts
+++ b/shared/src/i18n/es/dashboard.ts
@@ -98,7 +98,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAllDesc':
     'Todo el itinerario se mueve con las nuevas fechas, incluidas las reservas y los alojamientos.',
   'dashboard.dateShiftHint':
-    'Consejo: para mover solo una parte del itinerario, añade un día en «Reordenar días» del planificador y muévelo al lugar donde debe quedar el hueco.',
+    'Consejo: para mover solo una parte del itinerario, abre «Reordenar días» en el planificador, añade el día siguiente al final del viaje con el botón que muestra su fecha y mueve ese día al lugar donde debe quedar el hueco.',
   'dashboard.shrinkTitle': '¿Quitar días?',
   'dashboard.shrinkIntro': 'Al guardar las nuevas fechas se quitan estos días:',
   'dashboard.shrinkMoreDays': '+{count} más',
@@ -111,6 +111,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'La entrada o la salida es un día que se quita, así que se quita la estancia entera.',
   'dashboard.shrinkStayBookedHint':
     'La entrada o la salida es un día que se quita, así que se quita la estancia entera. Su reserva «{booking}» y su gasto se quedan en Reservas.',
+  'dashboard.shrinkStayBookingHint':
+    'La entrada o la salida es un día que se quita, así que se quita la estancia entera. Su reserva «{booking}» se queda en Reservas.',
   'dashboard.shrinkConfirm': 'Quitar días y guardar',
   'dashboard.shrinkUnknown':
     'No se pudieron comprobar los días de este viaje. Si las nuevas fechas tienen menos días, al guardar se quitan los últimos días y todo lo planificado en ellos.',
diff --git a/shared/src/i18n/es/dayplan.ts b/shared/src/i18n/es/dayplan.ts
index 95bffced1..7b46c53a1 100644
--- a/shared/src/i18n/es/dayplan.ts
+++ b/shared/src/i18n/es/dayplan.ts
@@ -104,11 +104,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'La entrada o la salida es este día, así que la estancia se cancela.',
   'dayplan.deleteDayStayBookedHint':
     'La entrada o la salida es este día, así que la estancia se cancela, junto con la reserva «{booking}» y su gasto.',
+  'dayplan.deleteDayStayBookingHint':
+    'La entrada o la salida es este día, así que la estancia se cancela, junto con la reserva «{booking}».',
+  'dayplan.deleteDayStayPaidHint':
+    'La entrada o la salida es este día, así que la estancia se cancela, junto con la reserva «{booking}» y su gasto de {amount}.',
   'dayplan.deleteDayShift': 'Días posteriores: {count}',
   'dayplan.deleteDayShiftHint': 'Cada uno pasa a la fecha anterior.',
   'dayplan.deleteDayShiftBookingsHint': 'Cada uno pasa a la fecha anterior. Reservas que se mueven con ellos: {count}',
   'dayplan.deleteDayShrink': 'El viaje termina ahora el {date}',
   'dayplan.deleteDayShrinkHint': 'No queda ningún día sin fecha que tome la última fecha.',
+  'dayplan.impactStayShorter': 'Estancia en {name}: una noche menos',
+  'dayplan.deleteDayStayShorterHint': 'Abarca este día y ahora la salida es el {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Abarca este día y ahora termina un día antes.',
+  'dayplan.deleteDaySpareDated': '{day} toma la fecha {date}',
+  'dayplan.deleteDaySpareDatedHint': 'Es el primer día sin fecha y pasa a tener la última fecha del viaje.',
   'dayplan.deleteDayLast': 'Un viaje necesita al menos un día',
   'dayplan.daysOffline': 'Cambiar los días requiere conexión',
   'dayplan.deleteDaySuccess': 'Día eliminado',
diff --git a/shared/src/i18n/es/undo.ts b/shared/src/i18n/es/undo.ts
index b623b5c06..3e5252f88 100644
--- a/shared/src/i18n/es/undo.ts
+++ b/shared/src/i18n/es/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Importación de Naver Maps',
   'undo.addPlace': 'Lugar agregado',
   'undo.done': 'Deshecho: {action}',
+  'undo.failed': 'No se pudo deshacer: {action}',
   'undo.importBooking': 'Importar confirmación de reserva',
 };
 export default undo;
diff --git a/shared/src/i18n/fr/dashboard.ts b/shared/src/i18n/fr/dashboard.ts
index 29245d63d..093a68854 100644
--- a/shared/src/i18n/fr/dashboard.ts
+++ b/shared/src/i18n/fr/dashboard.ts
@@ -100,7 +100,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAllDesc':
     "L'itinéraire entier suit les nouvelles dates, y compris les réservations et hébergements.",
   'dashboard.dateShiftHint':
-    "Astuce : pour ne décaler qu'une partie de votre itinéraire, ajoutez un jour dans « Réorganiser les jours » du planificateur et placez-le là où l'écart doit se créer.",
+    "Astuce : pour ne décaler qu'une partie de votre itinéraire, ouvrez « Réorganiser les jours » dans le planificateur, ajoutez le jour qui suit la fin du voyage avec le bouton qui affiche sa date, puis placez ce jour là où l'écart doit se créer.",
   'dashboard.shrinkTitle': 'Retirer des jours ?',
   'dashboard.shrinkIntro': 'En enregistrant les nouvelles dates, ces jours sont retirés :',
   'dashboard.shrinkMoreDays': '+{count} de plus',
@@ -113,6 +113,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': "L'arrivée ou le départ tombe un jour retiré, le séjour entier est donc retiré.",
   'dashboard.shrinkStayBookedHint':
     "L'arrivée ou le départ tombe un jour retiré, le séjour entier est donc retiré. Sa réservation « {booking} » et sa dépense restent dans Réservations.",
+  'dashboard.shrinkStayBookingHint':
+    "L'arrivée ou le départ tombe un jour retiré, le séjour entier est donc retiré. Sa réservation « {booking} » reste dans Réservations.",
   'dashboard.shrinkConfirm': 'Retirer les jours et enregistrer',
   'dashboard.shrinkUnknown':
     "Les jours de ce voyage n'ont pas pu être vérifiés. Si les nouvelles dates comptent moins de jours, l'enregistrement retire les derniers jours et tout ce qui y est prévu.",
diff --git a/shared/src/i18n/fr/dayplan.ts b/shared/src/i18n/fr/dayplan.ts
index aede35760..0c9e1222d 100644
--- a/shared/src/i18n/fr/dayplan.ts
+++ b/shared/src/i18n/fr/dayplan.ts
@@ -104,11 +104,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': "L'arrivée ou le départ a lieu ce jour-là, le séjour est donc annulé.",
   'dayplan.deleteDayStayBookedHint':
     "L'arrivée ou le départ a lieu ce jour-là, le séjour est donc annulé, ainsi que la réservation « {booking} » et sa dépense.",
+  'dayplan.deleteDayStayBookingHint':
+    "L'arrivée ou le départ a lieu ce jour-là, le séjour est donc annulé, ainsi que la réservation « {booking} ».",
+  'dayplan.deleteDayStayPaidHint':
+    "L'arrivée ou le départ a lieu ce jour-là, le séjour est donc annulé, ainsi que la réservation « {booking} » et sa dépense de {amount}.",
   'dayplan.deleteDayShift': 'Jours suivants : {count}',
   'dayplan.deleteDayShiftHint': 'Chacun passe à la date précédente.',
   'dayplan.deleteDayShiftBookingsHint': 'Chacun passe à la date précédente. Réservations déplacées avec eux : {count}',
   'dayplan.deleteDayShrink': 'Le voyage se termine désormais le {date}',
   'dayplan.deleteDayShrinkHint': 'Aucun jour sans date ne peut reprendre la dernière date.',
+  'dayplan.impactStayShorter': 'Séjour à {name} : une nuit de moins',
+  'dayplan.deleteDayStayShorterHint': 'Il couvre ce jour et le départ a désormais lieu le {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Il couvre ce jour et se termine désormais un jour plus tôt.',
+  'dayplan.deleteDaySpareDated': '{day} reçoit la date {date}',
+  'dayplan.deleteDaySpareDatedHint': "C'est le premier jour sans date, et il reprend la dernière date du voyage.",
   'dayplan.deleteDayLast': 'Un voyage doit compter au moins un jour',
   'dayplan.daysOffline': 'Modifier les jours nécessite une connexion',
   'dayplan.deleteDaySuccess': 'Jour supprimé',
diff --git a/shared/src/i18n/fr/undo.ts b/shared/src/i18n/fr/undo.ts
index b1824314d..0ef4d960b 100644
--- a/shared/src/i18n/fr/undo.ts
+++ b/shared/src/i18n/fr/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Import Naver Maps',
   'undo.addPlace': 'Lieu ajouté',
   'undo.done': 'Annulé : {action}',
+  'undo.failed': "Impossible d'annuler : {action}",
   'undo.importBooking': 'Import de confirmation de réservation',
 };
 export default undo;
diff --git a/shared/src/i18n/gr/dashboard.ts b/shared/src/i18n/gr/dashboard.ts
index 72390e292..39b69fa14 100644
--- a/shared/src/i18n/gr/dashboard.ts
+++ b/shared/src/i18n/gr/dashboard.ts
@@ -110,7 +110,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAllDesc':
     'Ολόκληρο το δρομολόγιο μετακινείται με τις νέες ημερομηνίες, συμπεριλαμβανομένων των κρατήσεων και των καταλυμάτων.',
   'dashboard.dateShiftHint':
-    'Συμβουλή: για να μετατοπίσετε μόνο ένα μέρος του δρομολογίου σας, προσθέστε μια ημέρα από την «Αναδιάταξη ημερών» στο ημερήσιο πλάνο και μετακινήστε την εκεί όπου πρέπει να μείνει το κενό.',
+    'Συμβουλή: για να μετατοπίσετε μόνο ένα μέρος του δρομολογίου σας, ανοίξτε την «Αναδιάταξη ημερών» στο ημερήσιο πλάνο, προσθέστε την ημέρα μετά το τέλος του ταξιδιού με το κουμπί που δείχνει την ημερομηνία της και μετακινήστε την εκεί όπου πρέπει να μείνει το κενό.',
   'dashboard.shrinkTitle': 'Αφαίρεση ημερών;',
   'dashboard.shrinkIntro': 'Με την αποθήκευση των νέων ημερομηνιών αφαιρούνται αυτές οι ημέρες:',
   'dashboard.shrinkMoreDays': '+{count} ακόμη',
@@ -124,6 +124,8 @@ const dashboard: TranslationStrings = {
     'Η άφιξη ή η αναχώρηση πέφτει σε ημέρα που αφαιρείται, οπότε αφαιρείται ολόκληρη η διαμονή.',
   'dashboard.shrinkStayBookedHint':
     'Η άφιξη ή η αναχώρηση πέφτει σε ημέρα που αφαιρείται, οπότε αφαιρείται ολόκληρη η διαμονή. Η κράτησή της «{booking}» και το έξοδό της παραμένουν στις Κρατήσεις.',
+  'dashboard.shrinkStayBookingHint':
+    'Η άφιξη ή η αναχώρηση πέφτει σε ημέρα που αφαιρείται, οπότε αφαιρείται ολόκληρη η διαμονή. Η κράτησή της «{booking}» παραμένει στις Κρατήσεις.',
   'dashboard.shrinkConfirm': 'Αφαίρεση ημερών και αποθήκευση',
   'dashboard.shrinkUnknown':
     'Δεν ήταν δυνατός ο έλεγχος των ημερών αυτού του ταξιδιού. Αν οι νέες ημερομηνίες έχουν λιγότερες ημέρες, η αποθήκευση αφαιρεί τις τελευταίες ημέρες και ό,τι έχει προγραμματιστεί σε αυτές.',
diff --git a/shared/src/i18n/gr/dayplan.ts b/shared/src/i18n/gr/dayplan.ts
index fff546a7d..443be4206 100644
--- a/shared/src/i18n/gr/dayplan.ts
+++ b/shared/src/i18n/gr/dayplan.ts
@@ -104,12 +104,23 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Η άφιξη ή η αναχώρηση είναι αυτή την ημέρα, οπότε η διαμονή ακυρώνεται.',
   'dayplan.deleteDayStayBookedHint':
     'Η άφιξη ή η αναχώρηση είναι αυτή την ημέρα, οπότε η διαμονή ακυρώνεται μαζί με την κράτηση «{booking}» και το έξοδό της.',
+  'dayplan.deleteDayStayBookingHint':
+    'Η άφιξη ή η αναχώρηση είναι αυτή την ημέρα, οπότε η διαμονή ακυρώνεται μαζί με την κράτηση «{booking}».',
+  'dayplan.deleteDayStayPaidHint':
+    'Η άφιξη ή η αναχώρηση είναι αυτή την ημέρα, οπότε η διαμονή ακυρώνεται μαζί με την κράτηση «{booking}» και το έξοδό της, ύψους {amount}.',
   'dayplan.deleteDayShift': 'Επόμενες ημέρες: {count}',
   'dayplan.deleteDayShiftHint': 'Καθεμία μετακινείται μία ημερομηνία νωρίτερα.',
   'dayplan.deleteDayShiftBookingsHint':
     'Καθεμία μετακινείται μία ημερομηνία νωρίτερα. Κρατήσεις που μετακινούνται μαζί: {count}',
   'dayplan.deleteDayShrink': 'Το ταξίδι τελειώνει τώρα στις {date}',
   'dayplan.deleteDayShrinkHint': 'Δεν υπάρχει ημέρα χωρίς ημερομηνία για να πάρει την τελευταία ημερομηνία.',
+  'dayplan.impactStayShorter': 'Διαμονή στο {name}: μία νύχτα λιγότερη',
+  'dayplan.deleteDayStayShorterHint': 'Εκτείνεται πάνω από αυτή την ημέρα και η αναχώρηση είναι πλέον στις {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint':
+    'Εκτείνεται πάνω από αυτή την ημέρα και πλέον τελειώνει μία ημέρα νωρίτερα.',
+  'dayplan.deleteDaySpareDated': 'Νέα ημερομηνία για {day}: {date}',
+  'dayplan.deleteDaySpareDatedHint':
+    'Είναι η πρώτη ημέρα χωρίς ημερομηνία και παίρνει την τελευταία ημερομηνία του ταξιδιού.',
   'dayplan.deleteDayLast': 'Ένα ταξίδι χρειάζεται τουλάχιστον μία ημέρα',
   'dayplan.daysOffline': 'Η αλλαγή ημερών απαιτεί σύνδεση',
   'dayplan.deleteDaySuccess': 'Η ημέρα διαγράφηκε',
diff --git a/shared/src/i18n/gr/undo.ts b/shared/src/i18n/gr/undo.ts
index 464ef0db2..560403a2c 100644
--- a/shared/src/i18n/gr/undo.ts
+++ b/shared/src/i18n/gr/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Εισαγωγή Naver Maps',
   'undo.addPlace': 'Η τοποθεσία προστέθηκε',
   'undo.done': 'Αναιρέθηκε: {action}',
+  'undo.failed': 'Η αναίρεση απέτυχε: {action}',
   'undo.importBooking': 'Εισαγωγή επιβεβαίωσης κράτησης',
 };
 export default undo;
diff --git a/shared/src/i18n/hu/dashboard.ts b/shared/src/i18n/hu/dashboard.ts
index 8e5bc38bc..7c5734197 100644
--- a/shared/src/i18n/hu/dashboard.ts
+++ b/shared/src/i18n/hu/dashboard.ts
@@ -99,7 +99,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAllDesc':
     'A teljes útiterv az új dátumokkal együtt mozog, beleértve a foglalásokat és a szállásokat is.',
   'dashboard.dateShiftHint':
-    'Tipp: ha csak az útiterv egy részét szeretnéd eltolni, a tervezőben a „Napok átrendezése” alatt adj hozzá egy napot, és vidd oda, ahol a résnek lennie kell.',
+    'Tipp: ha csak az útiterv egy részét szeretnéd eltolni, nyisd meg a tervezőben a „Napok átrendezése” ablakot, add hozzá az utazás utáni napot a dátumát mutató gombbal, és vidd oda, ahol a résnek lennie kell.',
   'dashboard.shrinkTitle': 'Eltávolítod a napokat?',
   'dashboard.shrinkIntro': 'Az új dátumok mentésekor ezek a napok eltávolításra kerülnek:',
   'dashboard.shrinkMoreDays': '+{count} további',
@@ -113,6 +113,8 @@ const dashboard: TranslationStrings = {
     'A bejelentkezés vagy a kijelentkezés egy eltávolított napra esik, ezért az egész szállás eltávolításra kerül.',
   'dashboard.shrinkStayBookedHint':
     'A bejelentkezés vagy a kijelentkezés egy eltávolított napra esik, ezért az egész szállás eltávolításra kerül. A(z) „{booking}” foglalás és annak kiadása a Foglalások között marad.',
+  'dashboard.shrinkStayBookingHint':
+    'A bejelentkezés vagy a kijelentkezés egy eltávolított napra esik, ezért az egész szállás eltávolításra kerül. A(z) „{booking}” foglalás a Foglalások között marad.',
   'dashboard.shrinkConfirm': 'Napok eltávolítása és mentés',
   'dashboard.shrinkUnknown':
     'Az utazás napjait nem sikerült ellenőrizni. Ha az új dátumok kevesebb napot fognak át, a mentés eltávolítja az utolsó napokat és mindent, ami rájuk van tervezve.',
diff --git a/shared/src/i18n/hu/dayplan.ts b/shared/src/i18n/hu/dayplan.ts
index b83b92134..d186b6fc9 100644
--- a/shared/src/i18n/hu/dayplan.ts
+++ b/shared/src/i18n/hu/dayplan.ts
@@ -105,11 +105,20 @@ const dayplan: TranslationStrings = {
     'A bejelentkezés vagy a kijelentkezés erre a napra esik, ezért a szállás lemondásra kerül.',
   'dayplan.deleteDayStayBookedHint':
     'A bejelentkezés vagy a kijelentkezés erre a napra esik, ezért a szállás lemondásra kerül a(z) „{booking}” foglalással és annak kiadásával együtt.',
+  'dayplan.deleteDayStayBookingHint':
+    'A bejelentkezés vagy a kijelentkezés erre a napra esik, ezért a szállás lemondásra kerül a(z) „{booking}” foglalással együtt.',
+  'dayplan.deleteDayStayPaidHint':
+    'A bejelentkezés vagy a kijelentkezés erre a napra esik, ezért a szállás lemondásra kerül a(z) „{booking}” foglalással és annak {amount} összegű kiadásával együtt.',
   'dayplan.deleteDayShift': 'Későbbi napok: {count}',
   'dayplan.deleteDayShiftHint': 'Mindegyik egy dátummal előrébb kerül.',
   'dayplan.deleteDayShiftBookingsHint': 'Mindegyik egy dátummal előrébb kerül. Velük együtt mozgó foglalások: {count}',
   'dayplan.deleteDayShrink': 'Az utazás mostantól ekkor ér véget: {date}',
   'dayplan.deleteDayShrinkHint': 'Nincs dátum nélküli nap, amely átvehetné az utolsó dátumot.',
+  'dayplan.impactStayShorter': 'Szállás: {name}, eggyel kevesebb éjszaka',
+  'dayplan.deleteDayStayShorterHint': 'Átnyúlik ezen a napon, a kijelentkezés most {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Átnyúlik ezen a napon, és most egy nappal korábban ér véget.',
+  'dayplan.deleteDaySpareDated': 'A(z) {day} új dátuma: {date}',
+  'dayplan.deleteDaySpareDatedHint': 'Ez az első dátum nélküli nap, és megkapja az utazás utolsó dátumát.',
   'dayplan.deleteDayLast': 'Egy utazáshoz legalább egy nap kell',
   'dayplan.daysOffline': 'A napok módosításához kapcsolat szükséges',
   'dayplan.deleteDaySuccess': 'Nap törölve',
diff --git a/shared/src/i18n/hu/undo.ts b/shared/src/i18n/hu/undo.ts
index c3e340357..06ac4d88b 100644
--- a/shared/src/i18n/hu/undo.ts
+++ b/shared/src/i18n/hu/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Naver Maps importálás',
   'undo.addPlace': 'Hely hozzáadva',
   'undo.done': 'Visszavonva: {action}',
+  'undo.failed': 'Nem sikerült visszavonni: {action}',
   'undo.importBooking': 'Foglalási visszaigazolás importálása',
 };
 export default undo;
diff --git a/shared/src/i18n/id/dashboard.ts b/shared/src/i18n/id/dashboard.ts
index c969be9c4..9ba43472a 100644
--- a/shared/src/i18n/id/dashboard.ts
+++ b/shared/src/i18n/id/dashboard.ts
@@ -98,7 +98,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAllDesc':
     'Seluruh rencana perjalanan berpindah ke tanggal baru, termasuk reservasi dan akomodasi.',
   'dashboard.dateShiftHint':
-    'Tip: untuk menggeser sebagian rencana perjalanan saja, tambahkan satu hari di “Atur ulang hari” pada perencana lalu pindahkan ke tempat jeda seharusnya berada.',
+    'Tip: untuk menggeser sebagian rencana perjalanan saja, buka “Atur ulang hari” di perencana, tambahkan hari setelah akhir perjalanan dengan tombol yang menampilkan tanggalnya, lalu pindahkan hari itu ke tempat jeda seharusnya berada.',
   'dashboard.shrinkTitle': 'Hapus hari?',
   'dashboard.shrinkIntro': 'Menyimpan tanggal baru akan menghapus hari-hari ini:',
   'dashboard.shrinkMoreDays': '+{count} lainnya',
@@ -111,6 +111,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'Check-in atau check-out jatuh pada hari yang dihapus, jadi seluruh penginapan dihapus.',
   'dashboard.shrinkStayBookedHint':
     'Check-in atau check-out jatuh pada hari yang dihapus, jadi seluruh penginapan dihapus. Pemesanan “{booking}” dan pengeluarannya tetap ada di Pemesanan.',
+  'dashboard.shrinkStayBookingHint':
+    'Check-in atau check-out jatuh pada hari yang dihapus, jadi seluruh penginapan dihapus. Pemesanan “{booking}” tetap ada di Pemesanan.',
   'dashboard.shrinkConfirm': 'Hapus hari dan simpan',
   'dashboard.shrinkUnknown':
     'Hari-hari perjalanan ini tidak dapat diperiksa. Jika tanggal baru mencakup lebih sedikit hari, menyimpan akan menghapus hari-hari terakhir beserta semua yang direncanakan di dalamnya.',
diff --git a/shared/src/i18n/id/dayplan.ts b/shared/src/i18n/id/dayplan.ts
index 6552c8a77..bb03e9629 100644
--- a/shared/src/i18n/id/dayplan.ts
+++ b/shared/src/i18n/id/dayplan.ts
@@ -104,11 +104,22 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Check-in atau check-out jatuh pada hari tersebut, jadi penginapan dibatalkan.',
   'dayplan.deleteDayStayBookedHint':
     'Check-in atau check-out jatuh pada hari tersebut, jadi penginapan dibatalkan bersama pemesanan “{booking}” dan pengeluarannya.',
+  'dayplan.deleteDayStayBookingHint':
+    'Check-in atau check-out jatuh pada hari tersebut, jadi penginapan dibatalkan bersama pemesanan “{booking}”.',
+  'dayplan.deleteDayStayPaidHint':
+    'Check-in atau check-out jatuh pada hari tersebut, jadi penginapan dibatalkan bersama pemesanan “{booking}” dan pengeluarannya sebesar {amount}.',
   'dayplan.deleteDayShift': 'Hari berikutnya: {count}',
   'dayplan.deleteDayShiftHint': 'Masing-masing maju satu tanggal.',
   'dayplan.deleteDayShiftBookingsHint': 'Masing-masing maju satu tanggal. Pemesanan yang ikut berpindah: {count}',
   'dayplan.deleteDayShrink': 'Perjalanan kini berakhir pada {date}',
   'dayplan.deleteDayShrinkHint': 'Tidak ada hari tanpa tanggal yang dapat mengambil tanggal terakhir.',
+  'dayplan.impactStayShorter': 'Menginap di {name}: berkurang satu malam',
+  'dayplan.deleteDayStayShorterHint': 'Penginapan ini melewati hari tersebut dan kini check-out pada {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint':
+    'Penginapan ini melewati hari tersebut dan kini berakhir satu hari lebih awal.',
+  'dayplan.deleteDaySpareDated': '{day} mendapat tanggal {date}',
+  'dayplan.deleteDaySpareDatedHint':
+    'Ini hari pertama tanpa tanggal, dan hari ini mengambil tanggal terakhir perjalanan.',
   'dayplan.deleteDayLast': 'Perjalanan memerlukan setidaknya satu hari',
   'dayplan.daysOffline': 'Mengubah hari memerlukan koneksi',
   'dayplan.deleteDaySuccess': 'Hari dihapus',
diff --git a/shared/src/i18n/id/undo.ts b/shared/src/i18n/id/undo.ts
index eaa7328b7..bf4a23910 100644
--- a/shared/src/i18n/id/undo.ts
+++ b/shared/src/i18n/id/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Impor Naver Maps',
   'undo.addPlace': 'Tempat ditambahkan',
   'undo.done': 'Dibatalkan: {action}',
+  'undo.failed': 'Tidak dapat membatalkan: {action}',
   'undo.importBooking': 'Impor konfirmasi pemesanan',
 };
 export default undo;
diff --git a/shared/src/i18n/it/dashboard.ts b/shared/src/i18n/it/dashboard.ts
index bbd44106c..824d2d59e 100644
--- a/shared/src/i18n/it/dashboard.ts
+++ b/shared/src/i18n/it/dashboard.ts
@@ -99,7 +99,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'Sposta tutto',
   'dashboard.dateShiftAllDesc': "L'intero itinerario si sposta con le nuove date, incluse prenotazioni e alloggi.",
   'dashboard.dateShiftHint':
-    "Suggerimento: per spostare solo una parte dell'itinerario, aggiungi un giorno in «Riordina i giorni» nel planner e spostalo dove deve crearsi lo spazio.",
+    "Suggerimento: per spostare solo una parte dell'itinerario, apri «Riordina i giorni» nel planner, aggiungi il giorno dopo la fine del viaggio con il pulsante che ne mostra la data e sposta quel giorno dove deve crearsi lo spazio.",
   'dashboard.shrinkTitle': 'Rimuovere dei giorni?',
   'dashboard.shrinkIntro': 'Salvando le nuove date vengono rimossi questi giorni:',
   'dashboard.shrinkMoreDays': '+{count} altri',
@@ -113,6 +113,8 @@ const dashboard: TranslationStrings = {
     "Il check-in o il check-out cade in un giorno rimosso, quindi viene rimosso l'intero soggiorno.",
   'dashboard.shrinkStayBookedHint':
     "Il check-in o il check-out cade in un giorno rimosso, quindi viene rimosso l'intero soggiorno. La sua prenotazione «{booking}» e la relativa spesa restano in Prenotazioni.",
+  'dashboard.shrinkStayBookingHint':
+    "Il check-in o il check-out cade in un giorno rimosso, quindi viene rimosso l'intero soggiorno. La sua prenotazione «{booking}» resta in Prenotazioni.",
   'dashboard.shrinkConfirm': 'Rimuovi i giorni e salva',
   'dashboard.shrinkUnknown':
     'Non è stato possibile controllare i giorni di questo viaggio. Se le nuove date hanno meno giorni, salvando vengono rimossi gli ultimi giorni e tutto ciò che vi è pianificato.',
diff --git a/shared/src/i18n/it/dayplan.ts b/shared/src/i18n/it/dayplan.ts
index 006810ddd..4d4b48978 100644
--- a/shared/src/i18n/it/dayplan.ts
+++ b/shared/src/i18n/it/dayplan.ts
@@ -105,12 +105,21 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Il check-in o il check-out cade in questo giorno, quindi il soggiorno viene annullato.',
   'dayplan.deleteDayStayBookedHint':
     'Il check-in o il check-out cade in questo giorno, quindi il soggiorno viene annullato insieme alla prenotazione «{booking}» e alla sua spesa.',
+  'dayplan.deleteDayStayBookingHint':
+    'Il check-in o il check-out cade in questo giorno, quindi il soggiorno viene annullato insieme alla prenotazione «{booking}».',
+  'dayplan.deleteDayStayPaidHint':
+    'Il check-in o il check-out cade in questo giorno, quindi il soggiorno viene annullato insieme alla prenotazione «{booking}» e alla sua spesa di {amount}.',
   'dayplan.deleteDayShift': 'Giorni successivi: {count}',
   'dayplan.deleteDayShiftHint': 'Ognuno passa alla data precedente.',
   'dayplan.deleteDayShiftBookingsHint':
     'Ognuno passa alla data precedente. Prenotazioni che si spostano con loro: {count}',
   'dayplan.deleteDayShrink': 'Il viaggio ora termina il {date}',
   'dayplan.deleteDayShrinkHint': "Non c'è alcun giorno senza data che possa prendere l'ultima data.",
+  'dayplan.impactStayShorter': 'Soggiorno presso {name}: una notte in meno',
+  'dayplan.deleteDayStayShorterHint': 'Attraversa questo giorno e ora il check-out è il {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Attraversa questo giorno e ora finisce un giorno prima.',
+  'dayplan.deleteDaySpareDated': '{day} prende la data {date}',
+  'dayplan.deleteDaySpareDatedHint': "È il primo giorno senza data e prende l'ultima data del viaggio.",
   'dayplan.deleteDayLast': 'Un viaggio ha bisogno di almeno un giorno',
   'dayplan.daysOffline': 'Per modificare i giorni serve una connessione',
   'dayplan.deleteDaySuccess': 'Giorno eliminato',
diff --git a/shared/src/i18n/it/undo.ts b/shared/src/i18n/it/undo.ts
index cf0d82a85..07bd7df8e 100644
--- a/shared/src/i18n/it/undo.ts
+++ b/shared/src/i18n/it/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Importazione Naver Maps',
   'undo.addPlace': 'Luogo aggiunto',
   'undo.done': 'Annullato: {action}',
+  'undo.failed': 'Impossibile annullare: {action}',
   'undo.importBooking': 'Importazione conferma prenotazione',
 };
 export default undo;
diff --git a/shared/src/i18n/ja/dashboard.ts b/shared/src/i18n/ja/dashboard.ts
index ff4e929d1..1a029c354 100644
--- a/shared/src/i18n/ja/dashboard.ts
+++ b/shared/src/i18n/ja/dashboard.ts
@@ -111,7 +111,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'すべてを移動する',
   'dashboard.dateShiftAllDesc': '予約や宿泊先を含む旅程全体が新しい日程に合わせて移動します。',
   'dashboard.dateShiftHint':
-    'ヒント：旅程の一部だけをずらしたい場合は、プランナーの「日付を並べ替え」で日を追加し、空けたい位置へ移動してください。',
+    'ヒント：旅程の一部だけをずらしたい場合は、プランナーの「日付を並べ替え」を開き、日付が表示されたボタンで旅行終了の翌日を追加して、その日を空けたい位置へ移動してください。',
   'dashboard.shrinkTitle': '日を削除しますか？',
   'dashboard.shrinkIntro': '新しい日付を保存すると、次の日が削除されます：',
   'dashboard.shrinkMoreDays': 'ほか{count}日',
@@ -123,6 +123,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': '削除される日にチェックインまたはチェックアウトするため、宿泊全体が削除されます。',
   'dashboard.shrinkStayBookedHint':
     '削除される日にチェックインまたはチェックアウトするため、宿泊全体が削除されます。予約「{booking}」とその支出は予約に残ります。',
+  'dashboard.shrinkStayBookingHint':
+    '削除される日にチェックインまたはチェックアウトするため、宿泊全体が削除されます。予約「{booking}」は予約に残ります。',
   'dashboard.shrinkConfirm': '日を削除して保存',
   'dashboard.shrinkUnknown':
     'この旅行の日を確認できませんでした。新しい日付の日数が少ない場合、保存すると最後の日とそこに予定されているものがすべて削除されます。',
diff --git a/shared/src/i18n/ja/dayplan.ts b/shared/src/i18n/ja/dayplan.ts
index 4cf488fbf..a16904572 100644
--- a/shared/src/i18n/ja/dayplan.ts
+++ b/shared/src/i18n/ja/dayplan.ts
@@ -104,11 +104,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'この日にチェックインまたはチェックアウトするため、宿泊はキャンセルされます。',
   'dayplan.deleteDayStayBookedHint':
     'この日にチェックインまたはチェックアウトするため、宿泊は予約「{booking}」とその支出と一緒にキャンセルされます。',
+  'dayplan.deleteDayStayBookingHint':
+    'この日にチェックインまたはチェックアウトするため、宿泊は予約「{booking}」と一緒にキャンセルされます。',
+  'dayplan.deleteDayStayPaidHint':
+    'この日にチェックインまたはチェックアウトするため、宿泊は予約「{booking}」とその支出（{amount}）と一緒にキャンセルされます。',
   'dayplan.deleteDayShift': '以降の日: {count}',
   'dayplan.deleteDayShiftHint': 'それぞれ1日前の日付になります。',
   'dayplan.deleteDayShiftBookingsHint': 'それぞれ1日前の日付になります。一緒に移動する予約: {count}',
   'dayplan.deleteDayShrink': '旅行の終了日は{date}になります',
   'dayplan.deleteDayShrinkHint': '最後の日付を引き継ぐ日付なしの日がありません。',
+  'dayplan.impactStayShorter': '{name}での宿泊: 1泊短くなります',
+  'dayplan.deleteDayStayShorterHint': 'この日をまたぐ宿泊のため、チェックアウトは{date}になります。',
+  'dayplan.deleteDayStayShorterUndatedHint': 'この日をまたぐ宿泊のため、1日早く終わります。',
+  'dayplan.deleteDaySpareDated': '{day}の日付が{date}になります',
+  'dayplan.deleteDaySpareDatedHint': '日付のない最初の日で、旅行の最後の日付を引き継ぎます。',
   'dayplan.deleteDayLast': '旅行には少なくとも1日が必要です',
   'dayplan.daysOffline': '日の変更には接続が必要です',
   'dayplan.deleteDaySuccess': '日を削除しました',
diff --git a/shared/src/i18n/ja/undo.ts b/shared/src/i18n/ja/undo.ts
index c8b9a1e88..eab000c87 100644
--- a/shared/src/i18n/ja/undo.ts
+++ b/shared/src/i18n/ja/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Naverマップをインポート',
   'undo.addPlace': '場所を追加',
   'undo.done': '元に戻しました: {action}',
+  'undo.failed': '元に戻せませんでした: {action}',
   'undo.importBooking': '予約確認書インポート',
 };
 export default undo;
diff --git a/shared/src/i18n/ko/dashboard.ts b/shared/src/i18n/ko/dashboard.ts
index 4a83522e7..586a15e86 100644
--- a/shared/src/i18n/ko/dashboard.ts
+++ b/shared/src/i18n/ko/dashboard.ts
@@ -111,7 +111,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': '모두 이동',
   'dashboard.dateShiftAllDesc': '예약과 숙박을 포함한 전체 일정이 새 날짜로 이동합니다.',
   'dashboard.dateShiftHint':
-    '팁: 일정의 일부만 옮기려면 플래너의 "날짜 순서 변경"에서 날짜를 추가한 뒤 빈칸이 생겨야 할 위치로 옮기세요.',
+    '팁: 일정의 일부만 옮기려면 플래너에서 "날짜 순서 변경"을 열고, 날짜가 표시된 버튼으로 여행 종료 다음 날을 추가한 뒤 그 날을 빈칸이 생겨야 할 위치로 옮기세요.',
   'dashboard.shrinkTitle': '날짜를 삭제할까요?',
   'dashboard.shrinkIntro': '새 날짜를 저장하면 다음 날짜가 삭제됩니다:',
   'dashboard.shrinkMoreDays': '외 {count}일',
@@ -123,6 +123,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': '삭제되는 날짜에 체크인 또는 체크아웃하므로 숙박 전체가 삭제됩니다.',
   'dashboard.shrinkStayBookedHint':
     '삭제되는 날짜에 체크인 또는 체크아웃하므로 숙박 전체가 삭제됩니다. 예약 “{booking}”과 해당 지출은 예약에 남습니다.',
+  'dashboard.shrinkStayBookingHint':
+    '삭제되는 날짜에 체크인 또는 체크아웃하므로 숙박 전체가 삭제됩니다. 예약 “{booking}”은 예약에 남습니다.',
   'dashboard.shrinkConfirm': '날짜 삭제 후 저장',
   'dashboard.shrinkUnknown':
     '이 여행의 날짜를 확인할 수 없습니다. 새 날짜의 일수가 더 적으면 저장 시 마지막 날짜와 그날 계획된 모든 항목이 삭제됩니다.',
diff --git a/shared/src/i18n/ko/dayplan.ts b/shared/src/i18n/ko/dayplan.ts
index 3e0a91332..fe8ba4a4b 100644
--- a/shared/src/i18n/ko/dayplan.ts
+++ b/shared/src/i18n/ko/dayplan.ts
@@ -104,11 +104,19 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': '이 날짜에 체크인 또는 체크아웃하므로 숙박이 취소됩니다.',
   'dayplan.deleteDayStayBookedHint':
     '이 날짜에 체크인 또는 체크아웃하므로 숙박이 예약 “{booking}” 및 해당 지출과 함께 취소됩니다.',
+  'dayplan.deleteDayStayBookingHint': '이 날짜에 체크인 또는 체크아웃하므로 숙박이 예약 “{booking}”과 함께 취소됩니다.',
+  'dayplan.deleteDayStayPaidHint':
+    '이 날짜에 체크인 또는 체크아웃하므로 숙박이 취소되며, 예약 “{booking}”과 해당 지출({amount})도 함께 취소됩니다.',
   'dayplan.deleteDayShift': '이후 날짜: {count}',
   'dayplan.deleteDayShiftHint': '각각 하루씩 앞당겨집니다.',
   'dayplan.deleteDayShiftBookingsHint': '각각 하루씩 앞당겨집니다. 함께 이동하는 예약: {count}',
   'dayplan.deleteDayShrink': '이제 여행이 {date}에 끝납니다',
   'dayplan.deleteDayShrinkHint': '마지막 날짜를 이어받을 날짜 없는 일정이 없습니다.',
+  'dayplan.impactStayShorter': '{name} 숙박: 1박 줄어듦',
+  'dayplan.deleteDayStayShorterHint': '이 날짜에 걸쳐 있어 체크아웃이 {date}(으)로 바뀝니다.',
+  'dayplan.deleteDayStayShorterUndatedHint': '이 날짜에 걸쳐 있어 하루 일찍 끝납니다.',
+  'dayplan.deleteDaySpareDated': '{day}의 날짜가 {date}(으)로 지정됩니다',
+  'dayplan.deleteDaySpareDatedHint': '날짜가 없는 첫 번째 날이며, 여행의 마지막 날짜를 이어받습니다.',
   'dayplan.deleteDayLast': '여행에는 최소 하루가 필요합니다',
   'dayplan.daysOffline': '날짜를 변경하려면 연결이 필요합니다',
   'dayplan.deleteDaySuccess': '날짜가 삭제되었습니다',
diff --git a/shared/src/i18n/ko/undo.ts b/shared/src/i18n/ko/undo.ts
index a4674feb6..069703b26 100644
--- a/shared/src/i18n/ko/undo.ts
+++ b/shared/src/i18n/ko/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': '네이버 지도 가져오기',
   'undo.addPlace': '장소가 추가되었습니다',
   'undo.done': '실행 취소됨: {action}',
+  'undo.failed': '실행 취소하지 못했습니다: {action}',
   'undo.importBooking': '예약 확인서 가져오기',
 };
 export default undo;
diff --git a/shared/src/i18n/nl/dashboard.ts b/shared/src/i18n/nl/dashboard.ts
index 12fc2ddf9..32a1d0d65 100644
--- a/shared/src/i18n/nl/dashboard.ts
+++ b/shared/src/i18n/nl/dashboard.ts
@@ -98,7 +98,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAllDesc':
     'De volledige reisplanning verschuift mee met de nieuwe datums, inclusief reserveringen en accommodaties.',
   'dashboard.dateShiftHint':
-    'Tip: om maar een deel van je reisplanning te verschuiven, voeg je in de planner onder ‘Dagen herordenen’ een dag toe en zet je die op de plek waar het gat moet komen.',
+    'Tip: om maar een deel van je reisplanning te verschuiven, open je in de planner ‘Dagen herordenen’, voeg je met de knop die de datum toont de dag na de reis toe en zet je die dag op de plek waar het gat moet komen.',
   'dashboard.shrinkTitle': 'Dagen verwijderen?',
   'dashboard.shrinkIntro': 'Bij het opslaan van de nieuwe datums worden deze dagen verwijderd:',
   'dashboard.shrinkMoreDays': '+{count} meer',
@@ -112,6 +112,8 @@ const dashboard: TranslationStrings = {
     'Inchecken of uitchecken valt op een dag die wegvalt, dus het hele verblijf wordt verwijderd.',
   'dashboard.shrinkStayBookedHint':
     'Inchecken of uitchecken valt op een dag die wegvalt, dus het hele verblijf wordt verwijderd. De boeking ‘{booking}’ en de bijbehorende uitgave blijven onder Boekingen.',
+  'dashboard.shrinkStayBookingHint':
+    'Inchecken of uitchecken valt op een dag die wegvalt, dus het hele verblijf wordt verwijderd. De boeking ‘{booking}’ blijft onder Boekingen.',
   'dashboard.shrinkConfirm': 'Dagen verwijderen en opslaan',
   'dashboard.shrinkUnknown':
     'De dagen van deze reis konden niet worden gecontroleerd. Hebben de nieuwe datums minder dagen, dan verwijdert opslaan de laatste dagen en alles wat daarop gepland is.',
diff --git a/shared/src/i18n/nl/dayplan.ts b/shared/src/i18n/nl/dayplan.ts
index 5be676650..708257405 100644
--- a/shared/src/i18n/nl/dayplan.ts
+++ b/shared/src/i18n/nl/dayplan.ts
@@ -104,11 +104,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Inchecken of uitchecken valt op deze dag, dus het verblijf wordt geannuleerd.',
   'dayplan.deleteDayStayBookedHint':
     'Inchecken of uitchecken valt op deze dag, dus het verblijf wordt geannuleerd, samen met de boeking ‘{booking}’ en de bijbehorende uitgave.',
+  'dayplan.deleteDayStayBookingHint':
+    'Inchecken of uitchecken valt op deze dag, dus het verblijf wordt geannuleerd, samen met de boeking ‘{booking}’.',
+  'dayplan.deleteDayStayPaidHint':
+    'Inchecken of uitchecken valt op deze dag, dus het verblijf wordt geannuleerd, samen met de boeking ‘{booking}’ en de bijbehorende uitgave van {amount}.',
   'dayplan.deleteDayShift': 'Latere dagen: {count}',
   'dayplan.deleteDayShiftHint': 'Elke dag schuift één datum naar voren.',
   'dayplan.deleteDayShiftBookingsHint': 'Elke dag schuift één datum naar voren. Boekingen die meeschuiven: {count}',
   'dayplan.deleteDayShrink': 'De reis eindigt nu op {date}',
   'dayplan.deleteDayShrinkHint': 'Er is geen dag zonder datum die de laatste datum kan overnemen.',
+  'dayplan.impactStayShorter': 'Verblijf in {name}: een nacht minder',
+  'dayplan.deleteDayStayShorterHint': 'Het loopt over deze dag heen en je checkt nu uit op {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Het loopt over deze dag heen en eindigt nu een dag eerder.',
+  'dayplan.deleteDaySpareDated': '{day} krijgt de datum {date}',
+  'dayplan.deleteDaySpareDatedHint': 'Het is de eerste dag zonder datum en neemt de laatste datum van de reis over.',
   'dayplan.deleteDayLast': 'Een reis heeft minstens één dag nodig',
   'dayplan.daysOffline': 'Dagen wijzigen vraagt een verbinding',
   'dayplan.deleteDaySuccess': 'Dag verwijderd',
diff --git a/shared/src/i18n/nl/undo.ts b/shared/src/i18n/nl/undo.ts
index bdb704b21..83fff3520 100644
--- a/shared/src/i18n/nl/undo.ts
+++ b/shared/src/i18n/nl/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Naver Maps-import',
   'undo.addPlace': 'Locatie toegevoegd',
   'undo.done': 'Ongedaan gemaakt: {action}',
+  'undo.failed': 'Ongedaan maken mislukt: {action}',
   'undo.importBooking': 'Boekingsbevestiging importeren',
 };
 export default undo;
diff --git a/shared/src/i18n/pl/dashboard.ts b/shared/src/i18n/pl/dashboard.ts
index 94e531008..f2ced743d 100644
--- a/shared/src/i18n/pl/dashboard.ts
+++ b/shared/src/i18n/pl/dashboard.ts
@@ -93,7 +93,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'Przesuń wszystko',
   'dashboard.dateShiftAllDesc': 'Cały plan podróży przesunie się wraz z nowymi datami, w tym rezerwacje i noclegi.',
   'dashboard.dateShiftHint':
-    'Wskazówka: aby przesunąć tylko część planu podróży, dodaj dzień w „Zmień kolejność dni” w planerze i przenieś go tam, gdzie ma powstać przerwa.',
+    'Wskazówka: aby przesunąć tylko część planu podróży, otwórz w planerze „Zmień kolejność dni”, dodaj dzień po zakończeniu podróży przyciskiem z jego datą i przenieś ten dzień tam, gdzie ma powstać przerwa.',
   'dashboard.shrinkTitle': 'Usunąć dni?',
   'dashboard.shrinkIntro': 'Zapisanie nowych dat usunie te dni:',
   'dashboard.shrinkMoreDays': '+{count} więcej',
@@ -106,6 +106,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'Zameldowanie lub wymeldowanie przypada na usuwany dzień, więc usuwany jest cały nocleg.',
   'dashboard.shrinkStayBookedHint':
     'Zameldowanie lub wymeldowanie przypada na usuwany dzień, więc usuwany jest cały nocleg. Jego rezerwacja „{booking}” i jej wydatek pozostają w Rezerwacjach.',
+  'dashboard.shrinkStayBookingHint':
+    'Zameldowanie lub wymeldowanie przypada na usuwany dzień, więc usuwany jest cały nocleg. Jego rezerwacja „{booking}” pozostaje w Rezerwacjach.',
   'dashboard.shrinkConfirm': 'Usuń dni i zapisz',
   'dashboard.shrinkUnknown':
     'Nie udało się sprawdzić dni tej podróży. Jeśli nowe daty obejmują mniej dni, zapisanie usunie ostatnie dni i wszystko, co na nie zaplanowano.',
diff --git a/shared/src/i18n/pl/dayplan.ts b/shared/src/i18n/pl/dayplan.ts
index 8e94a50ee..6254bb487 100644
--- a/shared/src/i18n/pl/dayplan.ts
+++ b/shared/src/i18n/pl/dayplan.ts
@@ -105,12 +105,21 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Zameldowanie lub wymeldowanie przypada na ten dzień, więc nocleg zostanie anulowany.',
   'dayplan.deleteDayStayBookedHint':
     'Zameldowanie lub wymeldowanie przypada na ten dzień, więc nocleg zostanie anulowany razem z rezerwacją „{booking}” i jej wydatkiem.',
+  'dayplan.deleteDayStayBookingHint':
+    'Zameldowanie lub wymeldowanie przypada na ten dzień, więc nocleg zostanie anulowany razem z rezerwacją „{booking}”.',
+  'dayplan.deleteDayStayPaidHint':
+    'Zameldowanie lub wymeldowanie przypada na ten dzień, więc nocleg zostanie anulowany razem z rezerwacją „{booking}” i jej wydatkiem w kwocie {amount}.',
   'dayplan.deleteDayShift': 'Późniejsze dni: {count}',
   'dayplan.deleteDayShiftHint': 'Każdy przesuwa się o jedną datę wcześniej.',
   'dayplan.deleteDayShiftBookingsHint':
     'Każdy przesuwa się o jedną datę wcześniej. Rezerwacje przesuwane razem z nimi: {count}',
   'dayplan.deleteDayShrink': 'Podróż kończy się teraz {date}',
   'dayplan.deleteDayShrinkHint': 'Nie ma dnia bez daty, który mógłby przejąć ostatnią datę.',
+  'dayplan.impactStayShorter': 'Nocleg w {name}: o jedną noc krócej',
+  'dayplan.deleteDayStayShorterHint': 'Obejmuje ten dzień, więc wymeldowanie przypada teraz na {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Obejmuje ten dzień, więc kończy się teraz dzień wcześniej.',
+  'dayplan.deleteDaySpareDated': '{day} otrzymuje datę {date}',
+  'dayplan.deleteDaySpareDatedHint': 'To pierwszy dzień bez daty i przejmuje ostatnią datę podróży.',
   'dayplan.deleteDayLast': 'Podróż musi mieć co najmniej jeden dzień',
   'dayplan.daysOffline': 'Zmiana dni wymaga połączenia',
   'dayplan.deleteDaySuccess': 'Dzień usunięty',
diff --git a/shared/src/i18n/pl/undo.ts b/shared/src/i18n/pl/undo.ts
index 6f62e4577..44dc63c26 100644
--- a/shared/src/i18n/pl/undo.ts
+++ b/shared/src/i18n/pl/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Import Naver Maps',
   'undo.addPlace': 'Miejsce dodane',
   'undo.done': 'Cofnięto: {action}',
+  'undo.failed': 'Nie udało się cofnąć: {action}',
   'undo.importBooking': 'Import potwierdzenia rezerwacji',
 };
 export default undo;
diff --git a/shared/src/i18n/ru/dashboard.ts b/shared/src/i18n/ru/dashboard.ts
index 0f2cf8c4b..669178305 100644
--- a/shared/src/i18n/ru/dashboard.ts
+++ b/shared/src/i18n/ru/dashboard.ts
@@ -96,7 +96,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'Перенести всё',
   'dashboard.dateShiftAllDesc': 'Весь маршрут переносится на новые даты, включая бронирования и жильё.',
   'dashboard.dateShiftHint':
-    'Совет: чтобы сдвинуть только часть маршрута, добавьте день в разделе «Изменить порядок дней» в планировщике и переместите его туда, где должен появиться промежуток.',
+    'Совет: чтобы сдвинуть только часть маршрута, откройте в планировщике «Изменить порядок дней», добавьте день после окончания поездки кнопкой с его датой и переместите этот день туда, где должен появиться промежуток.',
   'dashboard.shrinkTitle': 'Удалить дни?',
   'dashboard.shrinkIntro': 'При сохранении новых дат будут удалены эти дни:',
   'dashboard.shrinkMoreDays': 'ещё +{count}',
@@ -109,6 +109,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'Заезд или выезд приходится на удаляемый день, поэтому проживание удаляется целиком.',
   'dashboard.shrinkStayBookedHint':
     'Заезд или выезд приходится на удаляемый день, поэтому проживание удаляется целиком. Его бронирование «{booking}» и расход по нему останутся в Бронированиях.',
+  'dashboard.shrinkStayBookingHint':
+    'Заезд или выезд приходится на удаляемый день, поэтому проживание удаляется целиком. Его бронирование «{booking}» останется в Бронированиях.',
   'dashboard.shrinkConfirm': 'Удалить дни и сохранить',
   'dashboard.shrinkUnknown':
     'Не удалось проверить дни этой поездки. Если в новых датах меньше дней, при сохранении будут удалены последние дни и всё, что на них запланировано.',
diff --git a/shared/src/i18n/ru/dayplan.ts b/shared/src/i18n/ru/dayplan.ts
index 061d872f9..fc9464d8d 100644
--- a/shared/src/i18n/ru/dayplan.ts
+++ b/shared/src/i18n/ru/dayplan.ts
@@ -104,12 +104,21 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Заезд или выезд приходится на этот день, поэтому проживание отменяется.',
   'dayplan.deleteDayStayBookedHint':
     'Заезд или выезд приходится на этот день, поэтому проживание отменяется вместе с бронированием «{booking}» и его расходом.',
+  'dayplan.deleteDayStayBookingHint':
+    'Заезд или выезд приходится на этот день, поэтому проживание отменяется вместе с бронированием «{booking}».',
+  'dayplan.deleteDayStayPaidHint':
+    'Заезд или выезд приходится на этот день, поэтому проживание отменяется вместе с бронированием «{booking}» и его расходом на {amount}.',
   'dayplan.deleteDayShift': 'Последующие дни: {count}',
   'dayplan.deleteDayShiftHint': 'Каждый сдвигается на одну дату раньше.',
   'dayplan.deleteDayShiftBookingsHint':
     'Каждый сдвигается на одну дату раньше. Бронирования, которые сдвигаются вместе с ними: {count}',
   'dayplan.deleteDayShrink': 'Теперь поездка заканчивается {date}',
   'dayplan.deleteDayShrinkHint': 'Нет дня без даты, который мог бы занять последнюю дату.',
+  'dayplan.impactStayShorter': 'Проживание в {name}: на одну ночь меньше',
+  'dayplan.deleteDayStayShorterHint': 'Оно проходит через этот день, и выезд теперь {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Оно проходит через этот день и теперь заканчивается на день раньше.',
+  'dayplan.deleteDaySpareDated': '{day} получает дату {date}',
+  'dayplan.deleteDaySpareDatedHint': 'Это первый день без даты, и он получает последнюю дату поездки.',
   'dayplan.deleteDayLast': 'В поездке должен быть хотя бы один день',
   'dayplan.daysOffline': 'Для изменения дней нужно подключение',
   'dayplan.deleteDaySuccess': 'День удалён',
diff --git a/shared/src/i18n/ru/undo.ts b/shared/src/i18n/ru/undo.ts
index 61e0009b4..ce95922e4 100644
--- a/shared/src/i18n/ru/undo.ts
+++ b/shared/src/i18n/ru/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Импорт из Naver Maps',
   'undo.addPlace': 'Место добавлено',
   'undo.done': 'Отменено: {action}',
+  'undo.failed': 'Не удалось отменить: {action}',
   'undo.importBooking': 'Импорт подтверждения бронирования',
 };
 export default undo;
diff --git a/shared/src/i18n/sv/dashboard.ts b/shared/src/i18n/sv/dashboard.ts
index 54a8f3843..8fe201716 100644
--- a/shared/src/i18n/sv/dashboard.ts
+++ b/shared/src/i18n/sv/dashboard.ts
@@ -110,7 +110,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'Flytta allt',
   'dashboard.dateShiftAllDesc': 'Hela resplanen flyttas med de nya datumen, inklusive bokningar och boenden.',
   'dashboard.dateShiftHint':
-    'Tips: om du bara vill flytta en del av resplanen kan du lägga till en dag under ”Sortera om dagar” i planeraren och flytta den dit luckan ska vara.',
+    'Tips: om du bara vill flytta en del av resplanen öppnar du ”Sortera om dagar” i planeraren, lägger till dagen efter resans slut med knappen som visar dess datum och flyttar den dagen dit luckan ska vara.',
   'dashboard.shrinkTitle': 'Ta bort dagar?',
   'dashboard.shrinkIntro': 'När de nya datumen sparas tas de här dagarna bort:',
   'dashboard.shrinkMoreDays': '+{count} till',
@@ -123,6 +123,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'Incheckning eller utcheckning sker en dag som tas bort, så hela boendet tas bort.',
   'dashboard.shrinkStayBookedHint':
     'Incheckning eller utcheckning sker en dag som tas bort, så hela boendet tas bort. Bokningen ”{booking}” och dess utgift ligger kvar under Bokningar.',
+  'dashboard.shrinkStayBookingHint':
+    'Incheckning eller utcheckning sker en dag som tas bort, så hela boendet tas bort. Bokningen ”{booking}” ligger kvar under Bokningar.',
   'dashboard.shrinkConfirm': 'Ta bort dagar och spara',
   'dashboard.shrinkUnknown':
     'Resans dagar kunde inte kontrolleras. Om de nya datumen rymmer färre dagar tar sparandet bort de sista dagarna och allt som är planerat på dem.',
diff --git a/shared/src/i18n/sv/dayplan.ts b/shared/src/i18n/sv/dayplan.ts
index 7f4bdad1f..b4bfec6de 100644
--- a/shared/src/i18n/sv/dayplan.ts
+++ b/shared/src/i18n/sv/dayplan.ts
@@ -105,11 +105,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Incheckning eller utcheckning sker den här dagen, så boendet avbokas.',
   'dayplan.deleteDayStayBookedHint':
     'Incheckning eller utcheckning sker den här dagen, så boendet avbokas tillsammans med bokningen ”{booking}” och dess utgift.',
+  'dayplan.deleteDayStayBookingHint':
+    'Incheckning eller utcheckning sker den här dagen, så boendet avbokas tillsammans med bokningen ”{booking}”.',
+  'dayplan.deleteDayStayPaidHint':
+    'Incheckning eller utcheckning sker den här dagen, så boendet avbokas tillsammans med bokningen ”{booking}” och dess utgift på {amount}.',
   'dayplan.deleteDayShift': 'Senare dagar: {count}',
   'dayplan.deleteDayShiftHint': 'Var och en flyttas ett datum tidigare.',
   'dayplan.deleteDayShiftBookingsHint': 'Var och en flyttas ett datum tidigare. Bokningar som följer med: {count}',
   'dayplan.deleteDayShrink': 'Resan slutar nu {date}',
   'dayplan.deleteDayShrinkHint': 'Det finns ingen dag utan datum som kan ta över det sista datumet.',
+  'dayplan.impactStayShorter': 'Boende på {name}: en natt kortare',
+  'dayplan.deleteDayStayShorterHint': 'Det sträcker sig över den här dagen och utcheckningen är nu {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Det sträcker sig över den här dagen och slutar nu en dag tidigare.',
+  'dayplan.deleteDaySpareDated': '{day} får datumet {date}',
+  'dayplan.deleteDaySpareDatedHint': 'Det är den första dagen utan datum, och den tar över resans sista datum.',
   'dayplan.deleteDayLast': 'En resa behöver minst en dag',
   'dayplan.daysOffline': 'Att ändra dagar kräver en anslutning',
   'dayplan.deleteDaySuccess': 'Dagen togs bort',
diff --git a/shared/src/i18n/sv/undo.ts b/shared/src/i18n/sv/undo.ts
index c868870d7..31394253e 100644
--- a/shared/src/i18n/sv/undo.ts
+++ b/shared/src/i18n/sv/undo.ts
@@ -20,5 +20,6 @@ const undo: TranslationStrings = {
   'undo.importBooking': 'Boknings godkännande importering',
   'undo.addPlace': 'Plats tillagd',
   'undo.done': 'Återställd: {action}',
+  'undo.failed': 'Det gick inte att ångra: {action}',
 };
 export default undo;
diff --git a/shared/src/i18n/tr/dashboard.ts b/shared/src/i18n/tr/dashboard.ts
index bd93bdcfe..c2098257a 100644
--- a/shared/src/i18n/tr/dashboard.ts
+++ b/shared/src/i18n/tr/dashboard.ts
@@ -111,7 +111,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'Her şeyi kaydır',
   'dashboard.dateShiftAllDesc': 'Rezervasyonlar ve konaklamalar dahil tüm plan yeni tarihlerle birlikte taşınır.',
   'dashboard.dateShiftHint':
-    'İpucu: planın yalnızca bir kısmını kaydırmak için planlayıcıda “Günleri yeniden sırala” altında bir gün ekleyin ve boşluğun olacağı yere taşıyın.',
+    'İpucu: planın yalnızca bir kısmını kaydırmak için planlayıcıda “Günleri yeniden sırala”yı açın, seyahatin bitişinden sonraki günü tarihini gösteren düğmeyle ekleyin ve o günü boşluğun olacağı yere taşıyın.',
   'dashboard.shrinkTitle': 'Günler kaldırılsın mı?',
   'dashboard.shrinkIntro': 'Yeni tarihler kaydedilince bu günler kaldırılır:',
   'dashboard.shrinkMoreDays': '+{count} daha',
@@ -124,6 +124,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'Giriş veya çıkış kaldırılan bir güne denk geldiği için konaklamanın tamamı kaldırılır.',
   'dashboard.shrinkStayBookedHint':
     'Giriş veya çıkış kaldırılan bir güne denk geldiği için konaklamanın tamamı kaldırılır. “{booking}” rezervasyonu ve harcaması Rezervasyonlar altında kalır.',
+  'dashboard.shrinkStayBookingHint':
+    'Giriş veya çıkış kaldırılan bir güne denk geldiği için konaklamanın tamamı kaldırılır. “{booking}” rezervasyonu Rezervasyonlar altında kalır.',
   'dashboard.shrinkConfirm': 'Günleri kaldır ve kaydet',
   'dashboard.shrinkUnknown':
     'Bu seyahatin günleri kontrol edilemedi. Yeni tarihler daha az gün içeriyorsa kaydetmek son günleri ve bunlara planlanan her şeyi kaldırır.',
diff --git a/shared/src/i18n/tr/dayplan.ts b/shared/src/i18n/tr/dayplan.ts
index 317ffbb37..aefa0194d 100644
--- a/shared/src/i18n/tr/dayplan.ts
+++ b/shared/src/i18n/tr/dayplan.ts
@@ -104,11 +104,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Giriş veya çıkış bu güne denk geldiği için konaklama iptal edilir.',
   'dayplan.deleteDayStayBookedHint':
     'Giriş veya çıkış bu güne denk geldiği için konaklama, “{booking}” rezervasyonu ve harcamasıyla birlikte iptal edilir.',
+  'dayplan.deleteDayStayBookingHint':
+    'Giriş veya çıkış bu güne denk geldiği için konaklama, “{booking}” rezervasyonuyla birlikte iptal edilir.',
+  'dayplan.deleteDayStayPaidHint':
+    'Giriş veya çıkış bu güne denk geldiği için konaklama, “{booking}” rezervasyonu ve {amount} tutarındaki harcamasıyla birlikte iptal edilir.',
   'dayplan.deleteDayShift': 'Sonraki günler: {count}',
   'dayplan.deleteDayShiftHint': 'Her biri bir tarih öne kayar.',
   'dayplan.deleteDayShiftBookingsHint': 'Her biri bir tarih öne kayar. Onlarla birlikte kayan rezervasyonlar: {count}',
   'dayplan.deleteDayShrink': 'Seyahat artık {date} tarihinde bitiyor',
   'dayplan.deleteDayShrinkHint': 'Son tarihi devralacak tarihsiz bir gün yok.',
+  'dayplan.impactStayShorter': '{name} konaklaması: bir gece daha kısa',
+  'dayplan.deleteDayStayShorterHint': 'Bu günü kapsadığı için çıkış artık {date} tarihinde.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Bu günü kapsadığı için artık bir gün erken biter.',
+  'dayplan.deleteDaySpareDated': '{day} yeni tarihini alır: {date}',
+  'dayplan.deleteDaySpareDatedHint': 'Tarihi olmayan ilk gündür ve seyahatin son tarihini devralır.',
   'dayplan.deleteDayLast': 'Bir seyahatin en az bir günü olmalı',
   'dayplan.daysOffline': 'Günleri değiştirmek için bağlantı gerekir',
   'dayplan.deleteDaySuccess': 'Gün silindi',
diff --git a/shared/src/i18n/tr/undo.ts b/shared/src/i18n/tr/undo.ts
index f3fc60772..bb87acc36 100644
--- a/shared/src/i18n/tr/undo.ts
+++ b/shared/src/i18n/tr/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Naver Haritalar içe aktarma',
   'undo.addPlace': 'Yer eklendi',
   'undo.done': 'Geri alındı: {action}',
+  'undo.failed': 'Geri alınamadı: {action}',
   'undo.importBooking': 'Rezervasyon onayı içe aktarma',
 };
 export default undo;
diff --git a/shared/src/i18n/uk/dashboard.ts b/shared/src/i18n/uk/dashboard.ts
index 97d3d41d4..3801182b7 100644
--- a/shared/src/i18n/uk/dashboard.ts
+++ b/shared/src/i18n/uk/dashboard.ts
@@ -112,7 +112,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'Перемістити все',
   'dashboard.dateShiftAllDesc': 'Весь маршрут переміщується на нові дати, включно з бронюваннями та проживанням.',
   'dashboard.dateShiftHint':
-    'Порада: щоб зсунути лише частину маршруту, додайте день у розділі «Змінити порядок днів» у планувальнику й перемістіть його туди, де має з’явитися проміжок.',
+    'Порада: щоб зсунути лише частину маршруту, відкрийте в планувальнику «Змінити порядок днів», додайте день після завершення подорожі кнопкою з його датою й перемістіть цей день туди, де має з’явитися проміжок.',
   'dashboard.shrinkTitle': 'Видалити дні?',
   'dashboard.shrinkIntro': 'Під час збереження нових дат буде видалено ці дні:',
   'dashboard.shrinkMoreDays': 'ще +{count}',
@@ -125,6 +125,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'Заїзд або виїзд припадає на день, що видаляється, тому проживання видаляється повністю.',
   'dashboard.shrinkStayBookedHint':
     'Заїзд або виїзд припадає на день, що видаляється, тому проживання видаляється повністю. Його бронювання «{booking}» і витрата за ним залишаться в Бронюваннях.',
+  'dashboard.shrinkStayBookingHint':
+    'Заїзд або виїзд припадає на день, що видаляється, тому проживання видаляється повністю. Його бронювання «{booking}» залишиться в Бронюваннях.',
   'dashboard.shrinkConfirm': 'Видалити дні й зберегти',
   'dashboard.shrinkUnknown':
     'Не вдалося перевірити дні цієї подорожі. Якщо в нових датах менше днів, під час збереження буде видалено останні дні й усе, що на них заплановано.',
diff --git a/shared/src/i18n/uk/dayplan.ts b/shared/src/i18n/uk/dayplan.ts
index 16721d846..169d78415 100644
--- a/shared/src/i18n/uk/dayplan.ts
+++ b/shared/src/i18n/uk/dayplan.ts
@@ -104,12 +104,21 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Заїзд або виїзд припадає на цей день, тому проживання скасовується.',
   'dayplan.deleteDayStayBookedHint':
     'Заїзд або виїзд припадає на цей день, тому проживання скасовується разом із бронюванням «{booking}» і його витратою.',
+  'dayplan.deleteDayStayBookingHint':
+    'Заїзд або виїзд припадає на цей день, тому проживання скасовується разом із бронюванням «{booking}».',
+  'dayplan.deleteDayStayPaidHint':
+    'Заїзд або виїзд припадає на цей день, тому проживання скасовується разом із бронюванням «{booking}» і його витратою на {amount}.',
   'dayplan.deleteDayShift': 'Наступні дні: {count}',
   'dayplan.deleteDayShiftHint': 'Кожен зсувається на одну дату раніше.',
   'dayplan.deleteDayShiftBookingsHint':
     'Кожен зсувається на одну дату раніше. Бронювання, що зсуваються разом із ними: {count}',
   'dayplan.deleteDayShrink': 'Тепер подорож закінчується {date}',
   'dayplan.deleteDayShrinkHint': 'Немає дня без дати, який міг би зайняти останню дату.',
+  'dayplan.impactStayShorter': 'Проживання в {name}: на одну ніч менше',
+  'dayplan.deleteDayStayShorterHint': 'Воно проходить через цей день, і виїзд тепер {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Воно проходить через цей день і тепер закінчується на день раніше.',
+  'dayplan.deleteDaySpareDated': '{day} отримує дату {date}',
+  'dayplan.deleteDaySpareDatedHint': 'Це перший день без дати, і він отримує останню дату подорожі.',
   'dayplan.deleteDayLast': 'Подорож має містити щонайменше один день',
   'dayplan.daysOffline': 'Для зміни днів потрібне з’єднання',
   'dayplan.deleteDaySuccess': 'День видалено',
diff --git a/shared/src/i18n/uk/undo.ts b/shared/src/i18n/uk/undo.ts
index 977cc1196..57de9dbb2 100644
--- a/shared/src/i18n/uk/undo.ts
+++ b/shared/src/i18n/uk/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Імпорт з Naver Maps',
   'undo.addPlace': 'Місце додано',
   'undo.done': 'Відмінено: {action}',
+  'undo.failed': 'Не вдалося відмінити: {action}',
   'undo.importBooking': 'Імпорт підтвердження бронювання',
 };
 export default undo;
diff --git a/shared/src/i18n/vi/dashboard.ts b/shared/src/i18n/vi/dashboard.ts
index 12cc9f91f..159f7f407 100644
--- a/shared/src/i18n/vi/dashboard.ts
+++ b/shared/src/i18n/vi/dashboard.ts
@@ -105,7 +105,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': 'Dời tất cả',
   'dashboard.dateShiftAllDesc': 'Toàn bộ lịch trình sẽ dời theo ngày mới, bao gồm cả đặt chỗ và chỗ ở.',
   'dashboard.dateShiftHint':
-    'Mẹo: để chỉ dời một phần lịch trình, hãy thêm một ngày trong “Sắp xếp lại ngày” ở trình lập kế hoạch rồi chuyển nó đến chỗ cần tạo khoảng trống.',
+    'Mẹo: để chỉ dời một phần lịch trình, hãy mở “Sắp xếp lại ngày” trong trình lập kế hoạch, thêm ngày sau khi chuyến đi kết thúc bằng nút hiển thị ngày đó, rồi chuyển ngày đó đến chỗ cần tạo khoảng trống.',
   'dashboard.shrinkTitle': 'Bỏ bớt ngày?',
   'dashboard.shrinkIntro': 'Khi lưu ngày mới, những ngày này sẽ bị bỏ:',
   'dashboard.shrinkMoreDays': '+{count} ngày khác',
@@ -118,6 +118,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': 'Nhận phòng hoặc trả phòng rơi vào một ngày bị bỏ, nên toàn bộ chỗ lưu trú bị bỏ.',
   'dashboard.shrinkStayBookedHint':
     'Nhận phòng hoặc trả phòng rơi vào một ngày bị bỏ, nên toàn bộ chỗ lưu trú bị bỏ. Đặt chỗ “{booking}” và chi phí của nó vẫn nằm trong Đặt chỗ.',
+  'dashboard.shrinkStayBookingHint':
+    'Nhận phòng hoặc trả phòng rơi vào một ngày bị bỏ, nên toàn bộ chỗ lưu trú bị bỏ. Đặt chỗ “{booking}” vẫn nằm trong Đặt chỗ.',
   'dashboard.shrinkConfirm': 'Bỏ ngày và lưu',
   'dashboard.shrinkUnknown':
     'Không thể kiểm tra các ngày của chuyến đi này. Nếu ngày mới có ít ngày hơn, việc lưu sẽ bỏ những ngày cuối và mọi thứ đã lên kế hoạch trong đó.',
diff --git a/shared/src/i18n/vi/dayplan.ts b/shared/src/i18n/vi/dayplan.ts
index 944c053e6..fd22569b7 100644
--- a/shared/src/i18n/vi/dayplan.ts
+++ b/shared/src/i18n/vi/dayplan.ts
@@ -104,11 +104,20 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayStayHint': 'Nhận phòng hoặc trả phòng rơi vào ngày này, nên chỗ lưu trú bị hủy.',
   'dayplan.deleteDayStayBookedHint':
     'Nhận phòng hoặc trả phòng rơi vào ngày này, nên chỗ lưu trú bị hủy cùng với đặt chỗ “{booking}” và chi phí của nó.',
+  'dayplan.deleteDayStayBookingHint':
+    'Nhận phòng hoặc trả phòng rơi vào ngày này, nên chỗ lưu trú bị hủy cùng với đặt chỗ “{booking}”.',
+  'dayplan.deleteDayStayPaidHint':
+    'Nhận phòng hoặc trả phòng rơi vào ngày này, nên chỗ lưu trú bị hủy cùng với đặt chỗ “{booking}” và khoản chi {amount} của nó.',
   'dayplan.deleteDayShift': 'Các ngày sau: {count}',
   'dayplan.deleteDayShiftHint': 'Mỗi ngày được chuyển sớm hơn một ngày.',
   'dayplan.deleteDayShiftBookingsHint': 'Mỗi ngày được chuyển sớm hơn một ngày. Đặt chỗ di chuyển theo: {count}',
   'dayplan.deleteDayShrink': 'Chuyến đi giờ kết thúc vào {date}',
   'dayplan.deleteDayShrinkHint': 'Không còn ngày nào chưa có ngày tháng để nhận ngày cuối cùng.',
+  'dayplan.impactStayShorter': 'Lưu trú tại {name}: bớt một đêm',
+  'dayplan.deleteDayStayShorterHint': 'Chỗ lưu trú kéo dài qua ngày này và giờ trả phòng vào {date}.',
+  'dayplan.deleteDayStayShorterUndatedHint': 'Chỗ lưu trú kéo dài qua ngày này và giờ kết thúc sớm hơn một ngày.',
+  'dayplan.deleteDaySpareDated': '{day} nhận ngày {date}',
+  'dayplan.deleteDaySpareDatedHint': 'Đây là ngày đầu tiên chưa có ngày, và nó nhận ngày cuối cùng của chuyến đi.',
   'dayplan.deleteDayLast': 'Một chuyến đi cần ít nhất một ngày',
   'dayplan.daysOffline': 'Cần có kết nối để thay đổi ngày',
   'dayplan.deleteDaySuccess': 'Đã xóa ngày',
diff --git a/shared/src/i18n/vi/undo.ts b/shared/src/i18n/vi/undo.ts
index ae136ca2f..f7212f071 100644
--- a/shared/src/i18n/vi/undo.ts
+++ b/shared/src/i18n/vi/undo.ts
@@ -20,5 +20,6 @@ const undo: TranslationStrings = {
   'undo.importBooking': 'Nhập xác nhận đặt chỗ',
   'undo.addPlace': 'Đã thêm địa điểm',
   'undo.done': 'Hoàn tác: {action}',
+  'undo.failed': 'Không thể hoàn tác: {action}',
 };
 export default undo;
diff --git a/shared/src/i18n/zh-TW/dashboard.ts b/shared/src/i18n/zh-TW/dashboard.ts
index 457cd4988..4d74ae28d 100644
--- a/shared/src/i18n/zh-TW/dashboard.ts
+++ b/shared/src/i18n/zh-TW/dashboard.ts
@@ -96,7 +96,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': '全部移動',
   'dashboard.dateShiftAllDesc': '整個行程都會隨新日期移動，包括預訂和住宿。',
   'dashboard.dateShiftHint':
-    '提示：若只想移動部分行程，請在規劃頁面的「重新排序日期」中新增一天，並將它移到需要空出的位置。',
+    '提示：若只想移動部分行程，請在規劃頁面開啟「重新排序日期」，用顯示日期的按鈕新增行程結束後的那一天，再將它移到需要空出的位置。',
   'dashboard.shrinkTitle': '移除天數？',
   'dashboard.shrinkIntro': '儲存新日期後，將移除以下這些天：',
   'dashboard.shrinkMoreDays': '另外 {count} 天',
@@ -107,6 +107,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': '入住或退房在被移除的某一天，因此整個住宿都會被移除。',
   'dashboard.shrinkStayBookedHint':
     '入住或退房在被移除的某一天，因此整個住宿都會被移除。其預訂「{booking}」及費用會保留在「預訂」中。',
+  'dashboard.shrinkStayBookingHint':
+    '入住或退房在被移除的某一天，因此整個住宿都會被移除。其預訂「{booking}」會保留在「預訂」中。',
   'dashboard.shrinkConfirm': '移除天數並儲存',
   'dashboard.shrinkUnknown':
     '無法檢查此旅行的天數。如果新日期包含的天數較少，儲存時會移除最後幾天及其中規劃的所有內容。',
diff --git a/shared/src/i18n/zh-TW/dayplan.ts b/shared/src/i18n/zh-TW/dayplan.ts
index 33d9f89c6..34412fc38 100644
--- a/shared/src/i18n/zh-TW/dayplan.ts
+++ b/shared/src/i18n/zh-TW/dayplan.ts
@@ -102,11 +102,19 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayBookingsHint': '它們會保留在「預訂」中，但不再屬於任何一天。',
   'dayplan.deleteDayStayHint': '入住或退房在這一天，因此住宿會被取消。',
   'dayplan.deleteDayStayBookedHint': '入住或退房在這一天，因此住宿會被取消，同時取消預訂「{booking}」及其費用。',
+  'dayplan.deleteDayStayBookingHint': '入住或退房在這一天，因此住宿會被取消，同時取消預訂「{booking}」。',
+  'dayplan.deleteDayStayPaidHint':
+    '入住或退房在這一天，因此住宿會被取消，同時取消預訂「{booking}」及其 {amount} 的費用。',
   'dayplan.deleteDayShift': '之後的日期：{count}',
   'dayplan.deleteDayShiftHint': '每一天都會提前一個日期。',
   'dayplan.deleteDayShiftBookingsHint': '每一天都會提前一個日期。隨之移動的預訂：{count}',
   'dayplan.deleteDayShrink': '行程現在結束於 {date}',
   'dayplan.deleteDayShrinkHint': '沒有未設定日期的一天可以接替最後一個日期。',
+  'dayplan.impactStayShorter': '住宿：{name}，少住一晚',
+  'dayplan.deleteDayStayShorterHint': '這段住宿跨越這一天，現在於 {date} 退房。',
+  'dayplan.deleteDayStayShorterUndatedHint': '這段住宿跨越這一天，現在提前一天結束。',
+  'dayplan.deleteDaySpareDated': '{day} 取得日期 {date}',
+  'dayplan.deleteDaySpareDatedHint': '這是第一個沒有日期的日子，它會使用行程的最後一個日期。',
   'dayplan.deleteDayLast': '行程至少需要一天',
   'dayplan.daysOffline': '變更日期需要網路連線',
   'dayplan.deleteDaySuccess': '已刪除這一天',
diff --git a/shared/src/i18n/zh-TW/undo.ts b/shared/src/i18n/zh-TW/undo.ts
index 261997c0e..577de1642 100644
--- a/shared/src/i18n/zh-TW/undo.ts
+++ b/shared/src/i18n/zh-TW/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Naver 地圖匯入',
   'undo.addPlace': '地點已新增',
   'undo.done': '已撤銷：{action}',
+  'undo.failed': '無法復原：{action}',
   'undo.importBooking': '匯入訂位確認',
 };
 export default undo;
diff --git a/shared/src/i18n/zh/dashboard.ts b/shared/src/i18n/zh/dashboard.ts
index 657ec3c70..f0d79b954 100644
--- a/shared/src/i18n/zh/dashboard.ts
+++ b/shared/src/i18n/zh/dashboard.ts
@@ -96,7 +96,7 @@ const dashboard: TranslationStrings = {
   'dashboard.dateShiftAll': '全部顺移',
   'dashboard.dateShiftAllDesc': '整个行程将随新日期移动，包括预订和住宿。',
   'dashboard.dateShiftHint':
-    '提示：如需仅移动部分行程，请在行程规划的“调整日期顺序”中添加一天，并将其移到需要留出空档的位置。',
+    '提示：如需仅移动部分行程，请在行程规划中打开“调整日期顺序”，用显示日期的按钮添加行程结束后的那一天，再将这一天移到需要留出空档的位置。',
   'dashboard.shrinkTitle': '移除天数？',
   'dashboard.shrinkIntro': '保存新日期后，将移除以下这些天：',
   'dashboard.shrinkMoreDays': '另外 {count} 天',
@@ -107,6 +107,8 @@ const dashboard: TranslationStrings = {
   'dashboard.shrinkStayHint': '入住或退房在被移除的某一天，因此整个住宿都会被移除。',
   'dashboard.shrinkStayBookedHint':
     '入住或退房在被移除的某一天，因此整个住宿都会被移除。其预订“{booking}”及费用会保留在“预订”中。',
+  'dashboard.shrinkStayBookingHint':
+    '入住或退房在被移除的某一天，因此整个住宿都会被移除。其预订“{booking}”会保留在“预订”中。',
   'dashboard.shrinkConfirm': '移除天数并保存',
   'dashboard.shrinkUnknown':
     '无法检查此旅行的天数。如果新日期包含的天数更少，保存时会移除最后几天及其中计划的所有内容。',
diff --git a/shared/src/i18n/zh/dayplan.ts b/shared/src/i18n/zh/dayplan.ts
index 4ba097823..72456a657 100644
--- a/shared/src/i18n/zh/dayplan.ts
+++ b/shared/src/i18n/zh/dayplan.ts
@@ -102,11 +102,19 @@ const dayplan: TranslationStrings = {
   'dayplan.deleteDayBookingsHint': '它们会保留在“预订”中，但不再属于任何一天。',
   'dayplan.deleteDayStayHint': '入住或退房在这一天，因此住宿会被取消。',
   'dayplan.deleteDayStayBookedHint': '入住或退房在这一天，因此住宿会被取消，同时取消预订“{booking}”及其费用。',
+  'dayplan.deleteDayStayBookingHint': '入住或退房在这一天，因此住宿会被取消，同时取消预订“{booking}”。',
+  'dayplan.deleteDayStayPaidHint':
+    '入住或退房在这一天，因此住宿会被取消，同时取消预订“{booking}”及其 {amount} 的费用。',
   'dayplan.deleteDayShift': '之后的日期：{count}',
   'dayplan.deleteDayShiftHint': '每一天都会提前一个日期。',
   'dayplan.deleteDayShiftBookingsHint': '每一天都会提前一个日期。随之移动的预订：{count}',
   'dayplan.deleteDayShrink': '行程现在结束于 {date}',
   'dayplan.deleteDayShrinkHint': '没有未设日期的一天可以接替最后一个日期。',
+  'dayplan.impactStayShorter': '住宿：{name}，少住一晚',
+  'dayplan.deleteDayStayShorterHint': '该住宿跨越这一天，现在于 {date} 退房。',
+  'dayplan.deleteDayStayShorterUndatedHint': '该住宿跨越这一天，现在提前一天结束。',
+  'dayplan.deleteDaySpareDated': '{day} 获得日期 {date}',
+  'dayplan.deleteDaySpareDatedHint': '这是第一个没有日期的日子，它将使用行程的最后一个日期。',
   'dayplan.deleteDayLast': '行程至少需要一天',
   'dayplan.daysOffline': '更改日期需要网络连接',
   'dayplan.deleteDaySuccess': '已删除这一天',
diff --git a/shared/src/i18n/zh/undo.ts b/shared/src/i18n/zh/undo.ts
index a99444e69..dc672573e 100644
--- a/shared/src/i18n/zh/undo.ts
+++ b/shared/src/i18n/zh/undo.ts
@@ -19,6 +19,7 @@ const undo: TranslationStrings = {
   'undo.importNaverList': 'Naver 地图导入',
   'undo.addPlace': '地点已添加',
   'undo.done': '已撤销：{action}',
+  'undo.failed': '无法撤销：{action}',
   'undo.importBooking': '导入预订确认',
 };
 export default undo;
diff --git a/wiki/Accommodations.md b/wiki/Accommodations.md
index c345c5614..eb960fc81 100644
--- a/wiki/Accommodations.md
+++ b/wiki/Accommodations.md
@@ -94,7 +94,7 @@ A stay is tied to its check-in and check-out day, so it cannot outlive either of
 - **Deleting the day** in the **Reorder days** dialog cancels the stay cleanly, together with its Hotel booking and the expense of that booking. The question before the delete shows this line in red. See [Deleting a day](Day-Plans-and-Notes#deleting-a-day).
 - **Shortening the trip** removes the whole stay, also its nights that are still part of the trip, but leaves its booking under Bookings and its expense under Costs. The trip dialog shows the stay in red before it saves. See [Shortening a trip](Day-Plans-and-Notes#shortening-a-trip).
 
-A stay that only runs across a deleted day, with its check-in before and its check-out after it, is kept.
+A stay that only runs across a deleted day, with its check-in before and its check-out after it, is kept, one night shorter: its check-out day moves up with the days after the deleted one. The question before the delete names the stay and its new check-out date. Its Hotel booking is not changed, so a booking made with the hotel itself may need the same change there.
 
 ## In the day plan sidebar
 
diff --git a/wiki/Day-Plans-and-Notes.md b/wiki/Day-Plans-and-Notes.md
index 09d532a97..6efeb6414 100644
--- a/wiki/Day-Plans-and-Notes.md
+++ b/wiki/Day-Plans-and-Notes.md
@@ -104,21 +104,22 @@ Members who can edit days find a delete button at the end of every row of the **
 - **Planned places** stay in the place list of the trip. Only their spot on this day goes.
 - **Notes**, the day title and the day description are deleted.
 - **Bookings** on the day stay under Bookings, without a day, and keep their date.
-- **A stay that checks in or out on the day** is cancelled, together with its booking and the expense of that booking. The list shows it in red, since this is the line that costs money. A stay that only runs across the day is kept.
-- **The days after it** move up one place. On a trip with dates the dates stay where they are, so every later day, and the bookings on it, takes the date one slot earlier; the list says how many days and bookings move. A day without a date at the end takes over the last date. When there is none, the trip ends one day earlier, and the list names the new end date.
+- **A stay that checks in or out on the day** is cancelled, together with its booking and the expense of that booking. The list shows it in red, since this is the line that costs money, and names the booking and the amount of its expense. A booking without an expense is named alone.
+- **A stay that only runs across the day**, with its check-in before and its check-out after it, is kept, but one night shorter: its check-out day moves up with the other days. The list names the stay and its new check-out date. The booking behind it is not changed.
+- **The days after it** move up one place. On a trip with dates the dates stay where they are, so every later day, and the bookings on it, takes the date one slot earlier; the list says how many days and bookings move. The first day without a date takes over the last date, and the list names that day and the date it gets. From then on it counts as a dated day, also when the trip is shortened later. When there is no day without a date, the trip ends one day earlier, and the list names the new end date.
 
-A day with nothing on it gets a single line that says so. Deleting needs a connection, and the last day of a trip cannot be deleted; in both cases the button is greyed out and TREK says why. There is no undo, which is why the question spells out the consequences first. Fellow travellers see the day go, and a new end date, straight away.
+A day with nothing on it gets a single line that says so. Deleting needs a connection, and the last day of a trip cannot be deleted; in both cases the button is greyed out and TREK says why. There is no undo, which is why the question spells out the consequences first. An open panel of the deleted day closes, and earlier undo steps that acted on that day are dropped, since they could no longer be taken back. Fellow travellers see the day go, and a new end date, straight away.
 
 ## Shortening a trip
 
 New dates lay the days of a trip out again. Plans follow their position: the first day of the plan takes the new start date, the second the date after it, and so on. When the new dates hold fewer days than the plan, the last days go, also when it was the start that moved. Empty days without a date that are left over go as well, with any change of dates.
 
-Before such a save, TREK asks first: in the trip dialog as a step before the save, on a phone in a sheet over the trip sheet. It names the days that go, the first six by name and the rest as a count, and lists what is on them:
+Before such a save, TREK asks first: in the trip dialog as a step before the save. Editing the trip from the phone's dashboard asks in a sheet over the trip sheet instead; editing it from inside the planner shows the same step as on desktop, also on a phone. Escape in that step goes back to the form and keeps what you typed. It names the days that go, the first six by name and the rest as a count, and lists what is on them:
 
 - **Planned places** stay in the place list of the trip.
 - **Notes**, day titles and day descriptions are deleted.
-- **Bookings** on those days stay under Bookings. With **Keep bookings on their dates**, a booking whose date is still part of the trip goes back onto that day; with **Shift everything** it stays without a day. The phone does not offer the choice and keeps bookings on their dates.
-- **A stay that checks in or out on one of those days** is removed as a whole, also for nights that are still part of the trip. Unlike when you delete a single day, its booking stays under Bookings and its expense under Costs. The list shows the stay in red.
+- **Bookings** on those days stay under Bookings. With **Keep bookings on their dates**, a booking whose date is still part of the trip goes back onto that day; with **Shift everything** it stays without a day. The sheet on the phone's dashboard does not offer the choice and keeps bookings on their dates.
+- **A stay that checks in or out on one of those days** is removed as a whole, also for nights that are still part of the trip. Unlike when you delete a single day, its booking stays under Bookings and its expense, if it has one, under Costs. The list shows the stay in red.
 - **The last days go, not the first** closes the list when the start moved, as a reminder that plans follow their position.
 
 The save button then reads **Remove days and save**. When the start moved, the same step also asks how bookings follow the new dates, as before. When the days that go hold nothing, nothing extra is asked. Should TREK fail to read the days of the trip, it warns in general terms instead of listing them. There is no undo.