diff --git a/backend/prisma/migrations/20260608120000_add_staff_working_hours/migration.sql b/backend/prisma/migrations/20260608120000_add_staff_working_hours/migration.sql
new file mode 100644
index 0000000..d08ba3c
--- /dev/null
+++ b/backend/prisma/migrations/20260608120000_add_staff_working_hours/migration.sql
@@ -0,0 +1,34 @@
+-- CreateTable
+CREATE TABLE "staff_working_hours_schedules" (
+    "id" TEXT NOT NULL,
+    "membershipId" TEXT NOT NULL,
+    "autoRepeatWeekly" BOOLEAN NOT NULL DEFAULT true,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "staff_working_hours_schedules_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "staff_working_hours_blocks" (
+    "id" TEXT NOT NULL,
+    "scheduleId" TEXT NOT NULL,
+    "dayOfWeek" INTEGER NOT NULL,
+    "startMinute" INTEGER NOT NULL,
+    "endMinute" INTEGER NOT NULL,
+    "sortOrder" INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT "staff_working_hours_blocks_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "staff_working_hours_schedules_membershipId_key" ON "staff_working_hours_schedules"("membershipId");
+
+-- CreateIndex
+CREATE INDEX "staff_working_hours_blocks_scheduleId_dayOfWeek_sortOrder_idx" ON "staff_working_hours_blocks"("scheduleId", "dayOfWeek", "sortOrder");
+
+-- AddForeignKey
+ALTER TABLE "staff_working_hours_schedules" ADD CONSTRAINT "staff_working_hours_schedules_membershipId_fkey" FOREIGN KEY ("membershipId") REFERENCES "memberships"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "staff_working_hours_blocks" ADD CONSTRAINT "staff_working_hours_blocks_scheduleId_fkey" FOREIGN KEY ("scheduleId") REFERENCES "staff_working_hours_schedules"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/backend/prisma/migrations/20260620120000_add_user_language/migration.sql b/backend/prisma/migrations/20260620120000_add_user_language/migration.sql
new file mode 100644
index 0000000..7c369a4
--- /dev/null
+++ b/backend/prisma/migrations/20260620120000_add_user_language/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "users" ADD COLUMN "language" TEXT NOT NULL DEFAULT 'en';
diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma
index 8d3836b..ffe59bc 100644
--- a/backend/prisma/schema.prisma
+++ b/backend/prisma/schema.prisma
@@ -15,6 +15,7 @@ model User {
   googleId     String? @unique
   facebookId   String? @unique
   name         String
+  language     String  @default("en")
   trialUsedAt  DateTime?
 
   memberships        Membership[]
@@ -217,6 +218,7 @@ model Membership {
 
   permissions MembershipPermission[]
   invitations StaffInvitation[]
+  workingHoursSchedule StaffWorkingHoursSchedule?
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -225,6 +227,34 @@ model Membership {
   @@map("memberships")
 }
 
+model StaffWorkingHoursSchedule {
+  id               String @id @default(uuid())
+  membershipId     String @unique
+  autoRepeatWeekly Boolean @default(true)
+
+  membership Membership @relation(fields: [membershipId], references: [id], onDelete: Cascade)
+  blocks     StaffWorkingHoursBlock[]
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@map("staff_working_hours_schedules")
+}
+
+model StaffWorkingHoursBlock {
+  id          String @id @default(uuid())
+  scheduleId  String
+  dayOfWeek   Int
+  startMinute Int
+  endMinute   Int
+  sortOrder   Int    @default(0)
+
+  schedule StaffWorkingHoursSchedule @relation(fields: [scheduleId], references: [id], onDelete: Cascade)
+
+  @@index([scheduleId, dayOfWeek, sortOrder])
+  @@map("staff_working_hours_blocks")
+}
+
 model StaffInvitation {
   id String @id @default(uuid())
 
diff --git a/backend/src/common/working-hours.ts b/backend/src/common/working-hours.ts
new file mode 100644
index 0000000..0cbdf60
--- /dev/null
+++ b/backend/src/common/working-hours.ts
@@ -0,0 +1,118 @@
+export const MINUTES_PER_DAY = 24 * 60;
+
+export type WorkingHoursBlockInput = {
+  dayOfWeek: number;
+  startMinute: number;
+  endMinute: number;
+  sortOrder?: number;
+};
+
+export type WorkingHoursDayBlock = {
+  startMinute: number;
+  endMinute: number;
+};
+
+export function localDayOfWeekMondayZero(dayOfWeekJs: number): number {
+  return dayOfWeekJs === 0 ? 6 : dayOfWeekJs - 1;
+}
+
+export function validateWorkingHoursBlocks(blocks: WorkingHoursBlockInput[]): string | null {
+  if (!Array.isArray(blocks)) {
+    return 'Working hours blocks must be an array';
+  }
+
+  const byDay = new Map<number, WorkingHoursBlockInput[]>();
+  for (const block of blocks) {
+    if (!Number.isInteger(block.dayOfWeek) || block.dayOfWeek < 0 || block.dayOfWeek > 6) {
+      return 'dayOfWeek must be an integer from 0 (Monday) to 6 (Sunday)';
+    }
+    if (!Number.isInteger(block.startMinute) || block.startMinute < 0 || block.startMinute >= MINUTES_PER_DAY) {
+      return 'startMinute must be between 0 and 1439';
+    }
+    if (!Number.isInteger(block.endMinute) || block.endMinute <= 0 || block.endMinute > MINUTES_PER_DAY) {
+      return 'endMinute must be between 1 and 1440';
+    }
+    if (block.endMinute <= block.startMinute) {
+      return 'Each shift end time must be after its start time';
+    }
+    const list = byDay.get(block.dayOfWeek) ?? [];
+    list.push(block);
+    byDay.set(block.dayOfWeek, list);
+  }
+
+  for (const [, dayBlocks] of byDay) {
+    const sorted = [...dayBlocks].sort((a, b) => a.startMinute - b.startMinute);
+    for (let i = 1; i < sorted.length; i += 1) {
+      if (sorted[i].startMinute < sorted[i - 1].endMinute) {
+        return 'Shifts on the same day cannot overlap';
+      }
+    }
+  }
+
+  return null;
+}
+
+export function blocksForDay(
+  blocks: WorkingHoursBlockInput[],
+  dayOfWeek: number,
+): WorkingHoursDayBlock[] {
+  return blocks
+    .filter((b) => b.dayOfWeek === dayOfWeek)
+    .sort((a, b) => a.startMinute - b.startMinute || a.endMinute - b.endMinute)
+    .map((b) => ({ startMinute: b.startMinute, endMinute: b.endMinute }));
+}
+
+export function isMinuteWithinWorkingBlocks(minute: number, dayBlocks: WorkingHoursDayBlock[]): boolean {
+  return dayBlocks.some((b) => minute >= b.startMinute && minute < b.endMinute);
+}
+
+export function isRangeWithinWorkingBlocks(
+  startMinute: number,
+  endMinute: number,
+  dayBlocks: WorkingHoursDayBlock[],
+): boolean {
+  if (endMinute <= startMinute) {
+    return false;
+  }
+  for (let m = startMinute; m < endMinute; m += 1) {
+    if (!isMinuteWithinWorkingBlocks(m, dayBlocks)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+export function dateToLocalMinutes(date: Date): number {
+  return date.getHours() * 60 + date.getMinutes();
+}
+
+export function appointmentWithinWorkingHours(
+  startAt: Date,
+  endAt: Date,
+  dayBlocks: WorkingHoursDayBlock[],
+): boolean {
+  const startMinute = dateToLocalMinutes(startAt);
+  const endMinute = dateToLocalMinutes(endAt);
+  return isRangeWithinWorkingBlocks(startMinute, endMinute, dayBlocks);
+}
+
+export function unionDayBlockRange(dayBlocksList: WorkingHoursDayBlock[][]): {
+  startMinute: number;
+  endMinute: number;
+} | null {
+  let startMinute: number | null = null;
+  let endMinute: number | null = null;
+
+  for (const dayBlocks of dayBlocksList) {
+    for (const block of dayBlocks) {
+      startMinute = startMinute == null ? block.startMinute : Math.min(startMinute, block.startMinute);
+      endMinute = endMinute == null ? block.endMinute : Math.max(endMinute, block.endMinute);
+    }
+  }
+
+  if (startMinute == null || endMinute == null) {
+    return null;
+  }
+
+  return { startMinute, endMinute };
+}
diff --git a/backend/src/modules/appointments/appointments.controller.ts b/backend/src/modules/appointments/appointments.controller.ts
index 8c32934..f6dfa7f 100644
--- a/backend/src/modules/appointments/appointments.controller.ts
+++ b/backend/src/modules/appointments/appointments.controller.ts
@@ -13,6 +13,7 @@ import {
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
 import { AppointmentsService } from './appointments.service';
+import { ColumnProvidersQueryDto } from './dto/column-providers-query.dto';
 import { CreateAppointmentDto } from './dto/create-appointment.dto';
 import { ListAppointmentsDto } from './dto/list-appointments.dto';
 import { UpdateAppointmentDto } from './dto/update-appointment.dto';
@@ -29,9 +30,16 @@ export class AppointmentsController {
     summary:
       'Staff columns: active non-owner members with TAB_TREATMENT_EDIT. Owners are excluded. Requires TAB_APPOINTMENTS_READ or owner.',
   })
-  columnProviders(@Req() req: { user: { id: string; organizationId?: string } }) {
+  columnProviders(
+    @Query() query: ColumnProvidersQueryDto,
+    @Req() req: { user: { id: string; organizationId?: string } },
+  ) {
     const organizationId = this.appointmentsService.getOrganizationIdFromUser(req.user);
-    return this.appointmentsService.listColumnProviders(organizationId, req.user.id);
+    return this.appointmentsService.listColumnProviders(
+      organizationId,
+      req.user.id,
+      query.date,
+    );
   }
 
   @Get()
diff --git a/backend/src/modules/appointments/appointments.module.ts b/backend/src/modules/appointments/appointments.module.ts
index 4ec86d1..e6f0b5f 100644
--- a/backend/src/modules/appointments/appointments.module.ts
+++ b/backend/src/modules/appointments/appointments.module.ts
@@ -1,9 +1,11 @@
 import { Module } from '@nestjs/common';
 import { PrismaService } from '../../../prisma/prisma.service';
+import { StaffModule } from '../staff/staff.module';
 import { AppointmentsController } from './appointments.controller';
 import { AppointmentsService } from './appointments.service';
 
 @Module({
+  imports: [StaffModule],
   controllers: [AppointmentsController],
   providers: [AppointmentsService, PrismaService],
 })
diff --git a/backend/src/modules/appointments/appointments.service.ts b/backend/src/modules/appointments/appointments.service.ts
index d5baa9f..2293082 100644
--- a/backend/src/modules/appointments/appointments.service.ts
+++ b/backend/src/modules/appointments/appointments.service.ts
@@ -5,6 +5,12 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { PrismaService } from '../../../prisma/prisma.service';
+import {
+  appointmentWithinWorkingHours,
+  blocksForDay,
+  localDayOfWeekMondayZero,
+} from '../../common/working-hours';
+import { StaffWorkingHoursService } from '../staff/staff-working-hours.service';
 import { CreateAppointmentDto } from './dto/create-appointment.dto';
 import { ListAppointmentsDto } from './dto/list-appointments.dto';
 import { UpdateAppointmentDto } from './dto/update-appointment.dto';
@@ -13,7 +19,10 @@ const MS_PER_DAY = 86_400_000;
 
 @Injectable()
 export class AppointmentsService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly staffWorkingHoursService: StaffWorkingHoursService,
+  ) {}
 
   getOrganizationIdFromUser(user: { organizationId?: string }) {
     if (!user?.organizationId) {
@@ -22,7 +31,7 @@ export class AppointmentsService {
     return user.organizationId;
   }
 
-  async listColumnProviders(organizationId: string, actorUserId: string) {
+  async listColumnProviders(organizationId: string, actorUserId: string, date?: string) {
     await this.assertCanViewAppointments(actorUserId, organizationId);
 
     const members = await this.prisma.membership.findMany({
@@ -44,7 +53,23 @@ export class AppointmentsService {
       orderBy: [{ createdAt: 'asc' }],
     });
 
-    const data = members.map((m) => ({ userId: m.user.id, name: m.user.name }));
+    const scheduleBlocksByMembership =
+      await this.staffWorkingHoursService.loadScheduleBlocksByMembershipIds(
+        members.map((m) => m.id),
+      );
+
+    const dayOfWeek = this.resolveDayOfWeekMondayZero(date);
+
+    const data = members.map((m) => {
+      const allBlocks = scheduleBlocksByMembership.get(m.id) ?? [];
+      const dayBlocks = blocksForDay(allBlocks, dayOfWeek);
+      return {
+        userId: m.user.id,
+        name: m.user.name,
+        hasWorkingHours: allBlocks.length > 0,
+        dayBlocks,
+      };
+    });
 
     return { success: true, data };
   }
@@ -109,6 +134,12 @@ export class AppointmentsService {
 
     await this.ensurePatientInOrg(dto.patientId, organizationId);
     await this.ensureProviderIsTreatmentEditor(dto.providerUserId, organizationId);
+    await this.ensureAppointmentWithinProviderWorkingHours(
+      dto.providerUserId,
+      organizationId,
+      startAt,
+      endAt,
+    );
 
     const appointment = await this.prisma.appointment.create({
       data: {
@@ -166,6 +197,12 @@ export class AppointmentsService {
 
     await this.ensurePatientInOrg(patientId, organizationId);
     await this.ensureProviderIsTreatmentEditor(providerUserId, organizationId);
+    await this.ensureAppointmentWithinProviderWorkingHours(
+      providerUserId,
+      organizationId,
+      startAt,
+      endAt,
+    );
 
     const appointment = await this.prisma.appointment.update({
       where: { id },
@@ -273,6 +310,47 @@ export class AppointmentsService {
     }
   }
 
+  private resolveDayOfWeekMondayZero(date?: string): number {
+    if (!date) {
+      return localDayOfWeekMondayZero(new Date().getDay());
+    }
+    const [y, m, d] = date.split('-').map(Number);
+    const parsed = new Date(y, m - 1, d, 12, 0, 0, 0);
+    if (Number.isNaN(parsed.getTime())) {
+      throw new BadRequestException('Invalid date query parameter');
+    }
+    return localDayOfWeekMondayZero(parsed.getDay());
+  }
+
+  private async ensureAppointmentWithinProviderWorkingHours(
+    providerUserId: string,
+    organizationId: string,
+    startAt: Date,
+    endAt: Date,
+  ) {
+    const membership = await this.getMembership(providerUserId, organizationId);
+    if (!membership) {
+      throw new BadRequestException('Provider is not a member of this organization');
+    }
+
+    const scheduleBlocksByMembership =
+      await this.staffWorkingHoursService.loadScheduleBlocksByMembershipIds([membership.id]);
+    const allBlocks = scheduleBlocksByMembership.get(membership.id) ?? [];
+    if (allBlocks.length === 0) {
+      throw new BadRequestException('Provider has no working hours configured');
+    }
+
+    const dayOfWeek = localDayOfWeekMondayZero(startAt.getDay());
+    const dayBlocks = blocksForDay(allBlocks, dayOfWeek);
+    if (dayBlocks.length === 0) {
+      throw new BadRequestException('Provider is not working on this day');
+    }
+
+    if (!appointmentWithinWorkingHours(startAt, endAt, dayBlocks)) {
+      throw new BadRequestException('Appointment must fall within the provider working hours');
+    }
+  }
+
   private async getMembership(userId: string, organizationId: string) {
     return this.prisma.membership.findFirst({
       where: { userId, organizationId },
diff --git a/backend/src/modules/appointments/dto/column-providers-query.dto.ts b/backend/src/modules/appointments/dto/column-providers-query.dto.ts
new file mode 100644
index 0000000..04ccc58
--- /dev/null
+++ b/backend/src/modules/appointments/dto/column-providers-query.dto.ts
@@ -0,0 +1,9 @@
+import { IsOptional, IsString, Matches } from 'class-validator';
+
+export class ColumnProvidersQueryDto {
+  /** Local calendar date (YYYY-MM-DD) used to resolve weekday working hours. */
+  @IsOptional()
+  @IsString()
+  @Matches(/^\d{4}-\d{2}-\d{2}$/)
+  date?: string;
+}
diff --git a/backend/src/modules/auth/auth.controller.ts b/backend/src/modules/auth/auth.controller.ts
index 1e68517..b490e9d 100644
--- a/backend/src/modules/auth/auth.controller.ts
+++ b/backend/src/modules/auth/auth.controller.ts
@@ -9,7 +9,8 @@ import {
   Res,
   HttpCode,
   HttpStatus,
-  Get
+  Get,
+  Patch,
 } from '@nestjs/common';
 import type { Response } from 'express';
 import {
@@ -28,6 +29,7 @@ import { RegisterDto } from './dto/register.dto';
 import { CreateOrganizationDto } from './dto/create-organization.dto';
 import { JwtAuthGuard } from './guards/jwt-auth.guard';
 import { LocalAuthGuard } from './guards/local-auth.guard';
+import { UpdateLanguageDto } from './dto/update-language.dto';
 
 @ApiTags('auth')
 @Controller('auth')
@@ -149,6 +151,14 @@ export class AuthController {
     return this.authService.getProfile(req.user.id);
   }
 
+  @Patch('profile/language')
+  @UseGuards(JwtAuthGuard)
+  @ApiBearerAuth('JWT-auth')
+  @ApiOperation({ summary: 'Update user language preference' })
+  async updateLanguage(@Req() req, @Body() dto: UpdateLanguageDto) {
+    return this.authService.updateLanguage(req.user.id, dto);
+  }
+
   @Get('subscription-alert')
   @UseGuards(JwtAuthGuard)
   @ApiBearerAuth('JWT-auth')
diff --git a/backend/src/modules/auth/auth.service.ts b/backend/src/modules/auth/auth.service.ts
index 102e59c..17fcac4 100644
--- a/backend/src/modules/auth/auth.service.ts
+++ b/backend/src/modules/auth/auth.service.ts
@@ -15,6 +15,10 @@ import { PrismaService } from '../../../prisma/prisma.service';
 import { LoginDto } from './dto/login.dto';
 import { RegisterDto } from './dto/register.dto';
 import { CreateOrganizationDto } from './dto/create-organization.dto';
+import {
+  SUPPORTED_USER_LANGUAGES,
+  UpdateLanguageDto,
+} from './dto/update-language.dto';
 import { JwtPayload } from './interfaces/jwt-payload.interface';
 
 const ALL_PERMISSIONS = [
@@ -179,11 +183,7 @@ export class AuthService {
         data: {
           accessToken,
           refreshToken,
-          user: {
-            id: user.id,
-            email: user.email,
-            name: user.name,
-          },
+          user: this.toPublicUser(user),
           organizations,
         },
       };
@@ -343,11 +343,6 @@ export class AuthService {
     };
   }
 
-  /**
-   * Get user profile with all memberships and permissions
-   * @param userId - User ID from JWT token
-   * @returns User profile with organizations and permissions
-   */
   async getProfile(userId: string) {
     try {
       const user = await this.prisma.user.findUnique({
@@ -516,11 +511,7 @@ export class AuthService {
         success: true,
         data: {
           accessToken: newAccessToken,
-          user: {
-            id: session.user.id,
-            email: session.user.email,
-            name: session.user.name,
-          },
+          user: this.toPublicUser(session.user),
           organizations,
         },
       };
@@ -931,4 +922,44 @@ export class AuthService {
       },
     };
   }
+
+  async updateLanguage(userId: string, dto: UpdateLanguageDto) {
+    const language = dto.language;
+
+    if (!SUPPORTED_USER_LANGUAGES.includes(language)) {
+      throw new BadRequestException('Language must be one of: en, fa, nl');
+    }
+
+    const user = await this.prisma.user.update({
+      where: { id: userId },
+      data: { language },
+      select: {
+        id: true,
+        email: true,
+        name: true,
+        language: true,
+      },
+    });
+
+    return {
+      success: true,
+      data: {
+        user: this.toPublicUser(user),
+      },
+    };
+  }
+
+  private toPublicUser(user: {
+    id: string;
+    email: string;
+    name: string;
+    language?: string | null;
+  }) {
+    return {
+      id: user.id,
+      email: user.email,
+      name: user.name,
+      language: user.language ?? 'en',
+    };
+  }
 }
\ No newline at end of file
diff --git a/backend/src/modules/auth/dto/update-language.dto.ts b/backend/src/modules/auth/dto/update-language.dto.ts
new file mode 100644
index 0000000..5bc91c1
--- /dev/null
+++ b/backend/src/modules/auth/dto/update-language.dto.ts
@@ -0,0 +1,14 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsIn, IsString } from 'class-validator';
+
+export const SUPPORTED_USER_LANGUAGES = ['en', 'fa', 'nl'] as const;
+export type SupportedUserLanguage = (typeof SUPPORTED_USER_LANGUAGES)[number];
+
+export class UpdateLanguageDto {
+  @ApiProperty({ enum: SUPPORTED_USER_LANGUAGES, example: 'en' })
+  @IsString()
+  @IsIn(SUPPORTED_USER_LANGUAGES, {
+    message: 'Language must be one of: en, fa, nl',
+  })
+  language: SupportedUserLanguage;
+}
diff --git a/backend/src/modules/staff/dto/upsert-working-hours.dto.ts b/backend/src/modules/staff/dto/upsert-working-hours.dto.ts
new file mode 100644
index 0000000..68c508a
--- /dev/null
+++ b/backend/src/modules/staff/dto/upsert-working-hours.dto.ts
@@ -0,0 +1,44 @@
+import { Type } from 'class-transformer';
+import {
+  ArrayMaxSize,
+  IsArray,
+  IsBoolean,
+  IsInt,
+  IsOptional,
+  Max,
+  Min,
+  ValidateNested,
+} from 'class-validator';
+
+export class WorkingHoursBlockDto {
+  @IsInt()
+  @Min(0)
+  @Max(6)
+  dayOfWeek: number;
+
+  @IsInt()
+  @Min(0)
+  @Max(1439)
+  startMinute: number;
+
+  @IsInt()
+  @Min(1)
+  @Max(1440)
+  endMinute: number;
+
+  @IsOptional()
+  @IsInt()
+  @Min(0)
+  sortOrder?: number;
+}
+
+export class UpsertWorkingHoursDto {
+  @IsBoolean()
+  autoRepeatWeekly: boolean;
+
+  @IsArray()
+  @ArrayMaxSize(42)
+  @ValidateNested({ each: true })
+  @Type(() => WorkingHoursBlockDto)
+  blocks: WorkingHoursBlockDto[];
+}
diff --git a/backend/src/modules/staff/staff-working-hours.service.ts b/backend/src/modules/staff/staff-working-hours.service.ts
new file mode 100644
index 0000000..d7568a8
--- /dev/null
+++ b/backend/src/modules/staff/staff-working-hours.service.ts
@@ -0,0 +1,264 @@
+import {
+  BadRequestException,
+  ForbiddenException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { PrismaService } from '../../../prisma/prisma.service';
+import {
+  appointmentWithinWorkingHours,
+  blocksForDay,
+  localDayOfWeekMondayZero,
+  validateWorkingHoursBlocks,
+  type WorkingHoursBlockInput,
+} from '../../common/working-hours';
+import { UpsertWorkingHoursDto } from './dto/upsert-working-hours.dto';
+
+@Injectable()
+export class StaffWorkingHoursService {
+  constructor(private readonly prisma: PrismaService) {}
+
+  async getWorkingHours(actorUserId: string, organizationId: string, membershipId: string) {
+    await this.assertCanViewStaff(actorUserId, organizationId);
+
+    const membership = await this.findMembership(membershipId, organizationId);
+    const schedule = await this.prisma.staffWorkingHoursSchedule.findUnique({
+      where: { membershipId: membership.id },
+      include: {
+        blocks: { orderBy: [{ dayOfWeek: 'asc' }, { sortOrder: 'asc' }, { startMinute: 'asc' }] },
+      },
+    });
+
+    if (!schedule) {
+      return {
+        success: true,
+        data: {
+          autoRepeatWeekly: true,
+          blocks: [],
+          hasWorkingHours: false,
+        },
+      };
+    }
+
+    return {
+      success: true,
+      data: {
+        autoRepeatWeekly: schedule.autoRepeatWeekly,
+        blocks: schedule.blocks.map((b) => ({
+          dayOfWeek: b.dayOfWeek,
+          startMinute: b.startMinute,
+          endMinute: b.endMinute,
+          sortOrder: b.sortOrder,
+        })),
+        hasWorkingHours: schedule.blocks.length > 0,
+      },
+    };
+  }
+
+  async upsertWorkingHours(
+    actorUserId: string,
+    organizationId: string,
+    membershipId: string,
+    dto: UpsertWorkingHoursDto,
+  ) {
+    await this.assertCanEditStaff(actorUserId, organizationId);
+
+    const membership = await this.findMembership(membershipId, organizationId);
+    const validationError = validateWorkingHoursBlocks(dto.blocks);
+    if (validationError) {
+      throw new BadRequestException(validationError);
+    }
+
+    const normalizedBlocks = this.normalizeBlocks(dto.blocks);
+    await this.assertNoConflictingAppointments(
+      organizationId,
+      membership.userId,
+      normalizedBlocks,
+    );
+
+    await this.prisma.$transaction(async (tx) => {
+      const schedule = await tx.staffWorkingHoursSchedule.upsert({
+        where: { membershipId: membership.id },
+        create: {
+          membershipId: membership.id,
+          autoRepeatWeekly: dto.autoRepeatWeekly,
+        },
+        update: {
+          autoRepeatWeekly: dto.autoRepeatWeekly,
+        },
+      });
+
+      await tx.staffWorkingHoursBlock.deleteMany({ where: { scheduleId: schedule.id } });
+
+      if (normalizedBlocks.length > 0) {
+        await tx.staffWorkingHoursBlock.createMany({
+          data: normalizedBlocks.map((block, index) => ({
+            scheduleId: schedule.id,
+            dayOfWeek: block.dayOfWeek,
+            startMinute: block.startMinute,
+            endMinute: block.endMinute,
+            sortOrder: block.sortOrder ?? index,
+          })),
+        });
+      }
+    });
+
+    return {
+      success: true,
+      message: 'Working hours saved',
+    };
+  }
+
+  async loadScheduleBlocksByMembershipIds(membershipIds: string[]) {
+    if (membershipIds.length === 0) {
+      return new Map<string, WorkingHoursBlockInput[]>();
+    }
+
+    const schedules = await this.prisma.staffWorkingHoursSchedule.findMany({
+      where: { membershipId: { in: membershipIds } },
+      include: {
+        blocks: { orderBy: [{ dayOfWeek: 'asc' }, { sortOrder: 'asc' }, { startMinute: 'asc' }] },
+      },
+    });
+
+    const map = new Map<string, WorkingHoursBlockInput[]>();
+    for (const schedule of schedules) {
+      map.set(
+        schedule.membershipId,
+        schedule.blocks.map((b) => ({
+          dayOfWeek: b.dayOfWeek,
+          startMinute: b.startMinute,
+          endMinute: b.endMinute,
+          sortOrder: b.sortOrder,
+        })),
+      );
+    }
+    return map;
+  }
+
+  dayBlocksFromMembershipBlocks(blocks: WorkingHoursBlockInput[], dayOfWeekMondayZero: number) {
+    return blocksForDay(blocks, dayOfWeekMondayZero);
+  }
+
+  private normalizeBlocks(blocks: UpsertWorkingHoursDto['blocks']): WorkingHoursBlockInput[] {
+    return blocks.map((block, index) => ({
+      dayOfWeek: block.dayOfWeek,
+      startMinute: block.startMinute,
+      endMinute: block.endMinute,
+      sortOrder: block.sortOrder ?? index,
+    }));
+  }
+
+  private async assertNoConflictingAppointments(
+    organizationId: string,
+    providerUserId: string,
+    blocks: WorkingHoursBlockInput[],
+  ) {
+    const now = new Date();
+    const appointments = await this.prisma.appointment.findMany({
+      where: {
+        organizationId,
+        providerUserId,
+        endAt: { gt: now },
+      },
+      include: {
+        patient: { select: { firstName: true, lastName: true } },
+      },
+      orderBy: { startAt: 'asc' },
+    });
+
+    const conflicts = appointments.filter((appointment) => {
+      const startAt = new Date(appointment.startAt);
+      const endAt = new Date(appointment.endAt);
+      const dayOfWeek = localDayOfWeekMondayZero(startAt.getDay());
+      const dayBlocks = blocksForDay(blocks, dayOfWeek);
+      if (dayBlocks.length === 0) {
+        return true;
+      }
+      return !appointmentWithinWorkingHours(startAt, endAt, dayBlocks);
+    });
+
+    if (conflicts.length === 0) {
+      return;
+    }
+
+    const examples = conflicts.slice(0, 3).map((appointment) => {
+      const startAt = new Date(appointment.startAt);
+      const patientName = `${appointment.patient.firstName} ${appointment.patient.lastName}`;
+      const when = startAt.toLocaleString(undefined, {
+        weekday: 'short',
+        month: 'short',
+        day: 'numeric',
+        hour: 'numeric',
+        minute: '2-digit',
+      });
+      return `${patientName} (${when})`;
+    });
+
+    const extra =
+      conflicts.length > examples.length
+        ? ` and ${conflicts.length - examples.length} more`
+        : '';
+
+    throw new BadRequestException(
+      `Cannot save working hours: ${conflicts.length} upcoming appointment${conflicts.length === 1 ? '' : 's'} fall outside the new schedule (${examples.join(', ')}${extra}). Reschedule or remove those appointments first.`,
+    );
+  }
+
+  private async findMembership(membershipId: string, organizationId: string) {
+    const membership = await this.prisma.membership.findFirst({
+      where: { id: membershipId, organizationId },
+      select: { id: true, isOwner: true, userId: true },
+    });
+    if (!membership) {
+      throw new NotFoundException('Member not found');
+    }
+    if (membership.isOwner) {
+      throw new BadRequestException('Working hours cannot be set for the organization owner');
+    }
+    return membership;
+  }
+
+  private async assertCanViewStaff(userId: string, organizationId: string) {
+    const actor = await this.getActorMembership(userId, organizationId);
+    if (!actor || !this.canViewStaff(actor)) {
+      throw new ForbiddenException('You do not have access to staff management');
+    }
+  }
+
+  private async assertCanEditStaff(userId: string, organizationId: string) {
+    const actor = await this.getActorMembership(userId, organizationId);
+    if (!actor || !this.canEditStaff(actor)) {
+      throw new ForbiddenException('You cannot manage staff working hours');
+    }
+  }
+
+  private async getActorMembership(userId: string, organizationId: string) {
+    return this.prisma.membership.findFirst({
+      where: { userId, organizationId },
+      include: {
+        permissions: { include: { permission: true } },
+        organization: { select: { planId: true } },
+      },
+    });
+  }
+
+  private canViewStaff(m: {
+    isOwner: boolean;
+    permissions: { permission: { name: string } }[];
+  }): boolean {
+    if (m.isOwner) return true;
+    return m.permissions.some(
+      (p) => p.permission.name === 'TAB_STAFF_READ' || p.permission.name === 'TAB_STAFF_EDIT',
+    );
+  }
+
+  private canEditStaff(m: {
+    isOwner: boolean;
+    organization?: { planId: string | null };
+    permissions: { permission: { name: string } }[];
+  }): boolean {
+    if (m.isOwner) return Boolean(m.organization?.planId);
+    return m.permissions.some((p) => p.permission.name === 'TAB_STAFF_EDIT');
+  }
+}
diff --git a/backend/src/modules/staff/staff.controller.ts b/backend/src/modules/staff/staff.controller.ts
index 8183f32..a6fc1a8 100644
--- a/backend/src/modules/staff/staff.controller.ts
+++ b/backend/src/modules/staff/staff.controller.ts
@@ -6,6 +6,7 @@ import {
   Param,
   Patch,
   Post,
+  Put,
   Query,
   Req,
   UseGuards,
@@ -16,13 +17,18 @@ import { AcceptStaffInviteDto } from './dto/accept-staff-invite.dto';
 import { InviteStaffDto } from './dto/invite-staff.dto';
 import { PreviewStaffInviteDto } from './dto/preview-staff-invite.dto';
 import { UpdateStaffMemberDto } from './dto/update-staff-member.dto';
+import { UpsertWorkingHoursDto } from './dto/upsert-working-hours.dto';
 import { StaffService } from './staff.service';
+import { StaffWorkingHoursService } from './staff-working-hours.service';
 
 @ApiTags('staff')
 @ApiBearerAuth('JWT-auth')
 @Controller('staff')
 export class StaffController {
-  constructor(private readonly staffService: StaffService) {}
+  constructor(
+    private readonly staffService: StaffService,
+    private readonly staffWorkingHoursService: StaffWorkingHoursService,
+  ) {}
 
   @Get('invitations/preview')
   @ApiOperation({ summary: 'Preview invite info by token (public)' })
@@ -80,6 +86,38 @@ export class StaffController {
     return this.staffService.updateMember(req.user.id, organizationId, membershipId, dto);
   }
 
+  @Get('members/:membershipId/working-hours')
+  @UseGuards(JwtAuthGuard)
+  @ApiOperation({ summary: 'Get weekly working hours for a staff member' })
+  getWorkingHours(
+    @Req() req: { user: { id: string; organizationId?: string } },
+    @Param('membershipId') membershipId: string,
+  ) {
+    const organizationId = this.staffService.getOrganizationIdFromUser(req.user);
+    return this.staffWorkingHoursService.getWorkingHours(
+      req.user.id,
+      organizationId,
+      membershipId,
+    );
+  }
+
+  @Put('members/:membershipId/working-hours')
+  @UseGuards(JwtAuthGuard)
+  @ApiOperation({ summary: 'Save weekly working hours for a staff member' })
+  upsertWorkingHours(
+    @Req() req: { user: { id: string; organizationId?: string } },
+    @Param('membershipId') membershipId: string,
+    @Body() dto: UpsertWorkingHoursDto,
+  ) {
+    const organizationId = this.staffService.getOrganizationIdFromUser(req.user);
+    return this.staffWorkingHoursService.upsertWorkingHours(
+      req.user.id,
+      organizationId,
+      membershipId,
+      dto,
+    );
+  }
+
   @Patch('members/:membershipId/enable')
   @UseGuards(JwtAuthGuard)
   @ApiOperation({
diff --git a/backend/src/modules/staff/staff.module.ts b/backend/src/modules/staff/staff.module.ts
index c297ea0..0fefc9c 100644
--- a/backend/src/modules/staff/staff.module.ts
+++ b/backend/src/modules/staff/staff.module.ts
@@ -2,9 +2,11 @@ import { Module } from '@nestjs/common';
 import { PrismaService } from '../../../prisma/prisma.service';
 import { StaffController } from './staff.controller';
 import { StaffService } from './staff.service';
+import { StaffWorkingHoursService } from './staff-working-hours.service';
 
 @Module({
   controllers: [StaffController],
-  providers: [StaffService, PrismaService],
+  providers: [StaffService, StaffWorkingHoursService, PrismaService],
+  exports: [StaffWorkingHoursService],
 })
 export class StaffModule {}
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
new file mode 100644
index 0000000..f58cb41
--- /dev/null
+++ b/frontend/messages/en.json
@@ -0,0 +1,566 @@
+{
+  "common": {
+    "appName": "DyoLink",
+    "loading": "Loading...",
+    "loadingApp": "Loading app...",
+    "loadingWorkspace": "Loading workspace...",
+    "continue": "Continue",
+    "back": "Back",
+    "save": "Save",
+    "cancel": "Cancel",
+    "delete": "Delete",
+    "edit": "Edit",
+    "next": "Next",
+    "dismiss": "Dismiss",
+    "or": "Or",
+    "and": "and",
+    "close": "Close",
+    "redirecting": "Redirecting…",
+    "readOnlyAccess": "Read-only access for this organization.",
+    "errorGeneric": "Something went wrong",
+    "loadingEllipsis": "Loading...",
+    "search": "Search",
+    "action": "Action",
+    "status": "Status",
+    "name": "Name",
+    "email": "Email",
+    "date": "Date",
+    "organization": "Organization",
+    "backToApp": "← Back to app",
+    "copied": "Copied",
+    "copyLink": "Copy link",
+    "none": "None",
+    "preview": "Preview"
+  },
+  "language": {
+    "label": "Language",
+    "selectLanguage": "Select language",
+    "en": "English",
+    "fa": "Persian",
+    "nl": "Dutch"
+  },
+  "theme": {
+    "switchToLight": "Switch to light mode",
+    "switchToDark": "Switch to dark mode",
+    "lightMode": "Light mode",
+    "darkMode": "Dark mode"
+  },
+  "nav": {
+    "dashboard": "Dashboard",
+    "staff": "Staff",
+    "patients": "Patients",
+    "appointment": "Appointment",
+    "treatment": "Treatment",
+    "billing": "Billing",
+    "reports": "Reports",
+    "clinics": "Clinics",
+    "labs": "Labs"
+  },
+  "auth": {
+    "login": "Login",
+    "signIn": "Sign in",
+    "signOut": "Log out",
+    "register": "Register",
+    "startTrial": "Start Trial",
+    "startFreeTrial": "Start Free Trial",
+    "dashboard": "Dashboard",
+    "signInTitle": "Sign in to your account",
+    "signInPrompt": "Or {link}",
+    "startTrialLink": "start your free trial",
+    "registerTitle": "Start your 30-day free trial",
+    "registerPrompt": "Already have an account?",
+    "signInLink": "Sign in",
+    "email": "Email address",
+    "password": "Password",
+    "confirmPassword": "Confirm password",
+    "fullName": "Full name",
+    "rememberMe": "Remember me",
+    "forgotPassword": "Forgot your password?",
+    "invalidCredentials": "Invalid email or password",
+    "loginFailed": "Login failed",
+    "registrationFailed": "Registration failed. Please try again.",
+    "startMyFreeTrial": "Start my free trial",
+    "trialIncludes": "Your trial includes:",
+    "trialTeamMembers": "Up to 5 team members",
+    "trialFullAccess": "Full access to all features",
+    "trialNoCard": "30 days free, no credit card required",
+    "termsAgreement": "By signing up, you agree to our {terms} and {privacy}",
+    "termsOfService": "Terms of Service",
+    "privacyPolicy": "Privacy Policy",
+    "signedIn": "Signed in",
+    "switchOrganization": "Switch organization",
+    "subscriptions": "Subscriptions",
+    "account": "Account",
+    "emailPlaceholder": "you@example.com",
+    "passwordPlaceholder": "••••••••",
+    "namePlaceholder": "John Doe",
+    "termsIntro": "By signing up, you agree to our",
+    "errorRegistrationFailed": "Registration failed",
+    "errorLoginFailed": "Login failed",
+    "errorCreateOrganization": "Failed to create organization",
+    "acceptInviteTitle": "Accept invitation",
+    "loadingInvitation": "Loading invitation...",
+    "invalidInvitationLink": "Invalid invitation link",
+    "invitationAlreadyAccepted": "This invitation is already accepted. You can log in now.",
+    "errorLoadInvitation": "Could not load invitation",
+    "organizationLabel": "Organization:",
+    "emailLabel": "Email:",
+    "nameRequired": "Name is required",
+    "passwordMinLength8": "Password must be at least 8 characters",
+    "passwordsDoNotMatch": "Passwords do not match",
+    "labelName": "Name",
+    "labelCreatePassword": "Create password",
+    "labelConfirmPassword": "Confirm password",
+    "activateAccount": "Activate account",
+    "invitationAcceptedRedirect": "Invitation Accepted. Redirecting to login...",
+    "errorAcceptInvitation": "Could not accept invitation",
+    "alreadyHaveAccess": "Already have access?",
+    "goToLogin": "Go to login",
+    "acceptOrganizationTitle": "Accept organization invitation",
+    "alreadyHaveAccount": "Already have an account?",
+    "invitedBy": "Invited by:",
+    "ownerEmail": "Owner email",
+    "activateOrganization": "Activate organization",
+    "organizationAcceptedRedirect": "Invitation accepted. Redirecting to login...",
+    "stepAccount": "Account",
+    "stepOrganization": "Organization",
+    "organizationName": "Organization name",
+    "organizationNamePlaceholder": "Sunshine Dental Clinic",
+    "organizationEmail": "Organization email",
+    "organizationEmailPlaceholder": "contact@sunshineclinic.com",
+    "organizationType": "Organization type",
+    "dentalClinic": "Dental Clinic",
+    "dentalLab": "Dental Lab"
+  },
+  "landing": {
+    "heroTitle": "Connect Dental Clinics & Labs",
+    "heroHighlight": "Seamlessly",
+    "heroSubtitle": "Streamline communication between dental professionals. Start with a 30-day free trial, no credit card required.",
+    "featureClinicsTitle": "For Clinics",
+    "featureClinicsDescription": "Manage patients, appointments, and send cases to labs instantly.",
+    "featureLabsTitle": "For Labs",
+    "featureLabsDescription": "Receive cases, track progress, and communicate with clinics.",
+    "featureTeamTitle": "Team Management",
+    "featureTeamDescription": "Add up to 5 team members during trial. Scale as you grow.",
+    "featureTrialTitle": "30-Day Trial",
+    "featureTrialDescription": "Full access to all features. No credit card required.",
+    "featureRealtimeTitle": "Real-time Updates",
+    "featureRealtimeDescription": "Get instant notifications on case status changes.",
+    "featureSecurityTitle": "Secure & Compliant",
+    "featureSecurityDescription": "HIPAA-compliant with enterprise-grade security.",
+    "footerCopyright": "© 2026 DyoLink. All rights reserved.",
+    "termsAndConditions": "Terms & Conditions"
+  },
+  "accountMenu": {
+    "noActiveSubscription": "No active subscription — review Subscriptions",
+    "trialEnded": "Trial ended — review Subscriptions",
+    "trialEndingSoon": "Trial ending soon — review Subscriptions",
+    "seatsLow": "Seats running low — review Subscriptions",
+    "reviewSubscriptions": "Review Subscriptions"
+  },
+  "validation": {
+    "emailInvalid": "Please enter a valid email address",
+    "passwordRequired": "Password is required",
+    "nameMinLength": "Name must be at least 2 characters",
+    "passwordMinLength": "Password must be at least 8 characters",
+    "passwordUppercase": "Password must contain at least one uppercase letter",
+    "passwordNumber": "Password must contain at least one number",
+    "organizationNameMinLength": "Organization name must be at least 2 characters",
+    "organizationEmailInvalid": "Please enter a valid organization email",
+    "organizationTypeRequired": "Please select organization type",
+    "passwordsDoNotMatch": "Passwords don't match"
+  },
+  "today": {
+    "welcomeBack": "Welcome back!!",
+    "noSubscriptionNotice": "This organization does not have an active subscription yet.",
+    "choosePlanLink": "Choose a plan",
+    "noSubscriptionCta": "to start the purchase process.",
+    "cardTodaysAppointments": "Today's Appointments",
+    "cardActivePatients": "Active Patients",
+    "cardNewLabCase": "New Lab Case",
+    "cardTodayInvoices": "Today invoices"
+  },
+  "staff": {
+    "redirecting": "Redirecting…",
+    "title": "Staff Management",
+    "subtitle": "Invite teammates, set tab access, and stay within your plan seat limit.",
+    "inviteMember": "Invite member",
+    "seatsLabel": "Seats:",
+    "unlimitedPlan": "(unlimited plan)",
+    "seatLimitReached": "Plan seat limit reached for this organization.",
+    "noActivePlan": "No active plan selected for this organization. Choose a subscription plan to invite members.",
+    "invitedPending": "Invitation is pending until they open the link, set a password, and log in.",
+    "invitedAccepted": "Invitation was accepted immediately.",
+    "inviteLinkHeading": "Invite link",
+    "shareLinkHint": "Share this link manually via SMS or email. A new link is generated if the previous one expired or was lost.",
+    "loadingTeam": "Loading team…",
+    "tableName": "Name",
+    "tableEmail": "Email",
+    "tableRole": "Role",
+    "tableStatus": "Status",
+    "tableAccess": "Access",
+    "tableAction": "Action",
+    "roleOwner": "Owner",
+    "roleStaff": "Staff",
+    "statusActive": "Active",
+    "statusPending": "Pending",
+    "statusDisabled": "Disabled",
+    "statusExpired": "Expired",
+    "allFeatures": "All features",
+    "inviteModalTitle": "Invite team member",
+    "stepOf": "Step {step} of 2",
+    "permissionView": "View",
+    "permissionEdit": "Edit",
+    "labelEmail": "Email",
+    "labelDisplayName": "Display name",
+    "tabAccess": "Tab access",
+    "sendInvite": "Send invite",
+    "skipForNow": "Skip for now",
+    "enableModalTitle": "Enable team member",
+    "enableConfirm": "Enable {name} ({email})?",
+    "enableBullet1": "They can sign in to this organization again with their existing account.",
+    "enableBullet2": "No new invitation is sent and no data was removed while they were disabled.",
+    "enableBullet3": "Enabling uses one seat on your plan.",
+    "noSeatsAvailable": "No seats are available. Disable another member or upgrade your plan before enabling this person.",
+    "enableMemberButton": "Enable member",
+    "disableModalTitle": "Disable team member",
+    "disableConfirm": "Disable {name} ({email})?",
+    "disableBullet1": "They will not be able to sign in to this organization.",
+    "disableBullet2": "No data will be removed.",
+    "disableBullet3": "Disabling frees one seat on your plan so you can invite someone else.",
+    "disableMemberButton": "Disable member",
+    "editModalTitle": "Edit member",
+    "loadingWorkingHours": "Loading working hours…",
+    "errorLoadStaff": "Failed to load staff.",
+    "errorCopyInvite": "Could not copy invitation link.",
+    "errorSendInvite": "Failed to send invitation.",
+    "errorLoadWorkingHours": "Failed to load working hours.",
+    "successMemberUpdated": "Member updated.",
+    "errorUpdateMember": "Failed to update member.",
+    "errorDeleteNotImplemented": "Delete is not implemented yet.",
+    "successMemberDisabled": "{name} was disabled. A seat is now available.",
+    "errorDisableMember": "Failed to disable member.",
+    "successMemberEnabled": "{name} was enabled and can sign in again.",
+    "errorEnableMember": "Failed to enable member.",
+    "successInvited": "{name} ({email}) was invited.",
+    "copyInviteLink": "Copy invitation link",
+    "copyInviteLinkTitle": "Copy invitation link (generates a new link if needed)",
+    "enableMemberAria": "Enable member",
+    "enableMemberTitle": "Enable member (uses a seat)",
+    "disableMemberAria": "Disable member",
+    "disableMemberTitle": "Disable member (frees a seat)",
+    "editMemberAria": "Edit member",
+    "deleteMemberAria": "Delete member",
+    "deleteMemberTitle": "Delete member (not implemented)",
+    "features": {
+      "featureToday": "Today",
+      "featureStaff": "Staff",
+      "featureOrganizations": "Organizations",
+      "featureClinics": "Clinics",
+      "featureLabs": "Labs",
+      "featurePatients": "Patients",
+      "featureAppointment": "Appointment",
+      "featureTreatment": "Treatment",
+      "featureBilling": "Billing",
+      "featureReports": "Reports",
+      "noTabAccess": "No tab access",
+      "readOnlySuffix": "(Read only)"
+    },
+    "workingHours": {
+      "recommendedTitle": "Working hours recommended",
+      "recommendedBody": "Staff with treatment edit access appear as provider columns in Appointments. Set their weekly hours so the schedule grid shows the right bookable times.",
+      "intro": "Set weekly working hours for this provider. The appointments grid uses these hours to show bookable time slots.",
+      "workingDay": "Working day",
+      "start": "Start",
+      "end": "End",
+      "removeShift": "Remove shift",
+      "addShift": "Add shift",
+      "autoRepeatWeekly": "Repeat these hours at the start of each week (copy forward on Monday)",
+      "weekdayMon": "Mon",
+      "weekdayTue": "Tue",
+      "weekdayWed": "Wed",
+      "weekdayThu": "Thu",
+      "weekdayFri": "Fri",
+      "weekdaySat": "Sat",
+      "weekdaySun": "Sun",
+      "validationNeedsShift": "{day} needs at least one shift or should be marked off.",
+      "validationEndAfterStart": "{day} shift end time must be after start time.",
+      "validationOverlap": "{day} shifts cannot overlap."
+    }
+  },
+  "patients": {
+    "title": "Patients",
+    "newPatient": "New Patient",
+    "errorLoadPatients": "Failed to load patients.",
+    "successPatientSaved": "Patient {firstName} {lastName} was saved successfully.",
+    "errorSavePatient": "Failed to save patient.",
+    "firstName": "First name",
+    "lastName": "Last name",
+    "phone": "Phone",
+    "savePatient": "Save Patient",
+    "dialogTitle": "New patient",
+    "searchPlaceholder": "Search patients by name, phone, email",
+    "loadingPatients": "Loading patients...",
+    "noResults": "No patients found for this search.",
+    "noContact": "No contact",
+    "selectPatient": "Select a patient to view details.",
+    "phoneLabel": "Phone:",
+    "emailLabel": "Email:",
+    "statusLabel": "Status:",
+    "statusActive": "Active",
+    "statusInactive": "Inactive",
+    "emptyValue": "-"
+  },
+  "appointments": {
+    "title": "Appointments",
+    "subtitle": "Search a patient, pick a date, then click a time slot under a provider to book.",
+    "loadingSchedule": "Loading schedule…",
+    "infoPastViewOnly": "Past appointments are view-only.",
+    "infoSelectPatient": "Select a patient before booking.",
+    "errorOutsideHours": "This appointment falls outside the provider's current working hours and cannot be edited.",
+    "successUpdated": "Appointment updated.",
+    "successSaved": "Appointment saved.",
+    "errorUpdate": "Could not update appointment.",
+    "errorSave": "Could not save appointment.",
+    "confirmRemove": "Remove this appointment?",
+    "successRemoved": "Appointment removed.",
+    "errorDelete": "Could not delete appointment.",
+    "errorLoadSchedule": "Failed to load schedule.",
+    "successPatientSaved": "Patient {firstName} {lastName} was saved.",
+    "searchPlaceholder": "Search existing patients",
+    "searching": "Searching…",
+    "searchHint": "Type to search patients by name, phone, or email.",
+    "noPermissionAdd": "You do not have permission to add patients.",
+    "editTitle": "Edit appointment",
+    "newTitle": "New appointment",
+    "providerLabel": "Provider:",
+    "patientLabel": "Patient",
+    "startLabel": "Start",
+    "endLabel": "End",
+    "purposeLabel": "Purpose",
+    "errorSelectPatient": "Select a patient first.",
+    "errorEndAfterStart": "End time must be after start time.",
+    "errorPastSchedule": "Cannot schedule in the past.",
+    "errorPastViewOnly": "Past appointments are view-only.",
+    "errorMissingDetails": "Missing appointment details.",
+    "noProviders": "No providers available. Add staff with treatment edit access to see columns here.",
+    "noWorkingHours": "No working hours are configured for this day. Set provider working hours in Staff management.",
+    "noHoursSet": "No hours set",
+    "offToday": "Off today",
+    "slotOffToday": "Provider is off today",
+    "slotHoursNotConfigured": "Working hours not configured",
+    "slotOutsideHours": "Outside working hours",
+    "slotCannotCreate": "You cannot create appointments",
+    "slotBookAt": "Book {time}",
+    "outsideHoursBlocked": "Outside working hours — editing blocked",
+    "overlappingChoose": "{count} overlapping — click to choose",
+    "overlapping": "{count} overlapping",
+    "legend": "Legend",
+    "overlappingTitle": "Overlapping appointments ({count})",
+    "purposeConsultation": "Consultation",
+    "purposeFilling": "Filling",
+    "purposeEndo": "Endo",
+    "purposeVisit": "Visit",
+    "purposeHygiene": "Hygiene"
+  },
+  "treatment": {
+    "loading": "Loading…",
+    "noPermissionTitle": "Treatment workspace",
+    "noPermissionBody": "You do not have permission to view the Treatment tab for this organization.",
+    "title": "Treatment",
+    "subtitleEdit": "Document cases for your appointments, save drafts, and send work to linked organizations.",
+    "subtitleReadOnly": "View-only access — you can review appointments and treatment history but cannot edit.",
+    "pastDayNotice": "Past days are view-only. You can review appointments and history, but treatment cases cannot be added or changed.",
+    "selectedPatient": "Selected patient",
+    "purposeLabel": "Purpose:",
+    "loadingAppointments": "Loading appointments…",
+    "selectDayWithAppointment": "Select a day with at least one appointment.",
+    "confirmDiscard": "You have unsaved changes. Discard them and continue?",
+    "successDraftSaved": "Treatment draft saved.",
+    "errorChooseOrg": "Choose at least one active organization to send this case.",
+    "successCaseSent": "Case sent to selected organizations.",
+    "successFilesUploaded": "{count} file(s) uploaded successfully.",
+    "errorLoadAppointments": "Failed to load appointments.",
+    "errorLoadOrgs": "Failed to load linked organizations.",
+    "errorLoadHistory": "Failed to load treatment history.",
+    "errorLoadDraft": "Failed to load treatment draft.",
+    "errorUpload": "Failed to upload attachments.",
+    "errorSaveDraft": "Failed to save treatment draft.",
+    "errorSendCase": "Failed to send case.",
+    "errorCaseMustSave": "Case must be saved before sending.",
+    "draftTitle": "Draft · {patientName}",
+    "hiddenMessage": "Appointments are hidden.",
+    "showAppointments": "Show appointments",
+    "appointmentsTitle": "My appointments",
+    "hideAppointments": "Hide appointments",
+    "emptyDay": "No appointments assigned to you on this day.",
+    "casesTitle": "Treatment cases",
+    "casesSubtitle": "Each case has its own teeth, notes, attachments, and destinations for send.",
+    "addCase": "Add case",
+    "caseLabel": "Case {n}",
+    "comments": "Comments",
+    "commentsPlaceholder": "Write clinical notes for this case…",
+    "treatmentType": "Treatment type",
+    "typeConsultation": "consultation",
+    "typeFilling": "filling",
+    "typeEndo": "endo",
+    "typeVisit": "visit",
+    "typeHygiene": "hygiene",
+    "attachments": "Attachments",
+    "attachFiles": "Attach files for this treatment case",
+    "chooseFiles": "Choose files",
+    "sendToOrgs": "Send this case to linked organizations",
+    "searchOrgsPlaceholder": "Search active organizations...",
+    "recent": "Recent:",
+    "noOrgMatch": "No active organization matches your search.",
+    "sendThisCase": "Send this case",
+    "saveDraft": "Save treatment draft",
+    "unsavedChanges": "Unsaved changes",
+    "draftSaved": "Draft saved",
+    "sendSavesFirst": "Sending is per case and saves first automatically.",
+    "historyTitle": "Previous treatments",
+    "historySubtitle": "Completed treatments for this patient. Each case is listed separately.",
+    "loadingHistory": "Loading history…",
+    "historyEmpty": "No prior treatments for this patient.",
+    "statusLabel": "Status:",
+    "historyCaseLabel": "Case {n} · {type}",
+    "teethLabel": "Teeth:",
+    "teethNone": "None selected",
+    "reviewDetails": "Review details",
+    "previewTitle": "Treatment preview",
+    "previewDraft": "Preview current draft",
+    "selectAppointment": "Select an appointment to preview its draft.",
+    "caseCount": "{n} case(s)",
+    "attachmentCount": "{n} attachment(s)",
+    "caseSummary": "Case {n}: {type}",
+    "teethPrefix": "· Teeth",
+    "moreCases": "+ {n} more case(s)",
+    "previewDialogTitle": "Treatment preview",
+    "previewDialogSubtitle": "Review cases, attachments, and send destinations.",
+    "noCases": "No cases in this treatment.",
+    "typeLabel": "Type:",
+    "commentsLabel": "Comments:",
+    "commentsEmpty": "Comments: —",
+    "attachFilesShort": "Attach files",
+    "sendCase": "Send this case",
+    "sendToLinkedOrgs": "Send to linked organizations",
+    "noActiveOrgs": "No active linked organizations.",
+    "confirmSend": "Confirm send",
+    "toothChartTitle": "FDI tooth chart",
+    "toothChartHint": "Tap teeth to multi-select. Applies to the active case.",
+    "selectedLabel": "Selected:",
+    "selectedEmpty": "—",
+    "upperArch": "Upper arch",
+    "lowerArch": "Lower arch",
+    "toothAria": "FDI tooth {fdi}",
+    "toothSelectedSuffix": ", selected",
+    "sentToAt": "Sent to {orgName} at {datetime}",
+    "fallbackOrgName": "organization"
+  },
+  "organizations": {
+    "loadingOrganization": "Loading organization...",
+    "subtitle": "Search organizations, send connection requests to existing accounts, or invitation links when they are not on DyoLink yet.",
+    "invitationHistory": "Invitation History",
+    "searchPlaceholder": "Search {counterpart} by name, email, or phone...",
+    "backToList": "Back to list",
+    "tableOrganization": "Organization",
+    "tableOwnerEmail": "Owner email",
+    "tableDate": "Date",
+    "tableStatus": "Status",
+    "tableAction": "Action",
+    "emptyConnections": "No connections yet. Search to send a connection request or an invitation link.",
+    "statusInvitationPending": "Invitation pending",
+    "statusConnectionPending": "Connection request pending",
+    "statusConnected": "Connected",
+    "statusDeclined": "Connection request declined",
+    "statusFound": "Found",
+    "statusToday": "Today",
+    "acceptRequest": "Accept connection request",
+    "declineRequest": "Decline connection request",
+    "removeConnection": "Remove connection",
+    "sendRequest": "Send connection request",
+    "noDirectoryResults": "No organization found in directory search.",
+    "hideInvitationFields": "Hide invitation fields",
+    "sendInvitationLink": "Send invitation link",
+    "counterpartNameLabel": "{counterpart} name",
+    "ownerEmailLabel": "Owner email",
+    "sendInvitation": "Send invitation",
+    "successConnectionSent": "{counterpart} connection request sent.",
+    "successInviteCreated": "Invitation link created for {email}",
+    "successLinkCopied": "Invitation link copied to clipboard.",
+    "successAccepted": "Connection request accepted.",
+    "successDeclined": "Connection request declined.",
+    "successRemoved": "Connection removed.",
+    "historyTitle": "Invitation History",
+    "loadingHistory": "Loading invitation history...",
+    "historyEmpty": "No invitations yet.",
+    "tableInvitationLink": "Invitation link",
+    "statusPending": "Invitation pending",
+    "statusAccepted": "Invitation accepted",
+    "statusRejected": "Invitation rejected",
+    "statusExpired": "Invitation expired",
+    "copyInvitationLink": "Copy invitation link",
+    "copyInvitationLinkTitle": "Copy invitation link (generates a new link if needed)",
+    "selectorTitle": "Organizations",
+    "selectorSubtitleWithCreate": "Select an organization to continue, or create a new one.",
+    "selectorSubtitleSelectOnly": "Select an organization to continue.",
+    "createOrganization": "Create Organization",
+    "createAndContinue": "Create and Continue",
+    "emptyCanCreate": "No organizations found. Create your first one to continue.",
+    "emptyAskOwner": "No organizations found. Ask an organization owner to invite you.",
+    "continueArrow": "Continue →",
+    "planLabel": "Plan: {name} • {maxUsers} users",
+    "counterpartClinic": "Clinic",
+    "counterpartLab": "Lab"
+  },
+  "settings": {
+    "accountTitle": "Account",
+    "accountSubtitle": "Profile and security settings for your login.",
+    "accountPlaceholder": "Password change and profile editing will be wired here next (e.g. invite flow, reset password).",
+    "subscriptionsTitle": "Subscriptions",
+    "subscriptionsSubtitle": "Your DyoLink workspace plan and seats for {orgName}. Clinic and lab income tracking stays under the sidebar Billing tab.",
+    "noSubscriptionNotice": "This organization has no active subscription. Select a plan below to start the purchase process.",
+    "currentPlan": "Current plan",
+    "planPrice": "Plan price",
+    "seatsUsed": "Seats used",
+    "seatsRemaining": "Seats remaining",
+    "daysRemaining": "Days remaining",
+    "unlimited": "Unlimited",
+    "unlimitedSeats": "Unlimited seats",
+    "seatsCount": "{n} seats",
+    "pricePerMonth": "${price} / month",
+    "noActiveSubscription": "No active subscription for this organization.",
+    "trialEnded": "Trial period has ended. Choose a plan when checkout is available.",
+    "trialEndsIn": "Trial ends in {days} day(s).",
+    "seatsLow": "Seat usage is high for this organization.",
+    "choosePlanIntro": "Choose a plan to continue. Purchase integration is not active yet, so this currently prepares the selection step only.",
+    "planSolo": "Solo",
+    "planSmall": "Small",
+    "planMedium": "Medium",
+    "planLarge": "Large",
+    "planEnterprise": "Enterprise",
+    "startPurchase": "Start purchase process",
+    "purchaseNotice": "Purchase flow will be enabled soon. {plan} is selected and ready for checkout setup."
+  },
+  "schedule": {
+    "defaultLabel": "Schedule date",
+    "previousDay": "Previous day",
+    "nextDay": "Next day",
+    "chooseDate": "Choose schedule date",
+    "year": "Year",
+    "month": "Month",
+    "day": "Day",
+    "monthJanuary": "January",
+    "monthFebruary": "February",
+    "monthMarch": "March",
+    "monthApril": "April",
+    "monthMay": "May",
+    "monthJune": "June",
+    "monthJuly": "July",
+    "monthAugust": "August",
+    "monthSeptember": "September",
+    "monthOctober": "October",
+    "monthNovember": "November",
+    "monthDecember": "December"
+  }
+}
diff --git a/frontend/messages/fa.json b/frontend/messages/fa.json
new file mode 100644
index 0000000..e87d189
--- /dev/null
+++ b/frontend/messages/fa.json
@@ -0,0 +1,566 @@
+{
+  "common": {
+    "appName": "DyoLink",
+    "loading": "در حال بارگذاری...",
+    "loadingApp": "در حال بارگذاری برنامه...",
+    "loadingWorkspace": "در حال بارگذاری فضای کاری...",
+    "continue": "ادامه",
+    "back": "بازگشت",
+    "save": "ذخیره",
+    "cancel": "لغو",
+    "delete": "حذف",
+    "edit": "ویرایش",
+    "next": "بعدی",
+    "dismiss": "رد کردن",
+    "or": "یا",
+    "and": "و",
+    "close": "بستن",
+    "redirecting": "در حال انتقال...",
+    "readOnlyAccess": "دسترسی فقط خواندنی برای این سازمان.",
+    "errorGeneric": "خطایی رخ داده است",
+    "loadingEllipsis": "در حال بارگذاری...",
+    "search": "جستجو",
+    "action": "عملیات",
+    "status": "وضعیت",
+    "name": "نام",
+    "email": "ایمیل",
+    "date": "تاریخ",
+    "organization": "سازمان",
+    "backToApp": "← بازگشت به برنامه",
+    "copied": "کپی شد",
+    "copyLink": "کپی لینک",
+    "none": "هیچکدام",
+    "preview": "پیش‌نمایش"
+  },
+  "language": {
+    "label": "زبان",
+    "selectLanguage": "انتخاب زبان",
+    "en": "انگلیسی",
+    "fa": "فارسی",
+    "nl": "هلندی"
+  },
+  "theme": {
+    "switchToLight": "تغییر به حالت روشن",
+    "switchToDark": "تغییر به حالت تیره",
+    "lightMode": "حالت روشن",
+    "darkMode": "حالت تیره"
+  },
+  "nav": {
+    "dashboard": "داشبورد",
+    "staff": "کارکنان",
+    "patients": "بیماران",
+    "appointment": "نوبت‌ها",
+    "treatment": "درمان",
+    "billing": "صورتحساب",
+    "reports": "گزارش‌ها",
+    "clinics": "کلینیک‌ها",
+    "labs": "لابراتوارها"
+  },
+  "auth": {
+    "login": "ورود",
+    "signIn": "ورود به حساب",
+    "signOut": "خروج",
+    "register": "ثبت‌نام",
+    "startTrial": "شروع دوره آزمایشی",
+    "startFreeTrial": "شروع دوره آزمایشی رایگان",
+    "dashboard": "داشبورد",
+    "signInTitle": "به حساب کاربری خود وارد شوید",
+    "signInPrompt": "یا {link}",
+    "startTrialLink": "دوره آزمایشی رایگان خود را شروع کنید",
+    "registerTitle": "دوره آزمایشی رایگان ۳۰ روزه خود را آغاز کنید",
+    "registerPrompt": "از قبل حساب کاربری دارید؟",
+    "signInLink": "وارد شوید",
+    "email": "آدرس ایمیل",
+    "password": "رمز عبور",
+    "confirmPassword": "تأیید رمز عبور",
+    "fullName": "نام و نام خانوادگی",
+    "rememberMe": "مرا به خاطر بسپار",
+    "forgotPassword": "رمز عبور خود را فراموش کرده‌اید؟",
+    "invalidCredentials": "ایمیل یا رمز عبور نامعتبر است",
+    "loginFailed": "ورود ناموفق بود",
+    "registrationFailed": "ثبت‌نام ناموفق بود. لطفاً دوباره تلاش کنید.",
+    "startMyFreeTrial": "دوره آزمایشی رایگان من را شروع کن",
+    "trialIncludes": "دوره آزمایشی شما شامل موارد زیر است:",
+    "trialTeamMembers": "تا ۵ عضو تیم",
+    "trialFullAccess": "دسترسی کامل به تمام امکانات",
+    "trialNoCard": "۳۰ روز رایگان، بدون نیاز به کارت اعتباری",
+    "termsAgreement": "با ثبت‌نام، شما با {terms} و {privacy} ما موافقت می‌کنید",
+    "termsOfService": "شرایط استفاده از خدمات",
+    "privacyPolicy": "سیاست حفظ حریم خصوصی",
+    "signedIn": "وارد شده‌اید",
+    "switchOrganization": "تغییر سازمان",
+    "subscriptions": "اشتراک‌ها",
+    "account": "حساب کاربری",
+    "emailPlaceholder": "you@example.com",
+    "passwordPlaceholder": "••••••••",
+    "namePlaceholder": "John Doe",
+    "termsIntro": "با ثبت‌نام، شما با",
+    "errorRegistrationFailed": "ثبت‌نام ناموفق بود",
+    "errorLoginFailed": "ورود ناموفق بود",
+    "errorCreateOrganization": "ایجاد سازمان ناموفق بود",
+    "acceptInviteTitle": "پذیرش دعوتنامه",
+    "loadingInvitation": "در حال بارگذاری دعوتنامه...",
+    "invalidInvitationLink": "لینک دعوتنامه نامعتبر است",
+    "invitationAlreadyAccepted": "این دعوتنامه قبلاً پذیرفته شده است. اکنون می‌توانید وارد شوید.",
+    "errorLoadInvitation": "بارگذاری دعوتنامه امکان‌پذیر نبود",
+    "organizationLabel": "سازمان:",
+    "emailLabel": "ایمیل:",
+    "nameRequired": "نام الزامی است",
+    "passwordMinLength8": "رمز عبور باید حداقل ۸ کاراکتر باشد",
+    "passwordsDoNotMatch": "رمزهای عبور مطابقت ندارند",
+    "labelName": "نام",
+    "labelCreatePassword": "ایجاد رمز عبور",
+    "labelConfirmPassword": "تأیید رمز عبور",
+    "activateAccount": "فعال‌سازی حساب",
+    "invitationAcceptedRedirect": "دعوتنامه پذیرفته شد. در حال انتقال به صفحه ورود...",
+    "errorAcceptInvitation": "پذیرش دعوتنامه امکان‌پذیر نبود",
+    "alreadyHaveAccess": "از قبل دسترسی دارید؟",
+    "goToLogin": "رفتن به ورود",
+    "acceptOrganizationTitle": "پذیرش دعوتنامه سازمان",
+    "alreadyHaveAccount": "از قبل حساب کاربری دارید؟",
+    "invitedBy": "دعوت‌کننده:",
+    "ownerEmail": "ایمیل مالک",
+    "activateOrganization": "فعال‌سازی سازمان",
+    "organizationAcceptedRedirect": "دعوتنامه پذیرفته شد. در حال انتقال به صفحه ورود...",
+    "stepAccount": "حساب",
+    "stepOrganization": "سازمان",
+    "organizationName": "نام سازمان",
+    "organizationNamePlaceholder": "کلینیک دندانپزشکی خورشید",
+    "organizationEmail": "ایمیل سازمان",
+    "organizationEmailPlaceholder": "contact@sunshineclinic.com",
+    "organizationType": "نوع سازمان",
+    "dentalClinic": "کلینیک دندانپزشکی",
+    "dentalLab": "لابراتوار دندانپزشکی"
+  },
+  "landing": {
+    "heroTitle": "اتصال کلینیک‌ها و لابراتوارهای دندانپزشکی",
+    "heroHighlight": "به‌صورت یکپارچه",
+    "heroSubtitle": "ارتباط بین متخصصان دندانپزشکی را ساده و سریع کنید. با یک دوره آزمایشی رایگان ۳۰ روزه، بدون نیاز به کارت اعتباری، شروع کنید.",
+    "featureClinicsTitle": "برای کلینیک‌ها",
+    "featureClinicsDescription": "بیماران و نوبت‌ها را مدیریت کنید و پرونده‌ها را فوراً به لابراتوارها ارسال کنید.",
+    "featureLabsTitle": "برای لابراتوارها",
+    "featureLabsDescription": "پرونده‌ها را دریافت کنید، روند پیشرفت را پیگیری کنید و با کلینیک‌ها در ارتباط باشید.",
+    "featureTeamTitle": "مدیریت تیم",
+    "featureTeamDescription": "در طول دوره آزمایشی تا ۵ عضو تیم اضافه کنید. همگام با رشد خود مقیاس‌پذیر باشید.",
+    "featureTrialTitle": "دوره آزمایشی ۳۰ روزه",
+    "featureTrialDescription": "دسترسی کامل به تمامی امکانات. بدون نیاز به کارت اعتباری.",
+    "featureRealtimeTitle": "به‌روزرسانی‌های لحظه‌ای",
+    "featureRealtimeDescription": "اعلان‌های فوری درباره تغییر وضعیت پرونده‌ها دریافت کنید.",
+    "featureSecurityTitle": "امن و منطبق با استانداردها",
+    "featureSecurityDescription": "منطبق با HIPAA و دارای امنیت در سطح سازمانی.",
+    "footerCopyright": "© ۲۰۲۶ DyoLink. تمامی حقوق محفوظ است.",
+    "termsAndConditions": "شرایط و ضوابط"
+  },
+  "accountMenu": {
+    "noActiveSubscription": "اشتراک فعالی وجود ندارد — اشتراک‌ها را بررسی کنید",
+    "trialEnded": "دوره آزمایشی به پایان رسیده است — اشتراک‌ها را بررسی کنید",
+    "trialEndingSoon": "دوره آزمایشی به‌زودی به پایان می‌رسد — اشتراک‌ها را بررسی کنید",
+    "seatsLow": "ظرفیت کاربران رو به اتمام است — اشتراک‌ها را بررسی کنید",
+    "reviewSubscriptions": "بررسی اشتراک‌ها"
+  },
+  "validation": {
+    "emailInvalid": "لطفاً یک آدرس ایمیل معتبر وارد کنید",
+    "passwordRequired": "رمز عبور الزامی است",
+    "nameMinLength": "نام باید حداقل ۲ کاراکتر باشد",
+    "passwordMinLength": "رمز عبور باید حداقل ۸ کاراکتر باشد",
+    "passwordUppercase": "رمز عبور باید حداقل شامل یک حرف بزرگ باشد",
+    "passwordNumber": "رمز عبور باید حداقل شامل یک عدد باشد",
+    "organizationNameMinLength": "نام سازمان باید حداقل ۲ کاراکتر باشد",
+    "organizationEmailInvalid": "لطفاً یک ایمیل سازمانی معتبر وارد کنید",
+    "organizationTypeRequired": "لطفاً نوع سازمان را انتخاب کنید",
+    "passwordsDoNotMatch": "رمزهای عبور مطابقت ندارند"
+  },
+  "today": {
+    "welcomeBack": "خوش آمدید!!",
+    "noSubscriptionNotice": "این سازمان هنوز اشتراک فعالی ندارد.",
+    "choosePlanLink": "انتخاب طرح",
+    "noSubscriptionCta": "برای شروع فرآیند خرید.",
+    "cardTodaysAppointments": "نوبت‌های امروز",
+    "cardActivePatients": "بیماران فعال",
+    "cardNewLabCase": "پرونده جدید لابراتوار",
+    "cardTodayInvoices": "صورتحساب‌های امروز"
+  },
+  "staff": {
+    "redirecting": "در حال انتقال...",
+    "title": "مدیریت کارکنان",
+    "subtitle": "از همکاران خود دعوت کنید، دسترسی به برگه‌ها را تنظیم کنید و در محدوده طرح خود باقی بمانید.",
+    "inviteMember": "دعوت از عضو",
+    "seatsLabel": "مجوزها:",
+    "unlimitedPlan": "(طرح نامحدود)",
+    "seatLimitReached": "ظرفیت مجوزهای طرح برای این سازمان تکمیل شده است.",
+    "noActivePlan": "هیچ طرح فعالی برای این سازمان انتخاب نشده است. برای دعوت از اعضا، یک طرح اشتراک انتخاب کنید.",
+    "invitedPending": "دعوتنامه تا زمانی که لینک را باز کنند، رمز عبور تنظیم کنند و وارد شوند، در حالت انتظار است.",
+    "invitedAccepted": "دعوتنامه بلافاصله پذیرفته شد.",
+    "inviteLinkHeading": "لینک دعوت",
+    "shareLinkHint": "این لینک را به صورت دستی از طریق پیامک یا ایمیل به اشتراک بگذارید. در صورت منقضی شدن یا گم شدن لینک قبلی، لینک جدیدی تولید می‌شود.",
+    "loadingTeam": "در حال بارگذاری تیم...",
+    "tableName": "نام",
+    "tableEmail": "ایمیل",
+    "tableRole": "نقش",
+    "tableStatus": "وضعیت",
+    "tableAccess": "دسترسی",
+    "tableAction": "عملیات",
+    "roleOwner": "مالک",
+    "roleStaff": "کارمند",
+    "statusActive": "فعال",
+    "statusPending": "در انتظار",
+    "statusDisabled": "غیرفعال",
+    "statusExpired": "منقضی شده",
+    "allFeatures": "همه امکانات",
+    "inviteModalTitle": "دعوت از عضو تیم",
+    "stepOf": "مرحله {step} از ۲",
+    "permissionView": "نمایش",
+    "permissionEdit": "ویرایش",
+    "labelEmail": "ایمیل",
+    "labelDisplayName": "نام نمایشی",
+    "tabAccess": "دسترسی به برگه‌ها",
+    "sendInvite": "ارسال دعوتنامه",
+    "skipForNow": "فعلاً رد کردن",
+    "enableModalTitle": "فعال‌سازی عضو تیم",
+    "enableConfirm": "{name} ({email}) فعال شود؟",
+    "enableBullet1": "آنها می‌توانند دوباره با حساب موجود خود وارد این سازمان شوند.",
+    "enableBullet2": "هیچ دعوتنامه جدیدی ارسال نمی‌شود و در زمان غیرفعال بودن هیچ داده‌ای حذف نشده است.",
+    "enableBullet3": "فعال‌سازی از یک مجوز در طرح شما استفاده می‌کند.",
+    "noSeatsAvailable": "هیچ مجوزی در دسترس نیست. قبل از فعال‌سازی این شخص، عضو دیگری را غیرفعال کنید یا طرح خود را ارتقا دهید.",
+    "enableMemberButton": "فعال‌سازی عضو",
+    "disableModalTitle": "غیرفعال‌سازی عضو تیم",
+    "disableConfirm": "{name} ({email}) غیرفعال شود؟",
+    "disableBullet1": "آنها نمی‌توانند وارد این سازمان شوند.",
+    "disableBullet2": "هیچ داده‌ای حذف نمی‌شود.",
+    "disableBullet3": "غیرفعال‌سازی یک مجوز در طرح شما را آزاد می‌کند تا بتوانید شخص دیگری را دعوت کنید.",
+    "disableMemberButton": "غیرفعال‌سازی عضو",
+    "editModalTitle": "ویرایش عضو",
+    "loadingWorkingHours": "در حال بارگذاری ساعات کاری...",
+    "errorLoadStaff": "بارگذاری کارکنان ناموفق بود.",
+    "errorCopyInvite": "کپی لینک دعوتنامه امکان‌پذیر نبود.",
+    "errorSendInvite": "ارسال دعوتنامه ناموفق بود.",
+    "errorLoadWorkingHours": "بارگذاری ساعات کاری ناموفق بود.",
+    "successMemberUpdated": "عضو به‌روزرسانی شد.",
+    "errorUpdateMember": "به‌روزرسانی عضو ناموفق بود.",
+    "errorDeleteNotImplemented": "حذف هنوز پیاده‌سازی نشده است.",
+    "successMemberDisabled": "{name} غیرفعال شد. یک مجوز در دسترس قرار گرفت.",
+    "errorDisableMember": "غیرفعال‌سازی عضو ناموفق بود.",
+    "successMemberEnabled": "{name} فعال شد و می‌تواند دوباره وارد شود.",
+    "errorEnableMember": "فعال‌سازی عضو ناموفق بود.",
+    "successInvited": "{name} ({email}) دعوت شد.",
+    "copyInviteLink": "کپی لینک دعوتنامه",
+    "copyInviteLinkTitle": "کپی لینک دعوتنامه (در صورت نیاز لینک جدیدی تولید می‌کند)",
+    "enableMemberAria": "فعال‌سازی عضو",
+    "enableMemberTitle": "فعال‌سازی عضو (از یک مجوز استفاده می‌کند)",
+    "disableMemberAria": "غیرفعال‌سازی عضو",
+    "disableMemberTitle": "غیرفعال‌سازی عضو (یک مجوز را آزاد می‌کند)",
+    "editMemberAria": "ویرایش عضو",
+    "deleteMemberAria": "حذف عضو",
+    "deleteMemberTitle": "حذف عضو (پیاده‌سازی نشده)",
+    "features": {
+      "featureToday": "امروز",
+      "featureStaff": "کارکنان",
+      "featureOrganizations": "سازمان‌ها",
+      "featureClinics": "کلینیک‌ها",
+      "featureLabs": "لابراتوارها",
+      "featurePatients": "بیماران",
+      "featureAppointment": "نوبت‌ها",
+      "featureTreatment": "درمان",
+      "featureBilling": "صورتحساب",
+      "featureReports": "گزارش‌ها",
+      "noTabAccess": "دسترسی به برگه‌ها وجود ندارد",
+      "readOnlySuffix": "(فقط خواندنی)"
+    },
+    "workingHours": {
+      "recommendedTitle": "ساعات کاری توصیه می‌شود",
+      "recommendedBody": "کارکنانی که دسترسی ویرایش درمان دارند، به عنوان ستون‌های ارائه‌دهنده در نوبت‌ها ظاهر می‌شوند. ساعات هفتگی آنها را تنظیم کنید تا جدول زمان‌بندی زمان‌های قابل رزرو صحیح را نشان دهد.",
+      "intro": "ساعات کاری هفتگی این ارائه‌دهنده را تنظیم کنید. جدول نوبت‌ها از این ساعات برای نمایش زمان‌های قابل رزرو استفاده می‌کند.",
+      "workingDay": "روز کاری",
+      "start": "شروع",
+      "end": "پایان",
+      "removeShift": "حذف شیفت",
+      "addShift": "افزودن شیفت",
+      "autoRepeatWeekly": "این ساعات را در ابتدای هر هفته تکرار کنید (کپی به جلو در روز دوشنبه)",
+      "weekdayMon": "دوشنبه",
+      "weekdayTue": "سه‌شنبه",
+      "weekdayWed": "چهارشنبه",
+      "weekdayThu": "پنج‌شنبه",
+      "weekdayFri": "جمعه",
+      "weekdaySat": "شنبه",
+      "weekdaySun": "یک‌شنبه",
+      "validationNeedsShift": "{day} حداقل به یک شیفت نیاز دارد یا باید به عنوان تعطیل علامت‌گذاری شود.",
+      "validationEndAfterStart": "زمان پایان شیفت {day} باید بعد از زمان شروع باشد.",
+      "validationOverlap": "شیفت‌های {day} نمی‌توانند همپوشانی داشته باشند."
+    }
+  },
+  "patients": {
+    "title": "بیماران",
+    "newPatient": "بیمار جدید",
+    "errorLoadPatients": "بارگذاری بیماران ناموفق بود.",
+    "successPatientSaved": "بیمار {firstName} {lastName} با موفقیت ذخیره شد.",
+    "errorSavePatient": "ذخیره بیمار ناموفق بود.",
+    "firstName": "نام",
+    "lastName": "نام خانوادگی",
+    "phone": "تلفن",
+    "savePatient": "ذخیره بیمار",
+    "dialogTitle": "بیمار جدید",
+    "searchPlaceholder": "جستجوی بیماران بر اساس نام، تلفن، ایمیل",
+    "loadingPatients": "در حال بارگذاری بیماران...",
+    "noResults": "هیچ بیماری برای این جستجو یافت نشد.",
+    "noContact": "بدون اطلاعات تماس",
+    "selectPatient": "برای مشاهده جزئیات، یک بیمار را انتخاب کنید.",
+    "phoneLabel": "تلفن:",
+    "emailLabel": "ایمیل:",
+    "statusLabel": "وضعیت:",
+    "statusActive": "فعال",
+    "statusInactive": "غیرفعال",
+    "emptyValue": "-"
+  },
+  "appointments": {
+    "title": "نوبت‌ها",
+    "subtitle": "یک بیمار را جستجو کنید، تاریخ را انتخاب کنید، سپس روی یک زمان در زیر ارائه‌دهنده کلیک کنید تا رزرو کنید.",
+    "loadingSchedule": "در حال بارگذاری برنامه...",
+    "infoPastViewOnly": "نوبت‌های گذشته فقط قابل مشاهده هستند.",
+    "infoSelectPatient": "قبل از رزرو، یک بیمار را انتخاب کنید.",
+    "errorOutsideHours": "این نوبت خارج از ساعات کاری فعلی ارائه‌دهنده است و قابل ویرایش نیست.",
+    "successUpdated": "نوبت به‌روزرسانی شد.",
+    "successSaved": "نوبت ذخیره شد.",
+    "errorUpdate": "به‌روزرسانی نوبت امکان‌پذیر نبود.",
+    "errorSave": "ذخیره نوبت امکان‌پذیر نبود.",
+    "confirmRemove": "این نوبت حذف شود؟",
+    "successRemoved": "نوبت حذف شد.",
+    "errorDelete": "حذف نوبت امکان‌پذیر نبود.",
+    "errorLoadSchedule": "بارگذاری برنامه ناموفق بود.",
+    "successPatientSaved": "بیمار {firstName} {lastName} ذخیره شد.",
+    "searchPlaceholder": "جستجوی بیماران موجود",
+    "searching": "در حال جستجو...",
+    "searchHint": "برای جستجوی بیماران بر اساس نام، تلفن یا ایمیل، تایپ کنید.",
+    "noPermissionAdd": "شما مجوز اضافه کردن بیمار را ندارید.",
+    "editTitle": "ویرایش نوبت",
+    "newTitle": "نوبت جدید",
+    "providerLabel": "ارائه‌دهنده:",
+    "patientLabel": "بیمار",
+    "startLabel": "شروع",
+    "endLabel": "پایان",
+    "purposeLabel": "هدف",
+    "errorSelectPatient": "ابتدا یک بیمار را انتخاب کنید.",
+    "errorEndAfterStart": "زمان پایان باید بعد از زمان شروع باشد.",
+    "errorPastSchedule": "نمی‌توان در گذشته زمان‌بندی کرد.",
+    "errorPastViewOnly": "نوبت‌های گذشته فقط قابل مشاهده هستند.",
+    "errorMissingDetails": "جزئیات نوبت وجود ندارد.",
+    "noProviders": "هیچ ارائه‌دهنده‌ای در دسترس نیست. برای مشاهده ستون‌ها در اینجا، کارکنانی با دسترسی ویرایش درمان اضافه کنید.",
+    "noWorkingHours": "ساعات کاری برای این روز پیکربندی نشده است. ساعات کاری ارائه‌دهنده را در مدیریت کارکنان تنظیم کنید.",
+    "noHoursSet": "ساعتی تنظیم نشده",
+    "offToday": "امروز تعطیل است",
+    "slotOffToday": "ارائه‌دهنده امروز تعطیل است",
+    "slotHoursNotConfigured": "ساعات کاری پیکربندی نشده است",
+    "slotOutsideHours": "خارج از ساعات کاری",
+    "slotCannotCreate": "شما نمی‌توانید نوبت ایجاد کنید",
+    "slotBookAt": "رزرو {time}",
+    "outsideHoursBlocked": "خارج از ساعات کاری — ویرایش مسدود شده است",
+    "overlappingChoose": "{count} همپوشانی — برای انتخاب کلیک کنید",
+    "overlapping": "{count} همپوشانی",
+    "legend": "راهنما",
+    "overlappingTitle": "نوبت‌های همپوشانی ({count})",
+    "purposeConsultation": "مشاوره",
+    "purposeFilling": "پر کردن",
+    "purposeEndo": "درمان ریشه",
+    "purposeVisit": "ویزیت",
+    "purposeHygiene": "بهداشت"
+  },
+  "treatment": {
+    "loading": "در حال بارگذاری...",
+    "noPermissionTitle": "فضای کاری درمان",
+    "noPermissionBody": "شما مجوز مشاهده برگه درمان برای این سازمان را ندارید.",
+    "title": "درمان",
+    "subtitleEdit": "پرونده‌های نوبت‌های خود را مستند کنید، پیش‌نویس‌ها را ذخیره کنید و کار را به سازمان‌های مرتبط ارسال کنید.",
+    "subtitleReadOnly": "دسترسی فقط خواندنی — می‌توانید نوبت‌ها و تاریخچه درمان را بررسی کنید اما نمی‌توانید ویرایش کنید.",
+    "pastDayNotice": "روزهای گذشته فقط قابل مشاهده هستند. می‌توانید نوبت‌ها و تاریخچه را بررسی کنید، اما پرونده‌های درمانی قابل اضافه یا تغییر نیستند.",
+    "selectedPatient": "بیمار انتخاب شده",
+    "purposeLabel": "هدف:",
+    "loadingAppointments": "در حال بارگذاری نوبت‌ها...",
+    "selectDayWithAppointment": "روزی را انتخاب کنید که حداقل یک نوبت داشته باشد.",
+    "confirmDiscard": "تغییرات ذخیره‌نشده دارید. آنها را کنار بگذارید و ادامه دهید؟",
+    "successDraftSaved": "پیش‌نویس درمان ذخیره شد.",
+    "errorChooseOrg": "حداقل یک سازمان فعال را برای ارسال این پرونده انتخاب کنید.",
+    "successCaseSent": "پرونده به سازمان‌های انتخاب شده ارسال شد.",
+    "successFilesUploaded": "{count} فایل با موفقیت بارگذاری شد.",
+    "errorLoadAppointments": "بارگذاری نوبت‌ها ناموفق بود.",
+    "errorLoadOrgs": "بارگذاری سازمان‌های مرتبط ناموفق بود.",
+    "errorLoadHistory": "بارگذاری تاریخچه درمان ناموفق بود.",
+    "errorLoadDraft": "بارگذاری پیش‌نویس درمان ناموفق بود.",
+    "errorUpload": "بارگذاری پیوست‌ها ناموفق بود.",
+    "errorSaveDraft": "ذخیره پیش‌نویس درمان ناموفق بود.",
+    "errorSendCase": "ارسال پرونده ناموفق بود.",
+    "errorCaseMustSave": "پرونده باید قبل از ارسال ذخیره شود.",
+    "draftTitle": "پیش‌نویس · {patientName}",
+    "hiddenMessage": "نوبت‌ها پنهان هستند.",
+    "showAppointments": "نمایش نوبت‌ها",
+    "appointmentsTitle": "نوبت‌های من",
+    "hideAppointments": "پنهان کردن نوبت‌ها",
+    "emptyDay": "هیچ نوبتی به شما در این روز اختصاص داده نشده است.",
+    "casesTitle": "پرونده‌های درمانی",
+    "casesSubtitle": "هر پرونده دارای دندان‌ها، یادداشت‌ها، پیوست‌ها و مقصدهای ارسال خود است.",
+    "addCase": "افزودن پرونده",
+    "caseLabel": "پرونده {n}",
+    "comments": "نظرات",
+    "commentsPlaceholder": "یادداشت‌های بالینی این پرونده را بنویسید...",
+    "treatmentType": "نوع درمان",
+    "typeConsultation": "مشاوره",
+    "typeFilling": "پر کردن",
+    "typeEndo": "درمان ریشه",
+    "typeVisit": "ویزیت",
+    "typeHygiene": "بهداشت",
+    "attachments": "پیوست‌ها",
+    "attachFiles": "فایل‌ها را برای این پرونده درمانی پیوست کنید",
+    "chooseFiles": "انتخاب فایل‌ها",
+    "sendToOrgs": "ارسال این پرونده به سازمان‌های مرتبط",
+    "searchOrgsPlaceholder": "جستجوی سازمان‌های فعال...",
+    "recent": "اخیر:",
+    "noOrgMatch": "هیچ سازمان فعالی با جستجوی شما مطابقت ندارد.",
+    "sendThisCase": "ارسال این پرونده",
+    "saveDraft": "ذخیره پیش‌نویس درمان",
+    "unsavedChanges": "تغییرات ذخیره‌نشده",
+    "draftSaved": "پیش‌نویس ذخیره شد",
+    "sendSavesFirst": "ارسال برای هر پرونده به صورت جداگانه است و ابتدا به طور خودکار ذخیره می‌کند.",
+    "historyTitle": "درمان‌های قبلی",
+    "historySubtitle": "درمان‌های تکمیل شده برای این بیمار. هر پرونده به طور جداگانه فهرست شده است.",
+    "loadingHistory": "در حال بارگذاری تاریخچه...",
+    "historyEmpty": "هیچ درمان قبلی برای این بیمار وجود ندارد.",
+    "statusLabel": "وضعیت:",
+    "historyCaseLabel": "پرونده {n} · {type}",
+    "teethLabel": "دندان‌ها:",
+    "teethNone": "هیچکدام انتخاب نشده",
+    "reviewDetails": "بررسی جزئیات",
+    "previewTitle": "پیش‌نمایش درمان",
+    "previewDraft": "پیش‌نمایش پیش‌نویس فعلی",
+    "selectAppointment": "یک نوبت را برای پیش‌نمایش پیش‌نویس آن انتخاب کنید.",
+    "caseCount": "{n} پرونده",
+    "attachmentCount": "{n} پیوست",
+    "caseSummary": "پرونده {n}: {type}",
+    "teethPrefix": "· دندان‌ها",
+    "moreCases": "+ {n} پرونده دیگر",
+    "previewDialogTitle": "پیش‌نمایش درمان",
+    "previewDialogSubtitle": "بررسی پرونده‌ها، پیوست‌ها و مقصدهای ارسال.",
+    "noCases": "هیچ پرونده‌ای در این درمان وجود ندارد.",
+    "typeLabel": "نوع:",
+    "commentsLabel": "نظرات:",
+    "commentsEmpty": "نظرات: —",
+    "attachFilesShort": "پیوست فایل‌ها",
+    "sendCase": "ارسال این پرونده",
+    "sendToLinkedOrgs": "ارسال به سازمان‌های مرتبط",
+    "noActiveOrgs": "هیچ سازمان مرتبط فعالی وجود ندارد.",
+    "confirmSend": "تأیید ارسال",
+    "toothChartTitle": "نمودار دندان‌ها FDI",
+    "toothChartHint": "برای انتخاب چندگانه روی دندان‌ها ضربه بزنید. برای پرونده فعال اعمال می‌شود.",
+    "selectedLabel": "انتخاب شده:",
+    "selectedEmpty": "—",
+    "upperArch": "قوس بالا",
+    "lowerArch": "قوس پایین",
+    "toothAria": "دندان FDI {fdi}",
+    "toothSelectedSuffix": "، انتخاب شده",
+    "sentToAt": "ارسال به {orgName} در {datetime}",
+    "fallbackOrgName": "سازمان"
+  },
+  "organizations": {
+    "loadingOrganization": "در حال بارگذاری سازمان...",
+    "subtitle": "سازمان‌ها را جستجو کنید، درخواست اتصال به حساب‌های موجود ارسال کنید، یا اگر هنوز در DyoLink نیستند، لینک دعوت ارسال کنید.",
+    "invitationHistory": "تاریخچه دعوت‌نامه‌ها",
+    "searchPlaceholder": "جستجوی {counterpart} بر اساس نام، ایمیل یا تلفن...",
+    "backToList": "بازگشت به لیست",
+    "tableOrganization": "سازمان",
+    "tableOwnerEmail": "ایمیل مالک",
+    "tableDate": "تاریخ",
+    "tableStatus": "وضعیت",
+    "tableAction": "عملیات",
+    "emptyConnections": "هنوز هیچ اتصالی وجود ندارد. برای ارسال درخواست اتصال یا لینک دعوت، جستجو کنید.",
+    "statusInvitationPending": "دعوتنامه در انتظار",
+    "statusConnectionPending": "درخواست اتصال در انتظار",
+    "statusConnected": "متصل",
+    "statusDeclined": "درخواست اتصال رد شد",
+    "statusFound": "یافت شد",
+    "statusToday": "امروز",
+    "acceptRequest": "پذیرش درخواست اتصال",
+    "declineRequest": "رد درخواست اتصال",
+    "removeConnection": "قطع اتصال",
+    "sendRequest": "ارسال درخواست اتصال",
+    "noDirectoryResults": "هیچ سازمانی در جستجوی دایرکتوری یافت نشد.",
+    "hideInvitationFields": "پنهان کردن فیلدهای دعوت",
+    "sendInvitationLink": "ارسال لینک دعوت",
+    "counterpartNameLabel": "نام {counterpart}",
+    "ownerEmailLabel": "ایمیل مالک",
+    "sendInvitation": "ارسال دعوتنامه",
+    "successConnectionSent": "درخواست اتصال {counterpart} ارسال شد.",
+    "successInviteCreated": "لینک دعوت برای {email} ایجاد شد",
+    "successLinkCopied": "لینک دعوت در کلیپ‌بورد کپی شد.",
+    "successAccepted": "درخواست اتصال پذیرفته شد.",
+    "successDeclined": "درخواست اتصال رد شد.",
+    "successRemoved": "اتصال قطع شد.",
+    "historyTitle": "تاریخچه دعوت‌نامه‌ها",
+    "loadingHistory": "در حال بارگذاری تاریخچه دعوت‌نامه‌ها...",
+    "historyEmpty": "هنوز هیچ دعوتنامه‌ای وجود ندارد.",
+    "tableInvitationLink": "لینک دعوت",
+    "statusPending": "دعوتنامه در انتظار",
+    "statusAccepted": "دعوتنامه پذیرفته شد",
+    "statusRejected": "دعوتنامه رد شد",
+    "statusExpired": "دعوتنامه منقضی شد",
+    "copyInvitationLink": "کپی لینک دعوتنامه",
+    "copyInvitationLinkTitle": "کپی لینک دعوتنامه (در صورت نیاز لینک جدیدی تولید می‌کند)",
+    "selectorTitle": "سازمان‌ها",
+    "selectorSubtitleWithCreate": "یک سازمان را برای ادامه انتخاب کنید، یا یک سازمان جدید ایجاد کنید.",
+    "selectorSubtitleSelectOnly": "یک سازمان را برای ادامه انتخاب کنید.",
+    "createOrganization": "ایجاد سازمان",
+    "createAndContinue": "ایجاد و ادامه",
+    "emptyCanCreate": "هیچ سازمانی یافت نشد. اولین سازمان خود را ایجاد کنید تا ادامه دهید.",
+    "emptyAskOwner": "هیچ سازمانی یافت نشد. از مالک سازمان بخواهید تا شما را دعوت کند.",
+    "continueArrow": "ادامه →",
+    "planLabel": "طرح: {name} • {maxUsers} کاربر",
+    "counterpartClinic": "کلینیک",
+    "counterpartLab": "لابراتوار"
+  },
+  "settings": {
+    "accountTitle": "حساب کاربری",
+    "accountSubtitle": "تنظیمات پروفایل و امنیت برای ورود شما.",
+    "accountPlaceholder": "تغییر رمز عبور و ویرایش پروفایل در مرحله بعدی در اینجا قرار می‌گیرند (مثلاً فرآیند دعوت، بازنشانی رمز عبور).",
+    "subscriptionsTitle": "اشتراک‌ها",
+    "subscriptionsSubtitle": "طرح و مجوزهای فضای کاری DyoLink شما برای {orgName}. پیگیری درآمد کلینیک و لابراتوار در برگه صورتحساب در نوار کناری قرار دارد.",
+    "noSubscriptionNotice": "این سازمان اشتراک فعالی ندارد. برای شروع فرآیند خرید، یک طرح زیر را انتخاب کنید.",
+    "currentPlan": "طرح فعلی",
+    "planPrice": "قیمت طرح",
+    "seatsUsed": "مجوزهای استفاده شده",
+    "seatsRemaining": "مجوزهای باقی‌مانده",
+    "daysRemaining": "روزهای باقی‌مانده",
+    "unlimited": "نامحدود",
+    "unlimitedSeats": "مجوزهای نامحدود",
+    "seatsCount": "{n} مجوز",
+    "pricePerMonth": "${price} / ماه",
+    "noActiveSubscription": "هیچ اشتراک فعالی برای این سازمان وجود ندارد.",
+    "trialEnded": "دوره آزمایشی به پایان رسیده است. زمانی که تسویه حساب در دسترس قرار گرفت، یک طرح انتخاب کنید.",
+    "trialEndsIn": "دوره آزمایشی در {days} روز به پایان می‌رسد.",
+    "seatsLow": "استفاده از مجوزها برای این سازمان بالا است.",
+    "choosePlanIntro": "یک طرح را برای ادامه انتخاب کنید. یکپارچه‌سازی خرید هنوز فعال نیست، بنابراین این مرحله فقط مرحله انتخاب را آماده می‌کند.",
+    "planSolo": "انفرادی",
+    "planSmall": "کوچک",
+    "planMedium": "متوسط",
+    "planLarge": "بزرگ",
+    "planEnterprise": "سازمانی",
+    "startPurchase": "شروع فرآیند خرید",
+    "purchaseNotice": "جریان خرید به زودی فعال می‌شود. {plan} انتخاب شده و برای راه‌اندازی تسویه حساب آماده است."
+  },
+  "schedule": {
+    "defaultLabel": "تاریخ برنامه",
+    "previousDay": "روز قبل",
+    "nextDay": "روز بعد",
+    "chooseDate": "انتخاب تاریخ برنامه",
+    "year": "سال",
+    "month": "ماه",
+    "day": "روز",
+    "monthJanuary": "ژانویه",
+    "monthFebruary": "فوریه",
+    "monthMarch": "مارس",
+    "monthApril": "آوریل",
+    "monthMay": "مه",
+    "monthJune": "ژوئن",
+    "monthJuly": "ژوئیه",
+    "monthAugust": "اوت",
+    "monthSeptember": "سپتامبر",
+    "monthOctober": "اکتبر",
+    "monthNovember": "نوامبر",
+    "monthDecember": "دسامبر"
+  }
+}
\ No newline at end of file
diff --git a/frontend/messages/nl.json b/frontend/messages/nl.json
new file mode 100644
index 0000000..517a742
--- /dev/null
+++ b/frontend/messages/nl.json
@@ -0,0 +1,566 @@
+{
+  "common": {
+    "appName": "DyoLink",
+    "loading": "Laden...",
+    "loadingApp": "Applicatie laden...",
+    "loadingWorkspace": "Werkruimte laden...",
+    "continue": "Doorgaan",
+    "back": "Terug",
+    "save": "Opslaan",
+    "cancel": "Annuleren",
+    "delete": "Verwijderen",
+    "edit": "Bewerken",
+    "next": "Volgende",
+    "dismiss": "Afwijzen",
+    "or": "Of",
+    "and": "en",
+    "close": "Sluiten",
+    "redirecting": "Bezig met doorsturen...",
+    "readOnlyAccess": "Alleen-lezen toegang voor deze organisatie.",
+    "errorGeneric": "Er is iets misgegaan",
+    "loadingEllipsis": "Laden...",
+    "search": "Zoeken",
+    "action": "Actie",
+    "status": "Status",
+    "name": "Naam",
+    "email": "E-mail",
+    "date": "Datum",
+    "organization": "Organisatie",
+    "backToApp": "← Terug naar app",
+    "copied": "Gekopieerd",
+    "copyLink": "Link kopiëren",
+    "none": "Geen",
+    "preview": "Voorbeeld"
+  },
+  "language": {
+    "label": "Taal",
+    "selectLanguage": "Selecteer taal",
+    "en": "Engels",
+    "fa": "Perzisch",
+    "nl": "Nederlands"
+  },
+  "theme": {
+    "switchToLight": "Overschakelen naar lichte modus",
+    "switchToDark": "Overschakelen naar donkere modus",
+    "lightMode": "Lichte modus",
+    "darkMode": "Donkere modus"
+  },
+  "nav": {
+    "dashboard": "Dashboard",
+    "staff": "Medewerkers",
+    "patients": "Patiënten",
+    "appointment": "Afspraak",
+    "treatment": "Behandeling",
+    "billing": "Facturatie",
+    "reports": "Rapporten",
+    "clinics": "Klinieken",
+    "labs": "Laboratoria"
+  },
+  "auth": {
+    "login": "Inloggen",
+    "signIn": "Aanmelden",
+    "signOut": "Uitloggen",
+    "register": "Registreren",
+    "startTrial": "Proefperiode starten",
+    "startFreeTrial": "Gratis proefperiode starten",
+    "dashboard": "Dashboard",
+    "signInTitle": "Meld u aan bij uw account",
+    "signInPrompt": "Of {link}",
+    "startTrialLink": "start uw gratis proefperiode",
+    "registerTitle": "Start uw gratis proefperiode van 30 dagen",
+    "registerPrompt": "Heeft u al een account?",
+    "signInLink": "Aanmelden",
+    "email": "E-mailadres",
+    "password": "Wachtwoord",
+    "confirmPassword": "Bevestig wachtwoord",
+    "fullName": "Volledige naam",
+    "rememberMe": "Onthoud mij",
+    "forgotPassword": "Wachtwoord vergeten?",
+    "invalidCredentials": "Ongeldig e-mailadres of wachtwoord",
+    "loginFailed": "Inloggen mislukt",
+    "registrationFailed": "Registratie mislukt. Probeer het opnieuw.",
+    "startMyFreeTrial": "Start mijn gratis proefperiode",
+    "trialIncludes": "Uw proefperiode omvat:",
+    "trialTeamMembers": "Tot 5 teamleden",
+    "trialFullAccess": "Volledige toegang tot alle functies",
+    "trialNoCard": "30 dagen gratis, geen creditcard vereist",
+    "termsAgreement": "Door u aan te melden gaat u akkoord met onze {terms} en {privacy}",
+    "termsOfService": "Servicevoorwaarden",
+    "privacyPolicy": "Privacybeleid",
+    "signedIn": "Aangemeld",
+    "switchOrganization": "Organisatie wisselen",
+    "subscriptions": "Abonnementen",
+    "account": "Account",
+    "emailPlaceholder": "you@example.com",
+    "passwordPlaceholder": "••••••••",
+    "namePlaceholder": "John Doe",
+    "termsIntro": "Door u te registreren gaat u akkoord met onze",
+    "errorRegistrationFailed": "Registratie mislukt",
+    "errorLoginFailed": "Inloggen mislukt",
+    "errorCreateOrganization": "Organisatie aanmaken mislukt",
+    "acceptInviteTitle": "Uitnodiging accepteren",
+    "loadingInvitation": "Uitnodiging laden...",
+    "invalidInvitationLink": "Ongeldige uitnodigingslink",
+    "invitationAlreadyAccepted": "Deze uitnodiging is al geaccepteerd. U kunt nu inloggen.",
+    "errorLoadInvitation": "Kon uitnodiging niet laden",
+    "organizationLabel": "Organisatie:",
+    "emailLabel": "E-mail:",
+    "nameRequired": "Naam is verplicht",
+    "passwordMinLength8": "Wachtwoord moet minimaal 8 tekens bevatten",
+    "passwordsDoNotMatch": "Wachtwoorden komen niet overeen",
+    "labelName": "Naam",
+    "labelCreatePassword": "Wachtwoord aanmaken",
+    "labelConfirmPassword": "Bevestig wachtwoord",
+    "activateAccount": "Account activeren",
+    "invitationAcceptedRedirect": "Uitnodiging geaccepteerd. Doorsturen naar inloggen...",
+    "errorAcceptInvitation": "Kon uitnodiging niet accepteren",
+    "alreadyHaveAccess": "Heeft u al toegang?",
+    "goToLogin": "Ga naar inloggen",
+    "acceptOrganizationTitle": "Organisatie-uitnodiging accepteren",
+    "alreadyHaveAccount": "Heeft u al een account?",
+    "invitedBy": "Uitgenodigd door:",
+    "ownerEmail": "E-mail eigenaar",
+    "activateOrganization": "Organisatie activeren",
+    "organizationAcceptedRedirect": "Uitnodiging geaccepteerd. Doorsturen naar inloggen...",
+    "stepAccount": "Account",
+    "stepOrganization": "Organisatie",
+    "organizationName": "Organisatienaam",
+    "organizationNamePlaceholder": "Sunshine Tandartspraktijk",
+    "organizationEmail": "Organisatie e-mail",
+    "organizationEmailPlaceholder": "contact@sunshineclinic.com",
+    "organizationType": "Organisatietype",
+    "dentalClinic": "Tandartspraktijk",
+    "dentalLab": "Tandtechnisch Laboratorium"
+  },
+  "landing": {
+    "heroTitle": "Verbind Tandheelkundige Klinieken & Laboratoria",
+    "heroHighlight": "Naadloos",
+    "heroSubtitle": "Stroomlijn de communicatie tussen tandheelkundige professionals. Start met een gratis proefperiode van 30 dagen, zonder creditcard.",
+    "featureClinicsTitle": "Voor Klinieken",
+    "featureClinicsDescription": "Beheer patiënten, afspraken en stuur casussen direct naar laboratoria.",
+    "featureLabsTitle": "Voor Laboratoria",
+    "featureLabsDescription": "Ontvang casussen, volg de voortgang en communiceer met klinieken.",
+    "featureTeamTitle": "Teambeheer",
+    "featureTeamDescription": "Voeg tijdens de proefperiode maximaal 5 teamleden toe. Schaal mee met uw groei.",
+    "featureTrialTitle": "Proefperiode van 30 dagen",
+    "featureTrialDescription": "Volledige toegang tot alle functies. Geen creditcard vereist.",
+    "featureRealtimeTitle": "Realtime Updates",
+    "featureRealtimeDescription": "Ontvang direct meldingen bij statuswijzigingen van casussen.",
+    "featureSecurityTitle": "Veilig & Conform",
+    "featureSecurityDescription": "HIPAA-conform met beveiliging op ondernemingsniveau.",
+    "footerCopyright": "© 2026 DyoLink. Alle rechten voorbehouden.",
+    "termsAndConditions": "Algemene Voorwaarden"
+  },
+  "accountMenu": {
+    "noActiveSubscription": "Geen actief abonnement — bekijk Abonnementen",
+    "trialEnded": "Proefperiode beëindigd — bekijk Abonnementen",
+    "trialEndingSoon": "Proefperiode eindigt binnenkort — bekijk Abonnementen",
+    "seatsLow": "Aantal beschikbare plaatsen raakt op — bekijk Abonnementen",
+    "reviewSubscriptions": "Abonnementen bekijken"
+  },
+  "validation": {
+    "emailInvalid": "Voer een geldig e-mailadres in",
+    "passwordRequired": "Wachtwoord is verplicht",
+    "nameMinLength": "Naam moet minimaal 2 tekens bevatten",
+    "passwordMinLength": "Wachtwoord moet minimaal 8 tekens bevatten",
+    "passwordUppercase": "Wachtwoord moet minimaal één hoofdletter bevatten",
+    "passwordNumber": "Wachtwoord moet minimaal één cijfer bevatten",
+    "organizationNameMinLength": "Organisatienaam moet minimaal 2 tekens bevatten",
+    "organizationEmailInvalid": "Voer een geldig organisatie-e-mailadres in",
+    "organizationTypeRequired": "Selecteer een organisatietype",
+    "passwordsDoNotMatch": "Wachtwoorden komen niet overeen"
+  },
+  "today": {
+    "welcomeBack": "Welkom terug!!",
+    "noSubscriptionNotice": "Deze organisatie heeft nog geen actief abonnement.",
+    "choosePlanLink": "Kies een abonnement",
+    "noSubscriptionCta": "om het aankoopproces te starten.",
+    "cardTodaysAppointments": "Afspraken van vandaag",
+    "cardActivePatients": "Actieve patiënten",
+    "cardNewLabCase": "Nieuwe laboratoriumcase",
+    "cardTodayInvoices": "Facturen van vandaag"
+  },
+  "staff": {
+    "redirecting": "Bezig met doorsturen...",
+    "title": "Medewerkersbeheer",
+    "subtitle": "Nodig teamleden uit, stel tabbladtoegang in en blijf binnen het limiet van uw abonnementsplaatsen.",
+    "inviteMember": "Lid uitnodigen",
+    "seatsLabel": "Plaatsen:",
+    "unlimitedPlan": "(onbeperkt abonnement)",
+    "seatLimitReached": "Plaatslimiet van het abonnement voor deze organisatie is bereikt.",
+    "noActivePlan": "Geen actief abonnement geselecteerd voor deze organisatie. Kies een abonnementsplan om leden uit te nodigen.",
+    "invitedPending": "Uitnodiging is in afwachting totdat ze de link openen, een wachtwoord instellen en inloggen.",
+    "invitedAccepted": "Uitnodiging is onmiddellijk geaccepteerd.",
+    "inviteLinkHeading": "Uitnodigingslink",
+    "shareLinkHint": "Deel deze link handmatig via SMS of e-mail. Er wordt een nieuwe link gegenereerd als de vorige is verlopen of verloren is gegaan.",
+    "loadingTeam": "Team laden...",
+    "tableName": "Naam",
+    "tableEmail": "E-mail",
+    "tableRole": "Rol",
+    "tableStatus": "Status",
+    "tableAccess": "Toegang",
+    "tableAction": "Actie",
+    "roleOwner": "Eigenaar",
+    "roleStaff": "Medewerker",
+    "statusActive": "Actief",
+    "statusPending": "In afwachting",
+    "statusDisabled": "Uitgeschakeld",
+    "statusExpired": "Verlopen",
+    "allFeatures": "Alle functies",
+    "inviteModalTitle": "Teamlid uitnodigen",
+    "stepOf": "Stap {step} van 2",
+    "permissionView": "Bekijken",
+    "permissionEdit": "Bewerken",
+    "labelEmail": "E-mail",
+    "labelDisplayName": "Weergavenaam",
+    "tabAccess": "Tabbladtoegang",
+    "sendInvite": "Uitnodiging verzenden",
+    "skipForNow": "Nu overslaan",
+    "enableModalTitle": "Teamlid inschakelen",
+    "enableConfirm": "{name} ({email}) inschakelen?",
+    "enableBullet1": "Ze kunnen opnieuw inloggen op deze organisatie met hun bestaande account.",
+    "enableBullet2": "Er wordt geen nieuwe uitnodiging verzonden en er zijn geen gegevens verwijderd terwijl ze waren uitgeschakeld.",
+    "enableBullet3": "Inschakelen gebruikt één plaats in uw abonnement.",
+    "noSeatsAvailable": "Geen plaatsen beschikbaar. Schakel een ander lid uit of upgrade uw abonnement voordat u deze persoon inschakelt.",
+    "enableMemberButton": "Lid inschakelen",
+    "disableModalTitle": "Teamlid uitschakelen",
+    "disableConfirm": "{name} ({email}) uitschakelen?",
+    "disableBullet1": "Ze kunnen niet inloggen op deze organisatie.",
+    "disableBullet2": "Er worden geen gegevens verwijderd.",
+    "disableBullet3": "Uitschakelen maakt één plaats vrij in uw abonnement, zodat u iemand anders kunt uitnodigen.",
+    "disableMemberButton": "Lid uitschakelen",
+    "editModalTitle": "Lid bewerken",
+    "loadingWorkingHours": "Werktijden laden...",
+    "errorLoadStaff": "Medewerkers laden mislukt.",
+    "errorCopyInvite": "Kon uitnodigingslink niet kopiëren.",
+    "errorSendInvite": "Uitnodiging verzenden mislukt.",
+    "errorLoadWorkingHours": "Werktijden laden mislukt.",
+    "successMemberUpdated": "Lid bijgewerkt.",
+    "errorUpdateMember": "Lid bijwerken mislukt.",
+    "errorDeleteNotImplemented": "Verwijderen is nog niet geïmplementeerd.",
+    "successMemberDisabled": "{name} is uitgeschakeld. Er is nu een plaats beschikbaar.",
+    "errorDisableMember": "Lid uitschakelen mislukt.",
+    "successMemberEnabled": "{name} is ingeschakeld en kan opnieuw inloggen.",
+    "errorEnableMember": "Lid inschakelen mislukt.",
+    "successInvited": "{name} ({email}) is uitgenodigd.",
+    "copyInviteLink": "Uitnodigingslink kopiëren",
+    "copyInviteLinkTitle": "Uitnodigingslink kopiëren (genereert indien nodig een nieuwe link)",
+    "enableMemberAria": "Lid inschakelen",
+    "enableMemberTitle": "Lid inschakelen (gebruikt een plaats)",
+    "disableMemberAria": "Lid uitschakelen",
+    "disableMemberTitle": "Lid uitschakelen (maakt een plaats vrij)",
+    "editMemberAria": "Lid bewerken",
+    "deleteMemberAria": "Lid verwijderen",
+    "deleteMemberTitle": "Lid verwijderen (niet geïmplementeerd)",
+    "features": {
+      "featureToday": "Vandaag",
+      "featureStaff": "Medewerkers",
+      "featureOrganizations": "Organisaties",
+      "featureClinics": "Klinieken",
+      "featureLabs": "Laboratoria",
+      "featurePatients": "Patiënten",
+      "featureAppointment": "Afspraak",
+      "featureTreatment": "Behandeling",
+      "featureBilling": "Facturatie",
+      "featureReports": "Rapporten",
+      "noTabAccess": "Geen tabbladtoegang",
+      "readOnlySuffix": "(Alleen lezen)"
+    },
+    "workingHours": {
+      "recommendedTitle": "Werktijden aanbevolen",
+      "recommendedBody": "Medewerkers met bewerkingsrechten voor behandelingen verschijnen als aanbiederkolommen in Afspraken. Stel hun wekelijkse uren in, zodat het rooster de juiste boekbare tijden weergeeft.",
+      "intro": "Stel wekelijkse werktijden in voor deze aanbieder. Het afsprakenrooster gebruikt deze uren om boekbare tijdsloten weer te geven.",
+      "workingDay": "Werkdag",
+      "start": "Start",
+      "end": "Einde",
+      "removeShift": "Dienst verwijderen",
+      "addShift": "Dienst toevoegen",
+      "autoRepeatWeekly": "Deze uren wekelijks herhalen aan het begin van elke week (kopieer door op maandag)",
+      "weekdayMon": "Ma",
+      "weekdayTue": "Di",
+      "weekdayWed": "Wo",
+      "weekdayThu": "Do",
+      "weekdayFri": "Vr",
+      "weekdaySat": "Za",
+      "weekdaySun": "Zo",
+      "validationNeedsShift": "{day} heeft minstens één dienst nodig of moet worden gemarkeerd als vrij.",
+      "validationEndAfterStart": "Eindtijd van dienst op {day} moet na de starttijd liggen.",
+      "validationOverlap": "Diensten op {day} mogen niet overlappen."
+    }
+  },
+  "patients": {
+    "title": "Patiënten",
+    "newPatient": "Nieuwe patiënt",
+    "errorLoadPatients": "Patiënten laden mislukt.",
+    "successPatientSaved": "Patiënt {firstName} {lastName} is succesvol opgeslagen.",
+    "errorSavePatient": "Patiënt opslaan mislukt.",
+    "firstName": "Voornaam",
+    "lastName": "Achternaam",
+    "phone": "Telefoon",
+    "savePatient": "Patiënt opslaan",
+    "dialogTitle": "Nieuwe patiënt",
+    "searchPlaceholder": "Zoek patiënten op naam, telefoon, e-mail",
+    "loadingPatients": "Patiënten laden...",
+    "noResults": "Geen patiënten gevonden voor deze zoekopdracht.",
+    "noContact": "Geen contact",
+    "selectPatient": "Selecteer een patiënt om details te bekijken.",
+    "phoneLabel": "Telefoon:",
+    "emailLabel": "E-mail:",
+    "statusLabel": "Status:",
+    "statusActive": "Actief",
+    "statusInactive": "Inactief",
+    "emptyValue": "-"
+  },
+  "appointments": {
+    "title": "Afspraken",
+    "subtitle": "Zoek een patiënt, kies een datum en klik vervolgens op een tijdslot onder een aanbieder om te boeken.",
+    "loadingSchedule": "Rooster laden...",
+    "infoPastViewOnly": "Afspraken uit het verleden zijn alleen-lezen.",
+    "infoSelectPatient": "Selecteer een patiënt voor het boeken.",
+    "errorOutsideHours": "Deze afspraak valt buiten de huidige werktijden van de aanbieder en kan niet worden bewerkt.",
+    "successUpdated": "Afspraak bijgewerkt.",
+    "successSaved": "Afspraak opgeslagen.",
+    "errorUpdate": "Kon afspraak niet bijwerken.",
+    "errorSave": "Kon afspraak niet opslaan.",
+    "confirmRemove": "Deze afspraak verwijderen?",
+    "successRemoved": "Afspraak verwijderd.",
+    "errorDelete": "Kon afspraak niet verwijderen.",
+    "errorLoadSchedule": "Rooster laden mislukt.",
+    "successPatientSaved": "Patiënt {firstName} {lastName} is opgeslagen.",
+    "searchPlaceholder": "Bestaande patiënten zoeken",
+    "searching": "Zoeken...",
+    "searchHint": "Typ om te zoeken naar patiënten op naam, telefoon of e-mail.",
+    "noPermissionAdd": "U heeft geen toestemming om patiënten toe te voegen.",
+    "editTitle": "Afspraak bewerken",
+    "newTitle": "Nieuwe afspraak",
+    "providerLabel": "Aanbieder:",
+    "patientLabel": "Patiënt",
+    "startLabel": "Start",
+    "endLabel": "Einde",
+    "purposeLabel": "Doel",
+    "errorSelectPatient": "Selecteer eerst een patiënt.",
+    "errorEndAfterStart": "Eindtijd moet na de starttijd liggen.",
+    "errorPastSchedule": "Kan niet in het verleden plannen.",
+    "errorPastViewOnly": "Afspraken uit het verleden zijn alleen-lezen.",
+    "errorMissingDetails": "Ontbrekende afspraakgegevens.",
+    "noProviders": "Geen aanbieders beschikbaar. Voeg medewerkers met bewerkingsrechten voor behandelingen toe om hier kolommen te zien.",
+    "noWorkingHours": "Er zijn geen werktijden geconfigureerd voor deze dag. Stel werktijden van de aanbieder in bij Medewerkersbeheer.",
+    "noHoursSet": "Geen uren ingesteld",
+    "offToday": "Vandaag vrij",
+    "slotOffToday": "Aanbieder is vandaag vrij",
+    "slotHoursNotConfigured": "Werktijden niet geconfigureerd",
+    "slotOutsideHours": "Buiten werktijden",
+    "slotCannotCreate": "U kunt geen afspraken maken",
+    "slotBookAt": "Boeken om {time}",
+    "outsideHoursBlocked": "Buiten werktijden — bewerken geblokkeerd",
+    "overlappingChoose": "{count} overlappend — klik om te kiezen",
+    "overlapping": "{count} overlappend",
+    "legend": "Legenda",
+    "overlappingTitle": "Overlappende afspraken ({count})",
+    "purposeConsultation": "Consult",
+    "purposeFilling": "Vulling",
+    "purposeEndo": "Endo",
+    "purposeVisit": "Bezoek",
+    "purposeHygiene": "Hygiëne"
+  },
+  "treatment": {
+    "loading": "Laden...",
+    "noPermissionTitle": "Behandelwerkruimte",
+    "noPermissionBody": "U heeft geen toestemming om het tabblad Behandeling voor deze organisatie te bekijken.",
+    "title": "Behandeling",
+    "subtitleEdit": "Documenteer casussen voor uw afspraken, sla concepten op en stuur werk naar gekoppelde organisaties.",
+    "subtitleReadOnly": "Alleen-lezen toegang — u kunt afspraken en behandelgeschiedenis bekijken, maar niet bewerken.",
+    "pastDayNotice": "Dagen in het verleden zijn alleen-lezen. U kunt afspraken en geschiedenis bekijken, maar behandelcasussen kunnen niet worden toegevoegd of gewijzigd.",
+    "selectedPatient": "Geselecteerde patiënt",
+    "purposeLabel": "Doel:",
+    "loadingAppointments": "Afspraken laden...",
+    "selectDayWithAppointment": "Selecteer een dag met ten minste één afspraak.",
+    "confirmDiscard": "U heeft niet-opgeslagen wijzigingen. Wilt u deze negeren en doorgaan?",
+    "successDraftSaved": "Behandelconcept opgeslagen.",
+    "errorChooseOrg": "Kies ten minste één actieve organisatie om deze case te verzenden.",
+    "successCaseSent": "Case verzonden naar geselecteerde organisaties.",
+    "successFilesUploaded": "{count} bestand(en) succesvol geüpload.",
+    "errorLoadAppointments": "Afspraken laden mislukt.",
+    "errorLoadOrgs": "Gekoppelde organisaties laden mislukt.",
+    "errorLoadHistory": "Behandelgeschiedenis laden mislukt.",
+    "errorLoadDraft": "Behandelconcept laden mislukt.",
+    "errorUpload": "Bijlagen uploaden mislukt.",
+    "errorSaveDraft": "Behandelconcept opslaan mislukt.",
+    "errorSendCase": "Case verzenden mislukt.",
+    "errorCaseMustSave": "Case moet worden opgeslagen voor verzending.",
+    "draftTitle": "Concept · {patientName}",
+    "hiddenMessage": "Afspraken zijn verborgen.",
+    "showAppointments": "Afspraken tonen",
+    "appointmentsTitle": "Mijn afspraken",
+    "hideAppointments": "Afspraken verbergen",
+    "emptyDay": "Geen afspraken aan u toegewezen op deze dag.",
+    "casesTitle": "Behandelcasussen",
+    "casesSubtitle": "Elke case heeft zijn eigen tanden, notities, bijlagen en verzendbestemmingen.",
+    "addCase": "Case toevoegen",
+    "caseLabel": "Case {n}",
+    "comments": "Opmerkingen",
+    "commentsPlaceholder": "Schrijf klinische notities voor deze case...",
+    "treatmentType": "Behandeltype",
+    "typeConsultation": "consult",
+    "typeFilling": "vulling",
+    "typeEndo": "endo",
+    "typeVisit": "bezoek",
+    "typeHygiene": "hygiëne",
+    "attachments": "Bijlagen",
+    "attachFiles": "Voeg bestanden toe voor deze behandelscase",
+    "chooseFiles": "Kies bestanden",
+    "sendToOrgs": "Verzend deze case naar gekoppelde organisaties",
+    "searchOrgsPlaceholder": "Zoek actieve organisaties...",
+    "recent": "Recent:",
+    "noOrgMatch": "Geen actieve organisatie komt overeen met uw zoekopdracht.",
+    "sendThisCase": "Verzend deze case",
+    "saveDraft": "Behandelconcept opslaan",
+    "unsavedChanges": "Niet-opgeslagen wijzigingen",
+    "draftSaved": "Concept opgeslagen",
+    "sendSavesFirst": "Verzenden is per case en slaat eerst automatisch op.",
+    "historyTitle": "Eerdere behandelingen",
+    "historySubtitle": "Voltooide behandelingen voor deze patiënt. Elke case wordt afzonderlijk weergegeven.",
+    "loadingHistory": "Geschiedenis laden...",
+    "historyEmpty": "Geen eerdere behandelingen voor deze patiënt.",
+    "statusLabel": "Status:",
+    "historyCaseLabel": "Case {n} · {type}",
+    "teethLabel": "Tanden:",
+    "teethNone": "Geen geselecteerd",
+    "reviewDetails": "Details bekijken",
+    "previewTitle": "Behandelvoorbeeld",
+    "previewDraft": "Bekijk huidig concept",
+    "selectAppointment": "Selecteer een afspraak om het concept te bekijken.",
+    "caseCount": "{n} case(s)",
+    "attachmentCount": "{n} bijlage(n)",
+    "caseSummary": "Case {n}: {type}",
+    "teethPrefix": "· Tanden",
+    "moreCases": "+ {n} meer case(s)",
+    "previewDialogTitle": "Behandelvoorbeeld",
+    "previewDialogSubtitle": "Bekijk casussen, bijlagen en verzendbestemmingen.",
+    "noCases": "Geen casussen in deze behandeling.",
+    "typeLabel": "Type:",
+    "commentsLabel": "Opmerkingen:",
+    "commentsEmpty": "Opmerkingen: —",
+    "attachFilesShort": "Bestanden bijvoegen",
+    "sendCase": "Verzend deze case",
+    "sendToLinkedOrgs": "Verzenden naar gekoppelde organisaties",
+    "noActiveOrgs": "Geen actieve gekoppelde organisaties.",
+    "confirmSend": "Bevestig verzending",
+    "toothChartTitle": "FDI-tanddiagram",
+    "toothChartHint": "Tik op tanden om meerdere te selecteren. Geldt voor de actieve case.",
+    "selectedLabel": "Geselecteerd:",
+    "selectedEmpty": "—",
+    "upperArch": "Bovenboog",
+    "lowerArch": "Onderboog",
+    "toothAria": "FDI-tand {fdi}",
+    "toothSelectedSuffix": ", geselecteerd",
+    "sentToAt": "Verzonden naar {orgName} op {datetime}",
+    "fallbackOrgName": "organisatie"
+  },
+  "organizations": {
+    "loadingOrganization": "Organisatie laden...",
+    "subtitle": "Zoek organisaties, stuur verbindingsverzoeken naar bestaande accounts, of uitnodigingslinks wanneer ze nog niet op DyoLink staan.",
+    "invitationHistory": "Uitnodigingsgeschiedenis",
+    "searchPlaceholder": "Zoek {counterpart} op naam, e-mail of telefoon...",
+    "backToList": "Terug naar lijst",
+    "tableOrganization": "Organisatie",
+    "tableOwnerEmail": "E-mail eigenaar",
+    "tableDate": "Datum",
+    "tableStatus": "Status",
+    "tableAction": "Actie",
+    "emptyConnections": "Nog geen verbindingen. Zoek om een verbindingsverzoek of een uitnodigingslink te verzenden.",
+    "statusInvitationPending": "Uitnodiging in afwachting",
+    "statusConnectionPending": "Verbindingsverzoek in afwachting",
+    "statusConnected": "Verbonden",
+    "statusDeclined": "Verbindingsverzoek afgewezen",
+    "statusFound": "Gevonden",
+    "statusToday": "Vandaag",
+    "acceptRequest": "Verbindingsverzoek accepteren",
+    "declineRequest": "Verbindingsverzoek afwijzen",
+    "removeConnection": "Verbinding verwijderen",
+    "sendRequest": "Verbindingsverzoek verzenden",
+    "noDirectoryResults": "Geen organisatie gevonden in directoryzoekopdracht.",
+    "hideInvitationFields": "Uitnodigingsvelden verbergen",
+    "sendInvitationLink": "Uitnodigingslink verzenden",
+    "counterpartNameLabel": "Naam {counterpart}",
+    "ownerEmailLabel": "E-mail eigenaar",
+    "sendInvitation": "Uitnodiging verzenden",
+    "successConnectionSent": "Verbindingsverzoek voor {counterpart} verzonden.",
+    "successInviteCreated": "Uitnodigingslink aangemaakt voor {email}",
+    "successLinkCopied": "Uitnodigingslink gekopieerd naar klembord.",
+    "successAccepted": "Verbindingsverzoek geaccepteerd.",
+    "successDeclined": "Verbindingsverzoek afgewezen.",
+    "successRemoved": "Verbinding verwijderd.",
+    "historyTitle": "Uitnodigingsgeschiedenis",
+    "loadingHistory": "Uitnodigingsgeschiedenis laden...",
+    "historyEmpty": "Nog geen uitnodigingen.",
+    "tableInvitationLink": "Uitnodigingslink",
+    "statusPending": "Uitnodiging in afwachting",
+    "statusAccepted": "Uitnodiging geaccepteerd",
+    "statusRejected": "Uitnodiging afgewezen",
+    "statusExpired": "Uitnodiging verlopen",
+    "copyInvitationLink": "Uitnodigingslink kopiëren",
+    "copyInvitationLinkTitle": "Uitnodigingslink kopiëren (genereert indien nodig een nieuwe link)",
+    "selectorTitle": "Organisaties",
+    "selectorSubtitleWithCreate": "Selecteer een organisatie om door te gaan, of maak een nieuwe aan.",
+    "selectorSubtitleSelectOnly": "Selecteer een organisatie om door te gaan.",
+    "createOrganization": "Organisatie aanmaken",
+    "createAndContinue": "Aanmaken en doorgaan",
+    "emptyCanCreate": "Geen organisaties gevonden. Maak uw eerste organisatie aan om door te gaan.",
+    "emptyAskOwner": "Geen organisaties gevonden. Vraag een organisatie-eigenaar om u uit te nodigen.",
+    "continueArrow": "Doorgaan →",
+    "planLabel": "Plan: {name} • {maxUsers} gebruikers",
+    "counterpartClinic": "Kliniek",
+    "counterpartLab": "Laboratorium"
+  },
+  "settings": {
+    "accountTitle": "Account",
+    "accountSubtitle": "Profiel- en beveiligingsinstellingen voor uw login.",
+    "accountPlaceholder": "Wachtwoordwijziging en profielbewerking worden hierna hier aangesloten (bijv. uitnodigingsflow, wachtwoord herstellen).",
+    "subscriptionsTitle": "Abonnementen",
+    "subscriptionsSubtitle": "Uw DyoLink-werkruimteplan en plaatsen voor {orgName}. Kliniek- en laboratoriuminkomsten blijven onder het tabblad Facturatie in de zijbalk.",
+    "noSubscriptionNotice": "Deze organisatie heeft geen actief abonnement. Selecteer hieronder een abonnement om het aankoopproces te starten.",
+    "currentPlan": "Huidig abonnement",
+    "planPrice": "Abonnementsprijs",
+    "seatsUsed": "Plaatsen gebruikt",
+    "seatsRemaining": "Plaatsen over",
+    "daysRemaining": "Dagen over",
+    "unlimited": "Onbeperkt",
+    "unlimitedSeats": "Onbeperkte plaatsen",
+    "seatsCount": "{n} plaatsen",
+    "pricePerMonth": "${price} / maand",
+    "noActiveSubscription": "Geen actief abonnement voor deze organisatie.",
+    "trialEnded": "Proefperiode is beëindigd. Kies een abonnement wanneer afrekenen beschikbaar is.",
+    "trialEndsIn": "Proefperiode eindigt over {days} dag(en).",
+    "seatsLow": "Plaatsgebruik is hoog voor deze organisatie.",
+    "choosePlanIntro": "Kies een abonnement om door te gaan. Aankoopintegratie is nog niet actief, dus dit bereidt momenteel alleen de selectiestap voor.",
+    "planSolo": "Solo",
+    "planSmall": "Klein",
+    "planMedium": "Middel",
+    "planLarge": "Groot",
+    "planEnterprise": "Onderneming",
+    "startPurchase": "Aankoopproces starten",
+    "purchaseNotice": "Aankoopstroom wordt binnenkort ingeschakeld. {plan} is geselecteerd en klaar voor afrekenconfiguratie."
+  },
+  "schedule": {
+    "defaultLabel": "Roosterdatum",
+    "previousDay": "Vorige dag",
+    "nextDay": "Volgende dag",
+    "chooseDate": "Kies roosterdatum",
+    "year": "Jaar",
+    "month": "Maand",
+    "day": "Dag",
+    "monthJanuary": "Januari",
+    "monthFebruary": "Februari",
+    "monthMarch": "Maart",
+    "monthApril": "April",
+    "monthMay": "Mei",
+    "monthJune": "Juni",
+    "monthJuly": "Juli",
+    "monthAugust": "Augustus",
+    "monthSeptember": "September",
+    "monthOctober": "Oktober",
+    "monthNovember": "November",
+    "monthDecember": "December"
+  }
+}
\ No newline at end of file
diff --git a/frontend/next.config.ts b/frontend/next.config.ts
index f18b314..dc7e89f 100644
--- a/frontend/next.config.ts
+++ b/frontend/next.config.ts
@@ -1,4 +1,7 @@
-import type { NextConfig } from "next";
+import type { NextConfig } from 'next';
+import createNextIntlPlugin from 'next-intl/plugin';
+
+const withNextIntl = createNextIntlPlugin('./src/i18n/request.ts');
 
 function publicAppHostname(): string | null {
   const url = process.env.NEXT_PUBLIC_APP_URL;
@@ -12,41 +15,29 @@ function publicAppHostname(): string | null {
 
 const appHost = publicAppHostname();
 
-/** @type {import('next').NextConfig} */
-const nextConfig = {
-  // Enable React strict mode
+const nextConfig: NextConfig = {
   reactStrictMode: true,
-  
-  // Disable x-powered-by header for security
   poweredByHeader: false,
-  
-  // Configure allowed remote image sources (hostname derived from NEXT_PUBLIC_APP_URL at build time)
   images: {
     remotePatterns: [
-      { protocol: "http", hostname: "localhost" },
+      { protocol: 'http', hostname: 'localhost' },
       ...(appHost
         ? [
-            { protocol: "http" as const, hostname: appHost },
-            { protocol: "https" as const, hostname: appHost },
+            { protocol: 'http' as const, hostname: appHost },
+            { protocol: 'https' as const, hostname: appHost },
           ]
         : []),
-      { protocol: "https", hostname: "dyolink.com" },
-      { protocol: "https", hostname: "www.dyolink.com" },
+      { protocol: 'https', hostname: 'dyolink.com' },
+      { protocol: 'https', hostname: 'www.dyolink.com' },
     ],
   },
-  
-  // Environment variables that will be available at build time
   env: {
     NEXT_PUBLIC_APP_NAME: process.env.NEXT_PUBLIC_APP_NAME,
     NEXT_PUBLIC_APP_URL: process.env.NEXT_PUBLIC_APP_URL,
     NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL,
   },
-  
-  // Output configuration
-  output: 'standalone',  // Reduces Docker image size
-  
-  // Compress with gzip
+  output: 'standalone',
   compress: true,
-}
+};
 
-module.exports = nextConfig
+export default withNextIntl(nextConfig);
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 08070aa..01aeb15 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -14,6 +14,7 @@
         "js-cookie": "^3.0.5",
         "lucide-react": "^0.577.0",
         "next": "16.1.6",
+        "next-intl": "^4.13.0",
         "react": "19.2.3",
         "react-dom": "19.2.3",
         "react-hook-form": "^7.71.2",
@@ -462,6 +463,36 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@formatjs/fast-memoize": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmmirror.com/@formatjs/fast-memoize/-/fast-memoize-3.1.6.tgz",
+      "integrity": "sha512-H5aexk1Le7T9TPmscacZ+1pR6CTa2n1wq+HDVGXhH8TzUlQQpeXzZs91dRtmFHrbeNbjPFPfQujUqm7MHgVoXQ==",
+      "license": "MIT"
+    },
+    "node_modules/@formatjs/icu-messageformat-parser": {
+      "version": "3.5.11",
+      "resolved": "https://registry.npmmirror.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-3.5.11.tgz",
+      "integrity": "sha512-NVsuNsc2dUVG9+4HBJ/srScxtA/18LqGgwtop/tuN/OIBjVl6QA+0KhfZQddDD9sEh2LeVjLFPGVU3ixa3blcA==",
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/icu-skeleton-parser": "2.1.10"
+      }
+    },
+    "node_modules/@formatjs/icu-skeleton-parser": {
+      "version": "2.1.10",
+      "resolved": "https://registry.npmmirror.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-2.1.10.tgz",
+      "integrity": "sha512-XuSva+8ZGawk8VnD5VD6UeH8KarQ/Z022zgjHDoHmlNiAewstXuuzXc0Hk5pGFSdG+nNw5bfJKXqj1ZXHn9yUA==",
+      "license": "MIT"
+    },
+    "node_modules/@formatjs/intl-localematcher": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmmirror.com/@formatjs/intl-localematcher/-/intl-localematcher-0.8.10.tgz",
+      "integrity": "sha512-P/IC3qws3jH+1fEs+o0RIFgXKRaQlFehjS5W0FPAqdo6hgzawLl+eD0q0JjheQ3XtoOe5n8WSYfX06KQZI/QJA==",
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/fast-memoize": "3.1.6"
+      }
+    },
     "node_modules/@hookform/resolvers": {
       "version": "5.2.2",
       "resolved": "https://registry.npmmirror.com/@hookform/resolvers/-/resolvers-5.2.2.tgz",
@@ -1247,6 +1278,313 @@
         "node": ">=12.4.0"
       }
     },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher/-/watcher-2.5.6.tgz",
+      "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-libc": "^2.0.3",
+        "is-glob": "^4.0.3",
+        "node-addon-api": "^7.0.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.6",
+        "@parcel/watcher-darwin-arm64": "2.5.6",
+        "@parcel/watcher-darwin-x64": "2.5.6",
+        "@parcel/watcher-freebsd-x64": "2.5.6",
+        "@parcel/watcher-linux-arm-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm-musl": "2.5.6",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm64-musl": "2.5.6",
+        "@parcel/watcher-linux-x64-glibc": "2.5.6",
+        "@parcel/watcher-linux-x64-musl": "2.5.6",
+        "@parcel/watcher-win32-arm64": "2.5.6",
+        "@parcel/watcher-win32-ia32": "2.5.6",
+        "@parcel/watcher-win32-x64": "2.5.6"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
+      "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
+      "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
+      "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
+      "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
+      "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
+      "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
+      "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
+      "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
+      "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
+      "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
+      "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
+      "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmmirror.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
+      "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher/node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@rtsao/scc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -1254,12 +1592,216 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@schummar/icu-type-parser": {
+      "version": "1.21.5",
+      "resolved": "https://registry.npmmirror.com/@schummar/icu-type-parser/-/icu-type-parser-1.21.5.tgz",
+      "integrity": "sha512-bXHSaW5jRTmke9Vd0h5P7BtWZG9Znqb8gSDxZnxaGSJnGwPLDPfS+3g0BKzeWqzgZPsIVZkM7m2tbo18cm5HBw==",
+      "license": "MIT"
+    },
     "node_modules/@standard-schema/utils": {
       "version": "0.3.0",
       "resolved": "https://registry.npmmirror.com/@standard-schema/utils/-/utils-0.3.0.tgz",
       "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
       "license": "MIT"
     },
+    "node_modules/@swc/core-darwin-arm64": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.41.tgz",
+      "integrity": "sha512-kREh6J5paQFvP3i7f/4FbqRNOJREutVFVOkder4GVyCBQ39YmER55cW/y1NNjwrchzFqgYswFn0mMDCqbqKzrw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-darwin-x64": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-darwin-x64/-/core-darwin-x64-1.15.41.tgz",
+      "integrity": "sha512-N8B56ESFazZAWZyIkecADSPCwlLEinW7QLMEeotCpv4J7VXwfH+OLkmRL8o96UZ+1355fwHxDTS6/wK7yucvkA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm-gnueabihf": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.41.tgz",
+      "integrity": "sha512-6XrId2fyle0mS5xxON8rU84mPd2Cq1kDJRj+4BnQKTd7u+2kSA6Ww+JkOP0iTNqOqt9OXhPOEAjBHAuonWcdCg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-gnu": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.41.tgz",
+      "integrity": "sha512-ynLIarxlkVnqHn1D0fKOVht6mNU5ks6lrH+MY3kkS+XFaGGgDxFZVjWKJlkYTKm3RCvBTfA8Ng5fLufXheMRKQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-musl": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.41.tgz",
+      "integrity": "sha512-dXu/5vd4gh8symyhRF+4G7gOPkjmb4pONhh7sl+6GSiW0LOKZlfu5kXmyFbTz9smOT7jgr002qY9b1nujjXt2A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-ppc64-gnu": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.41.tgz",
+      "integrity": "sha512-XGO6zVPXoPE0gf/XnI4jBbafNT13AYgoh6ns0JCSdOetI/kqVf0vhpz7NuNgAzZrMVCsmieqjPoTwViDgh4mOQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-s390x-gnu": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.41.tgz",
+      "integrity": "sha512-0WUglRwyZtW+iMi7J3iFdrCxreZZIKf4egTwEQfIYRsqFax69A0OrFj+NIoFSE03xBT/IFRrg+S8K6f9Ky+4hA==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-gnu": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.41.tgz",
+      "integrity": "sha512-VxkuQK59c0tHm6uJZCUrS3cyA2JhGGfdU6e41SZz0x/JS+4Sm7C1mIc97In14vkZJopEt7yXA2TouCqZDSygEA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-musl": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.41.tgz",
+      "integrity": "sha512-/0qXIu1ZxggLuovLb22vFfKHq2AA4n6Whw5UwmVCHk4pkw7KWnPIQpMCEqUMPsNkFJig7PPp/TSYFu8ZEb2rtQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-arm64-msvc": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.41.tgz",
+      "integrity": "sha512-Y481sMNZM6rECh9VO4+y26N1lWEDAyxnBZskUf37fl90uHE946VHfmiVQWT0uMFOhyJJFovGTRuF4W82dwewUg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-ia32-msvc": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.41.tgz",
+      "integrity": "sha512-BAchBD5qeUzy3hiPSLJtaaoSm4blCLyYffOF1bGE4ETcV+OisqjUAwDQMJj++4bTpvMCDzwC+Bj3PmQyBCtscw==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-x64-msvc": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.41.tgz",
+      "integrity": "sha512-WOkA+fJ/ViVBQDsSV9JC52NACTe5PhlurA6viASDZGb7HR3KS01ZG7RZ+Bg6SVQFIoq3gSbTsskQVe6EbHFAYw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/counter": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmmirror.com/@swc/counter/-/counter-0.1.3.tgz",
+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+      "license": "Apache-2.0"
+    },
     "node_modules/@swc/helpers": {
       "version": "0.5.15",
       "resolved": "https://registry.npmmirror.com/@swc/helpers/-/helpers-0.5.15.tgz",
@@ -1269,6 +1811,15 @@
         "tslib": "^2.8.0"
       }
     },
+    "node_modules/@swc/types": {
+      "version": "0.1.27",
+      "resolved": "https://registry.npmmirror.com/@swc/types/-/types-0.1.27.tgz",
+      "integrity": "sha512-K6h3iUlqeM946U4sXFYeahefR1YBbXJvko+hv8WS8/0BNJ4OHiHRywMnQUJCqkR7Y9+hqQ1TvEpiKqUhz7NEFg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/counter": "^0.1.3"
+      }
+    },
     "node_modules/@tailwindcss/node": {
       "version": "4.2.1",
       "resolved": "https://registry.npmmirror.com/@tailwindcss/node/-/node-4.2.1.tgz",
@@ -2894,7 +3445,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/detect-libc/-/detect-libc-2.1.2.tgz",
       "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
-      "devOptional": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">=8"
@@ -4057,6 +4607,21 @@
         "hermes-estree": "0.25.1"
       }
     },
+    "node_modules/icu-minify": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmmirror.com/icu-minify/-/icu-minify-4.13.0.tgz",
+      "integrity": "sha512-SIFMeUHZJjzS5RvIGvybKvWoHjDm9cGVEs2EpJ8PmywOdJLWyblPm7TdPLLoUtkJtwQD7iGhl2WMptZ+N0on+w==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/amannn"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/icu-messageformat-parser": "^3.4.0"
+      }
+    },
     "node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmmirror.com/ignore/-/ignore-5.3.2.tgz",
@@ -4109,6 +4674,16 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/intl-messageformat": {
+      "version": "11.2.8",
+      "resolved": "https://registry.npmmirror.com/intl-messageformat/-/intl-messageformat-11.2.8.tgz",
+      "integrity": "sha512-l323RCl3qJDVQ8U9j74ut/hVMdg3VPsOHpVMDvFfz9qiq4dPO5ooVYFNVUzzrpgG39a+RLzcXyJb8VFgIU+tUA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@formatjs/fast-memoize": "3.1.6",
+        "@formatjs/icu-messageformat-parser": "3.5.11"
+      }
+    },
     "node_modules/is-array-buffer": {
       "version": "3.0.5",
       "resolved": "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
@@ -4271,7 +4846,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -4317,7 +4891,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
@@ -5153,6 +5726,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/next": {
       "version": "16.1.6",
       "resolved": "https://registry.npmmirror.com/next/-/next-16.1.6.tgz",
@@ -5206,6 +5788,94 @@
         }
       }
     },
+    "node_modules/next-intl": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmmirror.com/next-intl/-/next-intl-4.13.0.tgz",
+      "integrity": "sha512-OvNq2v5XLx4EkQOsAhVE9g+6zdb83XHusADCXXtIW4LILYnjEVaeINdr1lkVWKSjzwNUiMSlH5N4K0OQTRiv6A==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/amannn"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/intl-localematcher": "^0.8.1",
+        "@parcel/watcher": "^2.4.1",
+        "@swc/core": "^1.15.2",
+        "icu-minify": "^4.13.0",
+        "negotiator": "^1.0.0",
+        "next-intl-swc-plugin-extractor": "^4.13.0",
+        "po-parser": "^2.1.1",
+        "use-intl": "^4.13.0"
+      },
+      "peerDependencies": {
+        "next": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/next-intl-swc-plugin-extractor": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmmirror.com/next-intl-swc-plugin-extractor/-/next-intl-swc-plugin-extractor-4.13.0.tgz",
+      "integrity": "sha512-6S/fJI0KXvLCL8nhBo9P8eGaJPzmwJBTCzX0NaUIj0VyU8U89d//T+vjMLdNIXl5MlLaYH7B9MbAjb8Mvu+tqQ==",
+      "license": "MIT"
+    },
+    "node_modules/next-intl/node_modules/@swc/core": {
+      "version": "1.15.41",
+      "resolved": "https://registry.npmmirror.com/@swc/core/-/core-1.15.41.tgz",
+      "integrity": "sha512-03nQq/082QRJJiOvp3FGbgxTGyyxMxohPTjhk/W9bD2J0tk4ukITI7goOhOO2WbaHn/lsPmo/zf8+DIXhwpgYQ==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/counter": "^0.1.3",
+        "@swc/types": "^0.1.26"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/swc"
+      },
+      "optionalDependencies": {
+        "@swc/core-darwin-arm64": "1.15.41",
+        "@swc/core-darwin-x64": "1.15.41",
+        "@swc/core-linux-arm-gnueabihf": "1.15.41",
+        "@swc/core-linux-arm64-gnu": "1.15.41",
+        "@swc/core-linux-arm64-musl": "1.15.41",
+        "@swc/core-linux-ppc64-gnu": "1.15.41",
+        "@swc/core-linux-s390x-gnu": "1.15.41",
+        "@swc/core-linux-x64-gnu": "1.15.41",
+        "@swc/core-linux-x64-musl": "1.15.41",
+        "@swc/core-win32-arm64-msvc": "1.15.41",
+        "@swc/core-win32-ia32-msvc": "1.15.41",
+        "@swc/core-win32-x64-msvc": "1.15.41"
+      },
+      "peerDependencies": {
+        "@swc/helpers": ">=0.5.17"
+      },
+      "peerDependenciesMeta": {
+        "@swc/helpers": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/next-intl/node_modules/@swc/helpers": {
+      "version": "0.5.23",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.23.tgz",
+      "integrity": "sha512-5lSsMOTXURePglDfvuAQUqkGek9Hg2kksOYay2m0+XR++b2NWYL/4sWyuvVBIs8oKnJaxkdi9whaL/sqN13afw==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.8.0"
+      }
+    },
     "node_modules/next/node_modules/postcss": {
       "version": "8.4.31",
       "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.31.tgz",
@@ -5234,6 +5904,12 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "license": "MIT"
+    },
     "node_modules/node-exports-info": {
       "version": "1.6.0",
       "resolved": "https://registry.npmmirror.com/node-exports-info/-/node-exports-info-1.6.0.tgz",
@@ -5510,6 +6186,12 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/po-parser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/po-parser/-/po-parser-2.1.1.tgz",
+      "integrity": "sha512-ECF4zHLbUItpUgE3OTtLKlPjeBN+fKEczj2zYjDfCGOzicNs0GK3Vg2IoAYwx7LH/XYw43fZQP6xnZ4TkNxSLQ==",
+      "license": "MIT"
+    },
     "node_modules/possible-typed-array-names": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
@@ -6622,6 +7304,27 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/use-intl": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmmirror.com/use-intl/-/use-intl-4.13.0.tgz",
+      "integrity": "sha512-fAFDrWaASxlhXOipcOyb5VDD+YONqj6+8O8EcG/J7RBoOUF3A8YahRWLN+mBxYMrlMQB8N6Voqk5X+YC+HSL0A==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/amannn"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@formatjs/fast-memoize": "^3.1.0",
+        "@schummar/icu-type-parser": "1.21.5",
+        "icu-minify": "^4.13.0",
+        "intl-messageformat": "^11.1.0"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index f07681e..647a797 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -15,6 +15,7 @@
     "js-cookie": "^3.0.5",
     "lucide-react": "^0.577.0",
     "next": "16.1.6",
+    "next-intl": "^4.13.0",
     "react": "19.2.3",
     "react-dom": "19.2.3",
     "react-hook-form": "^7.71.2",
@@ -32,4 +33,4 @@
     "tailwindcss": "^4",
     "typescript": "^5"
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/scripts/build-messages.mjs b/frontend/scripts/build-messages.mjs
new file mode 100644
index 0000000..d832eee
--- /dev/null
+++ b/frontend/scripts/build-messages.mjs
@@ -0,0 +1,619 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const messagesDir = path.join(__dirname, '..', 'messages');
+
+const en = {
+  common: {
+    appName: 'DyoLink',
+    loading: 'Loading...',
+    loadingApp: 'Loading app...',
+    loadingWorkspace: 'Loading workspace...',
+    continue: 'Continue',
+    back: 'Back',
+    save: 'Save',
+    cancel: 'Cancel',
+    delete: 'Delete',
+    edit: 'Edit',
+    next: 'Next',
+    dismiss: 'Dismiss',
+    or: 'Or',
+    and: 'and',
+    close: 'Close',
+    redirecting: 'Redirecting…',
+    readOnlyAccess: 'Read-only access for this organization.',
+    errorGeneric: 'Something went wrong',
+    loadingEllipsis: 'Loading...',
+    search: 'Search',
+    action: 'Action',
+    status: 'Status',
+    name: 'Name',
+    email: 'Email',
+    date: 'Date',
+    organization: 'Organization',
+    backToApp: '← Back to app',
+    copied: 'Copied',
+    copyLink: 'Copy link',
+    none: 'None',
+    preview: 'Preview',
+  },
+  language: {
+    label: 'Language',
+    selectLanguage: 'Select language',
+    en: 'English',
+    fa: 'Persian',
+    nl: 'Dutch',
+  },
+  theme: {
+    switchToLight: 'Switch to light mode',
+    switchToDark: 'Switch to dark mode',
+    lightMode: 'Light mode',
+    darkMode: 'Dark mode',
+  },
+  nav: {
+    dashboard: 'Dashboard',
+    staff: 'Staff',
+    patients: 'Patients',
+    appointment: 'Appointment',
+    treatment: 'Treatment',
+    billing: 'Billing',
+    reports: 'Reports',
+    clinics: 'Clinics',
+    labs: 'Labs',
+  },
+  auth: {
+    login: 'Login',
+    signIn: 'Sign in',
+    signOut: 'Log out',
+    register: 'Register',
+    startTrial: 'Start Trial',
+    startFreeTrial: 'Start Free Trial',
+    dashboard: 'Dashboard',
+    signInTitle: 'Sign in to your account',
+    signInPrompt: 'Or {link}',
+    startTrialLink: 'start your free trial',
+    registerTitle: 'Start your 30-day free trial',
+    registerPrompt: 'Already have an account?',
+    signInLink: 'Sign in',
+    email: 'Email address',
+    password: 'Password',
+    confirmPassword: 'Confirm password',
+    fullName: 'Full name',
+    rememberMe: 'Remember me',
+    forgotPassword: 'Forgot your password?',
+    invalidCredentials: 'Invalid email or password',
+    loginFailed: 'Login failed',
+    registrationFailed: 'Registration failed. Please try again.',
+    startMyFreeTrial: 'Start my free trial',
+    trialIncludes: 'Your trial includes:',
+    trialTeamMembers: 'Up to 5 team members',
+    trialFullAccess: 'Full access to all features',
+    trialNoCard: '30 days free, no credit card required',
+    termsAgreement: 'By signing up, you agree to our {terms} and {privacy}',
+    termsOfService: 'Terms of Service',
+    privacyPolicy: 'Privacy Policy',
+    signedIn: 'Signed in',
+    switchOrganization: 'Switch organization',
+    subscriptions: 'Subscriptions',
+    account: 'Account',
+    emailPlaceholder: 'you@example.com',
+    passwordPlaceholder: '••••••••',
+    namePlaceholder: 'John Doe',
+    termsIntro: 'By signing up, you agree to our',
+    errorRegistrationFailed: 'Registration failed',
+    errorLoginFailed: 'Login failed',
+    errorCreateOrganization: 'Failed to create organization',
+    acceptInviteTitle: 'Accept invitation',
+    loadingInvitation: 'Loading invitation...',
+    invalidInvitationLink: 'Invalid invitation link',
+    invitationAlreadyAccepted: 'This invitation is already accepted. You can log in now.',
+    errorLoadInvitation: 'Could not load invitation',
+    organizationLabel: 'Organization:',
+    emailLabel: 'Email:',
+    nameRequired: 'Name is required',
+    passwordMinLength8: 'Password must be at least 8 characters',
+    passwordsDoNotMatch: 'Passwords do not match',
+    labelName: 'Name',
+    labelCreatePassword: 'Create password',
+    labelConfirmPassword: 'Confirm password',
+    activateAccount: 'Activate account',
+    invitationAcceptedRedirect: 'Invitation Accepted. Redirecting to login...',
+    errorAcceptInvitation: 'Could not accept invitation',
+    alreadyHaveAccess: 'Already have access?',
+    goToLogin: 'Go to login',
+    acceptOrganizationTitle: 'Accept organization invitation',
+    alreadyHaveAccount: 'Already have an account?',
+    invitedBy: 'Invited by:',
+    ownerEmail: 'Owner email',
+    activateOrganization: 'Activate organization',
+    organizationAcceptedRedirect: 'Invitation accepted. Redirecting to login...',
+    stepAccount: 'Account',
+    stepOrganization: 'Organization',
+    organizationName: 'Organization name',
+    organizationNamePlaceholder: 'Sunshine Dental Clinic',
+    organizationEmail: 'Organization email',
+    organizationEmailPlaceholder: 'contact@sunshineclinic.com',
+    organizationType: 'Organization type',
+    dentalClinic: 'Dental Clinic',
+    dentalLab: 'Dental Lab',
+  },
+  landing: {
+    heroTitle: 'Connect Dental Clinics & Labs',
+    heroHighlight: 'Seamlessly',
+    heroSubtitle:
+      'Streamline communication between dental professionals. Start with a 30-day free trial, no credit card required.',
+    featureClinicsTitle: 'For Clinics',
+    featureClinicsDescription:
+      'Manage patients, appointments, and send cases to labs instantly.',
+    featureLabsTitle: 'For Labs',
+    featureLabsDescription: 'Receive cases, track progress, and communicate with clinics.',
+    featureTeamTitle: 'Team Management',
+    featureTeamDescription: 'Add up to 5 team members during trial. Scale as you grow.',
+    featureTrialTitle: '30-Day Trial',
+    featureTrialDescription: 'Full access to all features. No credit card required.',
+    featureRealtimeTitle: 'Real-time Updates',
+    featureRealtimeDescription: 'Get instant notifications on case status changes.',
+    featureSecurityTitle: 'Secure & Compliant',
+    featureSecurityDescription: 'HIPAA-compliant with enterprise-grade security.',
+    footerCopyright: '© 2026 DyoLink. All rights reserved.',
+    termsAndConditions: 'Terms & Conditions',
+  },
+  accountMenu: {
+    noActiveSubscription: 'No active subscription — review Subscriptions',
+    trialEnded: 'Trial ended — review Subscriptions',
+    trialEndingSoon: 'Trial ending soon — review Subscriptions',
+    seatsLow: 'Seats running low — review Subscriptions',
+    reviewSubscriptions: 'Review Subscriptions',
+  },
+  validation: {
+    emailInvalid: 'Please enter a valid email address',
+    passwordRequired: 'Password is required',
+    nameMinLength: 'Name must be at least 2 characters',
+    passwordMinLength: 'Password must be at least 8 characters',
+    passwordUppercase: 'Password must contain at least one uppercase letter',
+    passwordNumber: 'Password must contain at least one number',
+    organizationNameMinLength: 'Organization name must be at least 2 characters',
+    organizationEmailInvalid: 'Please enter a valid organization email',
+    organizationTypeRequired: 'Please select organization type',
+    passwordsDoNotMatch: "Passwords don't match",
+  },
+  today: {
+    welcomeBack: 'Welcome back!!',
+    noSubscriptionNotice: 'This organization does not have an active subscription yet.',
+    choosePlanLink: 'Choose a plan',
+    noSubscriptionCta: 'to start the purchase process.',
+    cardTodaysAppointments: "Today's Appointments",
+    cardActivePatients: 'Active Patients',
+    cardNewLabCase: 'New Lab Case',
+    cardTodayInvoices: 'Today invoices',
+  },
+  staff: {
+    redirecting: 'Redirecting…',
+    title: 'Staff Management',
+    subtitle: 'Invite teammates, set tab access, and stay within your plan seat limit.',
+    inviteMember: 'Invite member',
+    seatsLabel: 'Seats:',
+    unlimitedPlan: '(unlimited plan)',
+    seatLimitReached: 'Plan seat limit reached for this organization.',
+    noActivePlan:
+      'No active plan selected for this organization. Choose a subscription plan to invite members.',
+    invitedPending:
+      'Invitation is pending until they open the link, set a password, and log in.',
+    invitedAccepted: 'Invitation was accepted immediately.',
+    inviteLinkHeading: 'Invite link',
+    shareLinkHint:
+      'Share this link manually via SMS or email. A new link is generated if the previous one expired or was lost.',
+    loadingTeam: 'Loading team…',
+    tableName: 'Name',
+    tableEmail: 'Email',
+    tableRole: 'Role',
+    tableStatus: 'Status',
+    tableAccess: 'Access',
+    tableAction: 'Action',
+    roleOwner: 'Owner',
+    roleStaff: 'Staff',
+    statusActive: 'Active',
+    statusPending: 'Pending',
+    statusDisabled: 'Disabled',
+    statusExpired: 'Expired',
+    allFeatures: 'All features',
+    inviteModalTitle: 'Invite team member',
+    stepOf: 'Step {step} of 2',
+    permissionView: 'View',
+    permissionEdit: 'Edit',
+    labelEmail: 'Email',
+    labelDisplayName: 'Display name',
+    tabAccess: 'Tab access',
+    sendInvite: 'Send invite',
+    skipForNow: 'Skip for now',
+    enableModalTitle: 'Enable team member',
+    enableConfirm: 'Enable {name} ({email})?',
+    enableBullet1: 'They can sign in to this organization again with their existing account.',
+    enableBullet2: 'No new invitation is sent and no data was removed while they were disabled.',
+    enableBullet3: 'Enabling uses one seat on your plan.',
+    noSeatsAvailable:
+      'No seats are available. Disable another member or upgrade your plan before enabling this person.',
+    enableMemberButton: 'Enable member',
+    disableModalTitle: 'Disable team member',
+    disableConfirm: 'Disable {name} ({email})?',
+    disableBullet1: 'They will not be able to sign in to this organization.',
+    disableBullet2: 'No data will be removed.',
+    disableBullet3: 'Disabling frees one seat on your plan so you can invite someone else.',
+    disableMemberButton: 'Disable member',
+    editModalTitle: 'Edit member',
+    loadingWorkingHours: 'Loading working hours…',
+    errorLoadStaff: 'Failed to load staff.',
+    errorCopyInvite: 'Could not copy invitation link.',
+    errorSendInvite: 'Failed to send invitation.',
+    errorLoadWorkingHours: 'Failed to load working hours.',
+    successMemberUpdated: 'Member updated.',
+    errorUpdateMember: 'Failed to update member.',
+    errorDeleteNotImplemented: 'Delete is not implemented yet.',
+    successMemberDisabled: '{name} was disabled. A seat is now available.',
+    errorDisableMember: 'Failed to disable member.',
+    successMemberEnabled: '{name} was enabled and can sign in again.',
+    errorEnableMember: 'Failed to enable member.',
+    successInvited: '{name} ({email}) was invited.',
+    copyInviteLink: 'Copy invitation link',
+    copyInviteLinkTitle: 'Copy invitation link (generates a new link if needed)',
+    enableMemberAria: 'Enable member',
+    enableMemberTitle: 'Enable member (uses a seat)',
+    disableMemberAria: 'Disable member',
+    disableMemberTitle: 'Disable member (frees a seat)',
+    editMemberAria: 'Edit member',
+    deleteMemberAria: 'Delete member',
+    deleteMemberTitle: 'Delete member (not implemented)',
+    features: {
+      featureToday: 'Today',
+      featureStaff: 'Staff',
+      featureOrganizations: 'Organizations',
+      featureClinics: 'Clinics',
+      featureLabs: 'Labs',
+      featurePatients: 'Patients',
+      featureAppointment: 'Appointment',
+      featureTreatment: 'Treatment',
+      featureBilling: 'Billing',
+      featureReports: 'Reports',
+      noTabAccess: 'No tab access',
+      readOnlySuffix: '(Read only)',
+    },
+    workingHours: {
+      recommendedTitle: 'Working hours recommended',
+      recommendedBody:
+        'Staff with treatment edit access appear as provider columns in Appointments. Set their weekly hours so the schedule grid shows the right bookable times.',
+      intro:
+        'Set weekly working hours for this provider. The appointments grid uses these hours to show bookable time slots.',
+      workingDay: 'Working day',
+      start: 'Start',
+      end: 'End',
+      removeShift: 'Remove shift',
+      addShift: 'Add shift',
+      autoRepeatWeekly: 'Repeat these hours at the start of each week (copy forward on Monday)',
+      weekdayMon: 'Mon',
+      weekdayTue: 'Tue',
+      weekdayWed: 'Wed',
+      weekdayThu: 'Thu',
+      weekdayFri: 'Fri',
+      weekdaySat: 'Sat',
+      weekdaySun: 'Sun',
+      validationNeedsShift: '{day} needs at least one shift or should be marked off.',
+      validationEndAfterStart: '{day} shift end time must be after start time.',
+      validationOverlap: '{day} shifts cannot overlap.',
+    },
+  },
+  patients: {
+    title: 'Patients',
+    newPatient: 'New Patient',
+    errorLoadPatients: 'Failed to load patients.',
+    successPatientSaved: 'Patient {firstName} {lastName} was saved successfully.',
+    errorSavePatient: 'Failed to save patient.',
+    firstName: 'First name',
+    lastName: 'Last name',
+    phone: 'Phone',
+    savePatient: 'Save Patient',
+    dialogTitle: 'New patient',
+    searchPlaceholder: 'Search patients by name, phone, email',
+    loadingPatients: 'Loading patients...',
+    noResults: 'No patients found for this search.',
+    noContact: 'No contact',
+    selectPatient: 'Select a patient to view details.',
+    phoneLabel: 'Phone:',
+    emailLabel: 'Email:',
+    statusLabel: 'Status:',
+    statusActive: 'Active',
+    statusInactive: 'Inactive',
+    emptyValue: '-',
+  },
+  appointments: {
+    title: 'Appointments',
+    subtitle: 'Search a patient, pick a date, then click a time slot under a provider to book.',
+    loadingSchedule: 'Loading schedule…',
+    infoPastViewOnly: 'Past appointments are view-only.',
+    infoSelectPatient: 'Select a patient before booking.',
+    errorOutsideHours:
+      "This appointment falls outside the provider's current working hours and cannot be edited.",
+    successUpdated: 'Appointment updated.',
+    successSaved: 'Appointment saved.',
+    errorUpdate: 'Could not update appointment.',
+    errorSave: 'Could not save appointment.',
+    confirmRemove: 'Remove this appointment?',
+    successRemoved: 'Appointment removed.',
+    errorDelete: 'Could not delete appointment.',
+    errorLoadSchedule: 'Failed to load schedule.',
+    successPatientSaved: 'Patient {firstName} {lastName} was saved.',
+    searchPlaceholder: 'Search existing patients',
+    searching: 'Searching…',
+    searchHint: 'Type to search patients by name, phone, or email.',
+    noPermissionAdd: 'You do not have permission to add patients.',
+    editTitle: 'Edit appointment',
+    newTitle: 'New appointment',
+    providerLabel: 'Provider:',
+    patientLabel: 'Patient',
+    startLabel: 'Start',
+    endLabel: 'End',
+    purposeLabel: 'Purpose',
+    errorSelectPatient: 'Select a patient first.',
+    errorEndAfterStart: 'End time must be after start time.',
+    errorPastSchedule: 'Cannot schedule in the past.',
+    errorPastViewOnly: 'Past appointments are view-only.',
+    errorMissingDetails: 'Missing appointment details.',
+    noProviders:
+      'No providers available. Add staff with treatment edit access to see columns here.',
+    noWorkingHours:
+      'No working hours are configured for this day. Set provider working hours in Staff management.',
+    noHoursSet: 'No hours set',
+    offToday: 'Off today',
+    slotOffToday: 'Provider is off today',
+    slotHoursNotConfigured: 'Working hours not configured',
+    slotOutsideHours: 'Outside working hours',
+    slotCannotCreate: 'You cannot create appointments',
+    slotBookAt: 'Book {time}',
+    outsideHoursBlocked: 'Outside working hours — editing blocked',
+    overlappingChoose: '{count} overlapping — click to choose',
+    overlapping: '{count} overlapping',
+    legend: 'Legend',
+    overlappingTitle: 'Overlapping appointments ({count})',
+    purposeConsultation: 'Consultation',
+    purposeFilling: 'Filling',
+    purposeEndo: 'Endo',
+    purposeVisit: 'Visit',
+    purposeHygiene: 'Hygiene',
+  },
+  treatment: {
+    loading: 'Loading…',
+    noPermissionTitle: 'Treatment workspace',
+    noPermissionBody: 'You do not have permission to view the Treatment tab for this organization.',
+    title: 'Treatment',
+    subtitleEdit:
+      'Document cases for your appointments, save drafts, and send work to linked organizations.',
+    subtitleReadOnly:
+      'View-only access — you can review appointments and treatment history but cannot edit.',
+    pastDayNotice:
+      'Past days are view-only. You can review appointments and history, but treatment cases cannot be added or changed.',
+    selectedPatient: 'Selected patient',
+    purposeLabel: 'Purpose:',
+    loadingAppointments: 'Loading appointments…',
+    selectDayWithAppointment: 'Select a day with at least one appointment.',
+    confirmDiscard: 'You have unsaved changes. Discard them and continue?',
+    successDraftSaved: 'Treatment draft saved.',
+    errorChooseOrg: 'Choose at least one active organization to send this case.',
+    successCaseSent: 'Case sent to selected organizations.',
+    successFilesUploaded: '{count} file(s) uploaded successfully.',
+    errorLoadAppointments: 'Failed to load appointments.',
+    errorLoadOrgs: 'Failed to load linked organizations.',
+    errorLoadHistory: 'Failed to load treatment history.',
+    errorLoadDraft: 'Failed to load treatment draft.',
+    errorUpload: 'Failed to upload attachments.',
+    errorSaveDraft: 'Failed to save treatment draft.',
+    errorSendCase: 'Failed to send case.',
+    errorCaseMustSave: 'Case must be saved before sending.',
+    draftTitle: 'Draft · {patientName}',
+    hiddenMessage: 'Appointments are hidden.',
+    showAppointments: 'Show appointments',
+    appointmentsTitle: 'My appointments',
+    hideAppointments: 'Hide appointments',
+    emptyDay: 'No appointments assigned to you on this day.',
+    casesTitle: 'Treatment cases',
+    casesSubtitle: 'Each case has its own teeth, notes, attachments, and destinations for send.',
+    addCase: 'Add case',
+    caseLabel: 'Case {n}',
+    comments: 'Comments',
+    commentsPlaceholder: 'Write clinical notes for this case…',
+    treatmentType: 'Treatment type',
+    typeConsultation: 'consultation',
+    typeFilling: 'filling',
+    typeEndo: 'endo',
+    typeVisit: 'visit',
+    typeHygiene: 'hygiene',
+    attachments: 'Attachments',
+    attachFiles: 'Attach files for this treatment case',
+    chooseFiles: 'Choose files',
+    sendToOrgs: 'Send this case to linked organizations',
+    searchOrgsPlaceholder: 'Search active organizations...',
+    recent: 'Recent:',
+    noOrgMatch: 'No active organization matches your search.',
+    sendThisCase: 'Send this case',
+    saveDraft: 'Save treatment draft',
+    unsavedChanges: 'Unsaved changes',
+    draftSaved: 'Draft saved',
+    sendSavesFirst: 'Sending is per case and saves first automatically.',
+    historyTitle: 'Previous treatments',
+    historySubtitle: 'Completed treatments for this patient. Each case is listed separately.',
+    loadingHistory: 'Loading history…',
+    historyEmpty: 'No prior treatments for this patient.',
+    statusLabel: 'Status:',
+    historyCaseLabel: 'Case {n} · {type}',
+    teethLabel: 'Teeth:',
+    teethNone: 'None selected',
+    reviewDetails: 'Review details',
+    previewTitle: 'Treatment preview',
+    previewDraft: 'Preview current draft',
+    selectAppointment: 'Select an appointment to preview its draft.',
+    caseCount: '{n} case(s)',
+    attachmentCount: '{n} attachment(s)',
+    caseSummary: 'Case {n}: {type}',
+    teethPrefix: '· Teeth',
+    moreCases: '+ {n} more case(s)',
+    previewDialogTitle: 'Treatment preview',
+    previewDialogSubtitle: 'Review cases, attachments, and send destinations.',
+    noCases: 'No cases in this treatment.',
+    typeLabel: 'Type:',
+    commentsLabel: 'Comments:',
+    commentsEmpty: 'Comments: —',
+    attachFilesShort: 'Attach files',
+    sendCase: 'Send this case',
+    sendToLinkedOrgs: 'Send to linked organizations',
+    noActiveOrgs: 'No active linked organizations.',
+    confirmSend: 'Confirm send',
+    toothChartTitle: 'FDI tooth chart',
+    toothChartHint: 'Tap teeth to multi-select. Applies to the active case.',
+    selectedLabel: 'Selected:',
+    selectedEmpty: '—',
+    upperArch: 'Upper arch',
+    lowerArch: 'Lower arch',
+    toothAria: 'FDI tooth {fdi}',
+    toothSelectedSuffix: ', selected',
+    sentToAt: 'Sent to {orgName} at {datetime}',
+    fallbackOrgName: 'organization',
+  },
+  organizations: {
+    loadingOrganization: 'Loading organization...',
+    subtitle:
+      'Search organizations, send connection requests to existing accounts, or invitation links when they are not on DyoLink yet.',
+    invitationHistory: 'Invitation History',
+    searchPlaceholder: 'Search {counterpart} by name, email, or phone...',
+    backToList: 'Back to list',
+    tableOrganization: 'Organization',
+    tableOwnerEmail: 'Owner email',
+    tableDate: 'Date',
+    tableStatus: 'Status',
+    tableAction: 'Action',
+    emptyConnections: 'No connections yet. Search to send a connection request or an invitation link.',
+    statusInvitationPending: 'Invitation pending',
+    statusConnectionPending: 'Connection request pending',
+    statusConnected: 'Connected',
+    statusDeclined: 'Connection request declined',
+    statusFound: 'Found',
+    statusToday: 'Today',
+    acceptRequest: 'Accept connection request',
+    declineRequest: 'Decline connection request',
+    removeConnection: 'Remove connection',
+    sendRequest: 'Send connection request',
+    noDirectoryResults: 'No organization found in directory search.',
+    hideInvitationFields: 'Hide invitation fields',
+    sendInvitationLink: 'Send invitation link',
+    counterpartNameLabel: '{counterpart} name',
+    ownerEmailLabel: 'Owner email',
+    sendInvitation: 'Send invitation',
+    successConnectionSent: '{counterpart} connection request sent.',
+    successInviteCreated: 'Invitation link created for {email}',
+    successLinkCopied: 'Invitation link copied to clipboard.',
+    successAccepted: 'Connection request accepted.',
+    successDeclined: 'Connection request declined.',
+    successRemoved: 'Connection removed.',
+    historyTitle: 'Invitation History',
+    loadingHistory: 'Loading invitation history...',
+    historyEmpty: 'No invitations yet.',
+    tableInvitationLink: 'Invitation link',
+    statusPending: 'Invitation pending',
+    statusAccepted: 'Invitation accepted',
+    statusRejected: 'Invitation rejected',
+    statusExpired: 'Invitation expired',
+    copyInvitationLink: 'Copy invitation link',
+    copyInvitationLinkTitle: 'Copy invitation link (generates a new link if needed)',
+    selectorTitle: 'Organizations',
+    selectorSubtitleWithCreate: 'Select an organization to continue, or create a new one.',
+    selectorSubtitleSelectOnly: 'Select an organization to continue.',
+    createOrganization: 'Create Organization',
+    createAndContinue: 'Create and Continue',
+    emptyCanCreate: 'No organizations found. Create your first one to continue.',
+    emptyAskOwner: 'No organizations found. Ask an organization owner to invite you.',
+    continueArrow: 'Continue →',
+    planLabel: 'Plan: {name} • {maxUsers} users',
+  },
+  settings: {
+    accountTitle: 'Account',
+    accountSubtitle: 'Profile and security settings for your login.',
+    accountPlaceholder:
+      'Password change and profile editing will be wired here next (e.g. invite flow, reset password).',
+    subscriptionsTitle: 'Subscriptions',
+    subscriptionsSubtitle:
+      'Your DyoLink workspace plan and seats for {orgName}. Clinic and lab income tracking stays under the sidebar Billing tab.',
+    noSubscriptionNotice:
+      'This organization has no active subscription. Select a plan below to start the purchase process.',
+    currentPlan: 'Current plan',
+    planPrice: 'Plan price',
+    seatsUsed: 'Seats used',
+    seatsRemaining: 'Seats remaining',
+    daysRemaining: 'Days remaining',
+    unlimited: 'Unlimited',
+    unlimitedSeats: 'Unlimited seats',
+    seatsCount: '{n} seats',
+    pricePerMonth: '${price} / month',
+    noActiveSubscription: 'No active subscription for this organization.',
+    trialEnded: 'Trial period has ended. Choose a plan when checkout is available.',
+    trialEndsIn: 'Trial ends in {days} day(s).',
+    seatsLow: 'Seat usage is high for this organization.',
+    choosePlanIntro:
+      'Choose a plan to continue. Purchase integration is not active yet, so this currently prepares the selection step only.',
+    planSolo: 'Solo',
+    planSmall: 'Small',
+    planMedium: 'Medium',
+    planLarge: 'Large',
+    planEnterprise: 'Enterprise',
+    startPurchase: 'Start purchase process',
+    purchaseNotice:
+      'Purchase flow will be enabled soon. {plan} is selected and ready for checkout setup.',
+  },
+  schedule: {
+    defaultLabel: 'Schedule date',
+    previousDay: 'Previous day',
+    nextDay: 'Next day',
+    chooseDate: 'Choose schedule date',
+    year: 'Year',
+    month: 'Month',
+    day: 'Day',
+    monthJanuary: 'January',
+    monthFebruary: 'February',
+    monthMarch: 'March',
+    monthApril: 'April',
+    monthMay: 'May',
+    monthJune: 'June',
+    monthJuly: 'July',
+    monthAugust: 'August',
+    monthSeptember: 'September',
+    monthOctober: 'October',
+    monthNovember: 'November',
+    monthDecember: 'December',
+  },
+};
+
+function deepMerge(base, overlay) {
+  const result = { ...base };
+  for (const key of Object.keys(base)) {
+    const baseVal = base[key];
+    const overlayVal = overlay?.[key];
+    if (baseVal && typeof baseVal === 'object' && !Array.isArray(baseVal)) {
+      result[key] = deepMerge(baseVal, overlayVal ?? {});
+    } else if (overlayVal !== undefined) {
+      result[key] = overlayVal;
+    }
+  }
+  return result;
+}
+
+function writeJson(file, data) {
+  fs.writeFileSync(file, `${JSON.stringify(data, null, 2)}\n`, 'utf8');
+}
+
+writeJson(path.join(messagesDir, 'en.json'), en);
+
+for (const locale of ['fa', 'nl']) {
+  const file = path.join(messagesDir, `${locale}.json`);
+  const existing = fs.existsSync(file) ? JSON.parse(fs.readFileSync(file, 'utf8')) : {};
+  writeJson(file, deepMerge(en, existing));
+}
+
+console.log('Messages built: en.json updated; fa.json and nl.json merged with existing translations.');
diff --git a/frontend/src/app/(dashboard)/patients/page.tsx b/frontend/src/app/(dashboard)/patients/page.tsx
deleted file mode 100644
index 744c193..0000000
--- a/frontend/src/app/(dashboard)/patients/page.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-'use client';
-
-import { useEffect, useMemo, useState } from 'react';
-import { Button } from '@/components/ui/shared/Button';
-import { ToastStack } from '@/components/ui/shared/Toast';
-import { patientsApi } from '@/lib/api/patients';
-import { formatApiErrorMessage } from '@/components/shared/formatApiError';
-import { useAuth } from '@/lib/hooks/useAuth';
-import { useToast } from '@/lib/hooks/useToast';
-import { hasPermission } from '@/components/shared/permissions';
-import { CreatePatientInput, Patient } from '@/types/patient';
-import { PatientSearchSelect } from '../../../components/ui/patient/PatientSearchSelect';
-import { CreatePatientModal } from '../../../components/ui/patient/CreatePatientModal';
-import { PatientSummaryCard } from '../../../components/ui/patient/PatientSummaryCard';
-
-const EMPTY_PATIENT_FORM: CreatePatientInput = {
-  firstName: '',
-  lastName: '',
-  phone: '',
-  email: '',
-};
-
-export default function PatientsPage() {
-  const { currentOrganization } = useAuth();
-  const toast = useToast();
-  const [search, setSearch] = useState('');
-  const [patients, setPatients] = useState<Patient[]>([]);
-  const [selectedPatient, setSelectedPatient] = useState<Patient | undefined>();
-  const [loadingPatients, setLoadingPatients] = useState(false);
-  const [isCreateOpen, setIsCreateOpen] = useState(false);
-  const [savingPatient, setSavingPatient] = useState(false);
-  const [patientForm, setPatientForm] = useState<CreatePatientInput>(EMPTY_PATIENT_FORM);
-  const canEditPatients = hasPermission(currentOrganization, 'TAB_PATIENTS_EDIT');
-
-  const sortedPatients = useMemo(
-    () =>
-      [...patients].sort((a, b) =>
-        `${a.firstName} ${a.lastName}`.localeCompare(`${b.firstName} ${b.lastName}`),
-      ),
-    [patients],
-  );
-
-  useEffect(() => {
-    const timeout = setTimeout(() => {
-      void loadPatients(search);
-    }, 300);
-    return () => clearTimeout(timeout);
-  }, [search]);
-
-  useEffect(() => {
-    void loadPatients('');
-  }, []);
-
-  async function loadPatients(q: string) {
-    setLoadingPatients(true);
-    toast.setError('');
-    try {
-      const response = await patientsApi.list({ q, page: 1, limit: 25 });
-      const items = response.data.items;
-      setPatients(items);
-
-      if (selectedPatient) {
-        const freshSelected = items.find((item) => item.id === selectedPatient.id);
-        setSelectedPatient(freshSelected);
-      }
-    } catch (error: unknown) {
-      toast.showError(formatApiErrorMessage(error, 'Failed to load patients.'));
-    } finally {
-      setLoadingPatients(false);
-    }
-  }
-
-  async function handleCreatePatient() {
-    setSavingPatient(true);
-    toast.setError('');
-    try {
-      const response = await patientsApi.create(patientForm);
-      setIsCreateOpen(false);
-      setPatientForm(EMPTY_PATIENT_FORM);
-      await loadPatients(search);
-      setSelectedPatient(response.data);
-      toast.showSuccess(
-        `Patient ${response.data.firstName} ${response.data.lastName} was saved successfully.`,
-      );
-    } catch (error: unknown) {
-      toast.showError(formatApiErrorMessage(error, 'Failed to save patient.'));
-    } finally {
-      setSavingPatient(false);
-    }
-  }
-
-  return (
-    <div className="space-y-6">
-      <div className="flex items-center justify-between gap-3">
-        <h1 className="text-2xl font-semibold text-text-primary">Patients</h1>
-        <Button
-          variant="primary"
-          disabled={!canEditPatients}
-          onClick={() => {
-            if (!canEditPatients) return;
-            toast.clear();
-            setPatientForm(EMPTY_PATIENT_FORM);
-            setIsCreateOpen(true);
-          }}
-          title={!canEditPatients ? 'Read-only access for this organization.' : undefined}
-        >
-          New Patient
-        </Button>
-      </div>
-
-      <ToastStack {...toast.messages} />
-
-      {isCreateOpen && (
-        <CreatePatientModal
-          isOpen={isCreateOpen}
-          formData={patientForm}
-          onChange={(patch) => setPatientForm((prev) => ({ ...prev, ...patch }))}
-          onSubmit={() => void handleCreatePatient()}
-          onClose={() => {
-            setIsCreateOpen(false);
-            setPatientForm(EMPTY_PATIENT_FORM);
-          }}
-          loading={savingPatient}
-        />
-      )}
-
-      <div className="grid grid-cols-1 xl:grid-cols-3 gap-6">
-        <div className="xl:col-span-1">
-          <PatientSearchSelect
-            search={search}
-            onSearchChange={setSearch}
-            patients={sortedPatients}
-            selectedPatientId={selectedPatient?.id}
-            onSelectPatient={setSelectedPatient}
-            loading={loadingPatients}
-          />
-        </div>
-
-        <div className="xl:col-span-2 space-y-4">
-          <PatientSummaryCard patient={selectedPatient} />
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/frontend/src/app/(public)/login/page.tsx b/frontend/src/app/(public)/login/page.tsx
deleted file mode 100644
index a0c21ee..0000000
--- a/frontend/src/app/(public)/login/page.tsx
+++ /dev/null
@@ -1,241 +0,0 @@
-// src/app/login/page.tsx
-// 'use client';
-// import { useState } from 'react';
-// import { useForm } from 'react-hook-form';
-// import { zodResolver } from '@hookform/resolvers/zod';
-// import * as z from 'zod';
-// import Link from 'next/link';
-// import { Mail, Lock } from 'lucide-react';
-// import { useAuth } from '@/lib/hooks/useAuth';
-// import { Button } from '@/components/ui/Button';
-// import { Input } from '@/components/ui/Input';
-// const loginSchema = z.object({
-//     email: z.string().email('Please enter a valid email address'),
-//     password: z.string().min(1, 'Password is required'),
-// });
-// type LoginForm = z.infer<typeof loginSchema>;
-// export default function LoginPage() {
-//     const { login, isLoading } = useAuth();
-//     const [error, setError] = useState<string | null>(null);
-//     const {
-//         register,
-//         handleSubmit,
-//         formState: { errors },
-//     } = useForm<LoginForm>({
-//         resolver: zodResolver(loginSchema),
-//     });
-//     const onSubmit = async (data: LoginForm) => {
-//         try {
-//             setError(null);
-//             await login(data.email, data.password);
-//         } catch (err: any) {
-//             setError(err.message || 'Invalid email or password');
-//         }
-//     };
-    
-//     return (
-//         <div className="min-h-screen bg-gray-50 flex flex-col justify-center py-12 sm:px-6 lg:px-8">
-//             <div className="sm:mx-auto sm:w-full sm:max-w-md">
-//                 <Link href="/" className="flex justify-center">
-//                     <span className="text-3xl font-bold text-primary-600">DyoLink</span>
-//                 </Link>
-//                 <h2 className="mt-6 text-center text-3xl font-extrabold text-gray-900">
-//                     Sign in to your account
-//                 </h2>
-//                 <p className="mt-2 text-center text-sm text-gray-600">
-//                     Or{' '}
-//                     <Link href="/register" className="font-medium text-primary-600 hover:text-primary-500">
-//                         start your free trial
-//                     </Link>
-//                 </p>
-//             </div>
-//             <div className="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
-//                 <div className="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
-//                     <form className="space-y-6" onSubmit={handleSubmit(onSubmit)}>
-//                         <Input
-//                             label="Email address"
-//                             {...register('email')}
-//                             type="email"
-//                             placeholder="you@example.com"
-//                             error={errors.email?.message}
-//                             icon={<Mail className="h-5 w-5 text-gray-400" />}
-//                         />
-//                         <Input
-//                             label="Password"
-//                             {...register('password')}
-//                             type="password"
-//                             placeholder="••••••••"
-//                             error={errors.password?.message}
-//                             icon={<Lock className="h-5 w-5 text-gray-400" />}
-//                         />
-//                         <div className="flex items-center justify-between">
-//                             <div className="flex items-center">
-//                                 <input
-//                                     id="remember-me"
-//                                     name="remember-me"
-//                                     type="checkbox"
-//                                     className="h-4 w-4 text-primary-600 focus:ring-primary-500border-gray-300 rounded"
-//                                 />
-//                                 <label htmlFor="remember-me" className="ml-2 block text-sm text-gray-900">
-//                                     Remember me
-//                                 </label>
-//                             </div>
-//                             <div className="text-sm">
-//                                 <Link href="/forgot-password" className="font-medium text-primary-600 hover:text-primary-500">
-//                                     Forgot your password?
-//                                 </Link>
-//                             </div>
-//                         </div>
-//                         {error && (
-//                             <div className="p-3 bg-red-50 border border-red-200 rounded-lg">
-//                                 <p className="text-sm text-red-600">{error}</p>
-//                             </div>
-//                         )}
-//                         <Button
-//                             type="submit"
-//                             variant="primary"
-//                             isLoading={isLoading}
-//                             fullWidth
-//                         >
-//                             Sign in
-//                         </Button>
-//                     </form>
-//                 </div>
-//             </div>
-//         </div>
-//     );
-// }
-'use client';
-
-import { useState, useEffect } from 'react';
-import { useRouter } from 'next/navigation';
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import * as z from 'zod';
-import Link from 'next/link';
-import { Mail, Lock } from 'lucide-react';
-
-import { useAuth } from '@/lib/hooks/useAuth';
-import { Button } from '@/components/ui/shared/Button';
-import { Input } from '@/components/ui/shared/Input';
-
-const loginSchema = z.object({
-  email: z.string().email('Please enter a valid email address'),
-  password: z.string().min(1, 'Password is required'),
-});
-
-type LoginForm = z.infer<typeof loginSchema>;
-
-export default function LoginPage() {
-  const { login, isLoading, user, isAuthReady } = useAuth();
-  const router = useRouter();
-
-  const [error, setError] = useState<string | null>(null);
-
-  useEffect(() => {
-    if (isAuthReady && user) {
-      router.push('/today');
-    }
-  }, [user, isAuthReady, router]);
-
-  const {
-    register,
-    handleSubmit,
-    formState: { errors },
-  } = useForm<LoginForm>({
-    resolver: zodResolver(loginSchema),
-  });
-
-  const onSubmit = async (data: LoginForm) => {
-    try {
-      setError(null);
-      await login(data.email, data.password);
-    } catch (err: any) {
-      setError(err.message || 'Invalid email or password');
-    }
-  };
-
-  if (!isAuthReady) {
-    return (
-      <div className="min-h-screen app-web-bg flex items-center justify-center">
-        <p className="text-text-secondary">Loading...</p>
-      </div>
-    );
-  }
-
-  return (
-    <div className="min-h-screen app-web-bg flex flex-col justify-center py-12 sm:px-6 lg:px-8">
-      <div className="sm:mx-auto sm:w-full sm:max-w-md">
-        <Link href="/" className="flex justify-center">
-          <span className="text-3xl font-semibold text-text-primary">DyoLink</span>
-        </Link>
-        <h2 className="mt-6 text-center text-3xl font-semibold text-text-primary">
-          Sign in to your account
-        </h2>
-        <p className="mt-2 text-center text-sm text-text-secondary">
-          Or{' '}
-          <Link href="/register" className="font-medium text-primary hover:opacity-90">
-            start your free trial
-          </Link>
-        </p>
-      </div>
-
-      <div className="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
-        <div className="surface-card py-8 px-4 sm:px-10">
-          <form className="space-y-6" onSubmit={handleSubmit(onSubmit)}>
-            <Input
-              label="Email address"
-              {...register('email')}
-              type="email"
-              placeholder="you@example.com"
-              error={errors.email?.message}
-              icon={<Mail className="h-5 w-5 icon-flat" />}
-            />
-            <Input
-              label="Password"
-              {...register('password')}
-              type="password"
-              placeholder="••••••••"
-              error={errors.password?.message}
-              icon={<Lock className="h-5 w-5 icon-flat" />}
-            />
-
-            <div className="flex items-center justify-between">
-              <div className="flex items-center">
-                <input
-                  id="remember-me"
-                  name="remember-me"
-                  type="checkbox"
-                  className="h-4 w-4 rounded border-border bg-background-secondary text-primary focus:ring-primary/40"
-                />
-                <label htmlFor="remember-me" className="ml-2 block text-sm text-text-secondary">
-                  Remember me
-                </label>
-              </div>
-              <div className="text-sm">
-                <Link href="/forgot-password" className="font-medium text-primary hover:opacity-90">
-                  Forgot your password?
-                </Link>
-              </div>
-            </div>
-
-            {error && (
-              <div className="p-3 bg-red-50 border border-red-200 rounded-lg">
-                <p className="text-sm text-red-600">{error}</p>
-              </div>
-            )}
-
-            <Button
-              type="submit"
-              variant="primary"
-              isLoading={isLoading}
-              fullWidth
-            >
-              Sign in
-            </Button>
-          </form>
-        </div>
-      </div>
-    </div>
-  );
-}
\ No newline at end of file
diff --git a/frontend/src/app/(public)/register/page.tsx b/frontend/src/app/(public)/register/page.tsx
deleted file mode 100644
index c1372fe..0000000
--- a/frontend/src/app/(public)/register/page.tsx
+++ /dev/null
@@ -1,206 +0,0 @@
-// src/app/register/page.tsx\
-'use client';
-import { useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import * as z from 'zod';
-import Link from 'next/link';
-import { Mail, Lock, User } from 'lucide-react';
-import { useAuth } from '@/lib/hooks/useAuth';
-import { OrganizationDetailsFields } from '@/components/ui/auth/OrganizationDetailsFields';
-import { RegistrationProgressSteps } from '@/components/ui/auth/RegistrationProgressSteps';
-import { Button } from '@/components/ui/shared/Button';
-import { Input } from '@/components/ui/shared/Input';
-const registerSchema = z.object({
-    name: z.string().min(2, 'Name must be at least 2 characters'),
-    email: z.string().email('Please enter a valid email address'),
-    password: z.string()
-        .min(8, 'Password must be at least 8 characters')
-        .regex(/[A-Z]/, 'Password must contain at least one uppercase letter')
-        .regex(/[0-9]/, 'Password must contain at least one number'),
-    confirmPassword: z.string(),
-    organizationName: z.string().min(2, 'Organization name must be at least 2 characters'),
-    organizationEmail: z.string().email('Please enter a valid organization email'),
-    organizationType: z.enum(['CLINIC', 'LAB'], {
-        message: 'Please select organization type',
-    }),
-}).refine((data) => data.password === data.confirmPassword, {
-    message: "Passwords don't match",
-    path: ['confirmPassword'],
-});
-type RegisterForm = z.infer<typeof registerSchema>;
-
-export default function RegisterPage() {
-    const { registerTrial, isLoading } = useAuth();
-    const [step, setStep] = useState(1);
-    const [error, setError] = useState<string | null>(null);
-    
-    const {
-        register,
-        handleSubmit,
-        watch,
-        formState: { errors },
-        trigger,
-        setValue,
-    } = useForm<RegisterForm>({
-        resolver: zodResolver(registerSchema),
-        mode: 'onChange',
-    });
-    const organizationType = watch('organizationType');
-    const handleNext = async () => {
-        const fieldsToValidate = step === 1
-            ? ['name', 'email', 'password', 'confirmPassword']
-            : ['organizationName', 'organizationEmail', 'organizationType'];
-
-        const isValid = await trigger(fieldsToValidate as any);
-        if (isValid) {
-            setStep(step + 1);
-        }
-    };
-    const onSubmit = async (data: RegisterForm) => {
-        try {
-            setError(null);
-            await registerTrial(
-                data.email,
-                data.password,
-                data.name,
-                data.organizationName,
-                data.organizationEmail,
-                data.organizationType
-            );
-            // No need to redirect - auth context will handle it
-        } catch (err: any) {
-            setError(err.message || 'Registration failed. Please try again.');
-        }
-    };
-    return (
-        <div className="min-h-screen app-web-bg flex flex-col justify-center py-12 sm:px-6 lg:px-8">
-            <div className="sm:mx-auto sm:w-full sm:max-w-md">
-                <Link href="/" className="flex justify-center">
-                    <span className="text-3xl font-semibold text-text-primary">DyoLink</span>
-                </Link>
-                <h2 className="mt-6 text-center text-3xl font-semibold text-text-primary">
-                    Start your 30-day free trial
-                </h2>
-                <p className="mt-2 text-center text-sm text-text-secondary">
-                    Already have an account?{' '}
-                    <Link href="/login" className="font-medium text-primary hover:opacity-90">
-                        Sign in
-                    </Link>
-                </p>
-            </div>
-            <div className="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
-                <div className="surface-card py-8 px-4 sm:px-10">
-                    <RegistrationProgressSteps step={step} />
-                    {/* Trial Info Banner */}
-                    <div className="mb-6 p-4 bg-primary-soft rounded-[var(--radius-md)] border border-primary/35">
-                        <h3 className="text-sm font-medium text-text-primary mb-2">Your trial
-                            includes:</h3>
-                        <ul className="text-sm text-text-secondary space-y-1">
-                            <li className="flex items-center">
-                                <span className="mr-2">✓</span> Up to 5 team members
-                            </li>
-                            <li className="flex items-center">
-                                <span className="mr-2">✓</span> Full access to all features
-                            </li>
-                            <li className="flex items-center">
-                                <span className="mr-2">✓</span> 30 days free, no credit card
-                                required
-                            </li>
-                        </ul>
-                    </div>
-                    <form onSubmit={handleSubmit(onSubmit)} className="space-y-6">
-                        {step === 1 && (
-                            <>
-                                <Input
-                                    label="Full name"
-                                    {...register('name')}
-                                    placeholder="John Doe"
-                                    error={errors.name?.message}
-                                    icon={<User className="h-5 w-5 icon-flat" />}
-                                />
-                                <Input
-                                    label="Email address"
-                                    {...register('email')}
-                                    type="email"
-                                    placeholder="you@example.com"
-                                    error={errors.email?.message}
-                                    icon={<Mail className="h-5 w-5 icon-flat" />}
-                                />
-                                <Input
-                                    label="Password"
-                                    {...register('password')}
-                                    type="password"
-                                    placeholder="••••••••"
-                                    error={errors.password?.message}
-                                    icon={<Lock className="h-5 w-5 icon-flat" />}
-                                />
-                                <Input
-                                    label="Confirm password"
-                                    {...register('confirmPassword')}
-                                    type="password"
-                                    placeholder="••••••••"
-                                    error={errors.confirmPassword?.message}
-                                    icon={<Lock className="h-5 w-5 icon-flat" />}
-                                />
-                                <Button
-                                    type="button"
-                                    variant="primary"
-                                    onClick={handleNext}
-                                    fullWidth
-                                >
-                                    Continue
-                                </Button>
-                            </>
-                        )}
-                        {step === 2 && (
-                            <>
-                                <OrganizationDetailsFields
-                                    register={register as never}
-                                    errors={errors as never}
-                                    organizationType={organizationType}
-                                    setValue={setValue as never}
-                                />
-                                {error && (
-                                    <div className="p-3 bg-red-950/30 border border-red-600/40 rounded-[var(--radius-md)]">
-                                        <p className="text-sm text-red-600">{error}</p>
-                                    </div>
-                                )}
-                                <div className="flex gap-3">
-                                    <Button
-                                        type="button"
-                                        variant="outline"
-                                        onClick={() => setStep(1)}
-                                    >
-                                        Back
-                                    </Button>
-                                    <Button
-                                        type="submit"
-                                        variant="primary"
-                                        isLoading={isLoading}
-                                        fullWidth
-                                    >
-                                        Start my free trial
-                                    </Button>
-                                </div>
-                            </>
-                        )}
-                    </form>
-                    <p className="mt-6 text-xs text-center text-text-muted">
-                        By signing up, you agree to our{' '}
-                        <Link href="/terms" className="text-primary hover:opacity-90">
-                            Terms of Service
-                        </Link>{' '}
-                        and{' '}
-                        <Link href="/privacy" className="text-primary hover:opacity-90">
-                            Privacy Policy
-                        </Link>
-                    </p>
-                </div>
-            </div>
-
-        </div>
-    );
-}
-
-
diff --git a/frontend/src/app/(dashboard)/appointments/page.tsx b/frontend/src/app/[locale]/(dashboard)/appointments/page.tsx
similarity index 85%
rename from frontend/src/app/(dashboard)/appointments/page.tsx
rename to frontend/src/app/[locale]/(dashboard)/appointments/page.tsx
index ef0152d..10207e0 100644
--- a/frontend/src/app/(dashboard)/appointments/page.tsx
+++ b/frontend/src/app/[locale]/(dashboard)/appointments/page.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useTranslations } from 'next-intl';
 import { appointmentsApi } from '@/lib/api/appointments';
 import { patientsApi } from '@/lib/api/patients';
 import { useAuth } from '@/lib/hooks/useAuth';
@@ -28,6 +29,8 @@ const EMPTY_PATIENT_FORM: CreatePatientInput = {
 };
 
 export default function AppointmentsPage() {
+  const t = useTranslations('appointments');
+  const tPatients = useTranslations('patients');
   const { currentOrganization } = useAuth();
   const [scheduleDate, setScheduleDate] = useState(() => startOfLocalDay(new Date()));
 
@@ -46,7 +49,7 @@ export default function AppointmentsPage() {
   const [patientForm, setPatientForm] = useState<CreatePatientInput>(EMPTY_PATIENT_FORM);
 
   const [bookingOpen, setBookingOpen] = useState(false);
-  const [bookingHour, setBookingHour] = useState(9);
+  const [bookingStartMinute, setBookingStartMinute] = useState(9 * 60);
   const [bookingProviderId, setBookingProviderId] = useState<string | null>(null);
   const [bookingProviderName, setBookingProviderName] = useState('');
   const [editingAppointmentId, setEditingAppointmentId] = useState<string | null>(null);
@@ -87,7 +90,7 @@ export default function AppointmentsPage() {
     try {
       const range = getLocalDayIsoRange(scheduleDate);
       const [pRes, aRes] = await Promise.all([
-        appointmentsApi.columnProviders(),
+        appointmentsApi.columnProviders(scheduleDate),
         appointmentsApi.list(range),
       ]);
       if (gen !== scheduleLoadGen.current) {
@@ -99,13 +102,13 @@ export default function AppointmentsPage() {
       if (gen !== scheduleLoadGen.current) {
         return;
       }
-      toast.showError(formatApiErrorMessage(err, 'Failed to load schedule.'));
+      toast.showError(formatApiErrorMessage(err, t('errorLoadSchedule')));
     } finally {
       if (gen === scheduleLoadGen.current) {
         setLoadingSchedule(false);
       }
     }
-  }, [currentOrganization?.id, scheduleDate]);
+  }, [currentOrganization?.id, scheduleDate, t]);
 
   useEffect(() => {
     void loadSchedule();
@@ -149,28 +152,33 @@ export default function AppointmentsPage() {
       setPatientForm(EMPTY_PATIENT_FORM);
       await loadPatientsSearch(search);
       setSelectedPatient(response.data);
-      toast.showSuccess(`Patient ${response.data.firstName} ${response.data.lastName} was saved.`);
+      toast.showSuccess(
+        t('successPatientSaved', {
+          firstName: response.data.firstName,
+          lastName: response.data.lastName,
+        }),
+      );
     } catch (err: unknown) {
       const message =
         err && typeof err === 'object' && 'message' in err
           ? String((err as { message: unknown }).message)
-          : 'Failed to save patient.';
+          : tPatients('errorSavePatient');
       toast.showError(message);
     } finally {
       setSavingPatient(false);
     }
   }
 
-  function handleSlotClick(hour: number, providerUserId: string, providerName: string) {
+  function handleSlotClick(startMinute: number, providerUserId: string, providerName: string) {
     if (isViewingPastDay) {
-      toast.showInfo('Past appointments are view-only.');
+      toast.showInfo(t('infoPastViewOnly'));
       return;
     }
     if (!selectedPatient) {
-      toast.showInfo('Select a patient before booking.');
+      toast.showInfo(t('infoSelectPatient'));
       return;
     }
-    setBookingHour(hour);
+    setBookingStartMinute(startMinute);
     setBookingProviderId(providerUserId);
     setBookingProviderName(providerName);
     setEditingAppointmentId(null);
@@ -179,17 +187,22 @@ export default function AppointmentsPage() {
 
   function handleAppointmentClick(appointment: AppointmentRecord) {
     if (isViewingPastDay) {
-      toast.showInfo('Past appointments are view-only.');
+      toast.showInfo(t('infoPastViewOnly'));
       return;
     }
     const provider = providers.find((p) => p.userId === appointment.providerUserId);
-    setBookingHour(new Date(appointment.startAt).getHours());
+    const start = new Date(appointment.startAt);
+    setBookingStartMinute(start.getHours() * 60 + start.getMinutes());
     setBookingProviderId(appointment.providerUserId);
     setBookingProviderName(provider?.name ?? bookingProviderName);
     setEditingAppointmentId(appointment.id);
     setBookingOpen(true);
   }
 
+  function handleAppointmentOutsideHours(appointment: AppointmentRecord) {
+    toast.showError(t('errorOutsideHours'));
+  }
+
   async function handleSaveAppointment(payload: {
     patientId: string;
     providerUserId: string;
@@ -207,15 +220,15 @@ export default function AppointmentsPage() {
       }
       setBookingOpen(false);
       setEditingAppointmentId(null);
-      toast.showSuccess(activeEditingAppointment ? 'Appointment updated.' : 'Appointment saved.');
+      toast.showSuccess(activeEditingAppointment ? t('successUpdated') : t('successSaved'));
       await loadSchedule();
     } catch (err: unknown) {
       const message =
         err && typeof err === 'object' && 'message' in err
           ? String((err as { message: unknown }).message)
           : activeEditingAppointment
-            ? 'Could not update appointment.'
-            : 'Could not save appointment.';
+            ? t('errorUpdate')
+            : t('errorSave');
       toast.showError(message);
     } finally {
       setSavingAppointment(false);
@@ -226,7 +239,7 @@ export default function AppointmentsPage() {
     if (!activeEditingAppointment) {
       return;
     }
-    if (!window.confirm('Remove this appointment?')) {
+    if (!window.confirm(t('confirmRemove'))) {
       return;
     }
     setDeletingAppointment(true);
@@ -235,13 +248,13 @@ export default function AppointmentsPage() {
       await appointmentsApi.remove(activeEditingAppointment.id);
       setBookingOpen(false);
       setEditingAppointmentId(null);
-      toast.showSuccess('Appointment removed.');
+      toast.showSuccess(t('successRemoved'));
       await loadSchedule();
     } catch (err: unknown) {
       const message =
         err && typeof err === 'object' && 'message' in err
           ? String((err as { message: unknown }).message)
-          : 'Could not delete appointment.';
+          : t('errorDelete');
       toast.showError(message);
     } finally {
       setDeletingAppointment(false);
@@ -251,10 +264,8 @@ export default function AppointmentsPage() {
   return (
     <div className="space-y-6">
       <div className="flex flex-col gap-1">
-        <h1 className="text-2xl font-semibold text-text-primary">Appointments</h1>
-        <p className="text-sm text-text-secondary">
-          Search a patient, pick a date, then click a time slot under a provider to book.
-        </p>
+        <h1 className="text-2xl font-semibold text-text-primary">{t('title')}</h1>
+        <p className="text-sm text-text-secondary">{t('subtitle')}</p>
       </div>
 
       <ToastStack {...toast.messages} />
@@ -289,7 +300,7 @@ export default function AppointmentsPage() {
               onChange={(d) => setScheduleDate(startOfLocalDay(d))}
             />
             {loadingSchedule && (
-              <p className="text-sm text-text-muted pb-2">Loading schedule…</p>
+              <p className="text-sm text-text-muted pb-2">{t('loadingSchedule')}</p>
             )}
           </div>
 
@@ -298,8 +309,9 @@ export default function AppointmentsPage() {
             providers={providers}
             appointments={appointments}
             canBook={canManageAppointments && !isViewingPastDay}
-            onSlotClick={(hour, uid, name) => handleSlotClick(hour, uid, name)}
+            onSlotClick={(startMinute, uid, name) => handleSlotClick(startMinute, uid, name)}
             onAppointmentClick={(apt) => handleAppointmentClick(apt)}
+            onAppointmentOutsideHours={(apt) => handleAppointmentOutsideHours(apt)}
           />
         </div>
       </div>
@@ -310,7 +322,7 @@ export default function AppointmentsPage() {
         patient={selectedPatient}
         providerUserId={bookingProviderId}
         providerName={bookingProviderName}
-        initialHour={bookingHour}
+        initialStartMinute={bookingStartMinute}
         editingAppointment={activeEditingAppointment}
         onClose={() => {
           setBookingOpen(false);
diff --git a/frontend/src/app/(dashboard)/billing/page.tsx b/frontend/src/app/[locale]/(dashboard)/billing/page.tsx
similarity index 100%
rename from frontend/src/app/(dashboard)/billing/page.tsx
rename to frontend/src/app/[locale]/(dashboard)/billing/page.tsx
diff --git a/frontend/src/app/(dashboard)/layout.tsx b/frontend/src/app/[locale]/(dashboard)/layout.tsx
similarity index 89%
rename from frontend/src/app/(dashboard)/layout.tsx
rename to frontend/src/app/[locale]/(dashboard)/layout.tsx
index 4c0978c..d3b4c39 100644
--- a/frontend/src/app/(dashboard)/layout.tsx
+++ b/frontend/src/app/[locale]/(dashboard)/layout.tsx
@@ -1,10 +1,11 @@
 'use client';
 
 import { memo, useEffect } from 'react';
-import { usePathname, useRouter } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+import { usePathname, useRouter } from '@/i18n/navigation';
 import { useAuth } from '@/lib/hooks/useAuth';
 import Sidebar from '@/components/ui/shared/Sidebar';
-import { ThemeToggle } from '@/components/ui/shared/ThemeToggle';
+import { TopBarControls } from '@/components/ui/shared/TopBarControls';
 import { DashboardAccountMenu } from '@/components/ui/dashboard/DashboardAccountMenu';
 import {
   canAccessAppointmentsSection,
@@ -14,11 +15,11 @@ import {
 } from '@/components/shared/permissions';
 
 export default function DashboardLayout({ children }: { children: React.ReactNode }) {
+  const t = useTranslations('common');
   const { user, currentOrganization, isAuthReady } = useAuth();
   const router = useRouter();
   const pathname = usePathname();
 
-  // ✅ AUTH GUARD (runs once per navigation group)
   useEffect(() => {
     if (!isAuthReady) return;
 
@@ -44,11 +45,10 @@ export default function DashboardLayout({ children }: { children: React.ReactNod
     }
   }, [isAuthReady, user, currentOrganization, router, pathname]);
 
-  // ✅ LOADING ONLY FOR INITIAL LOAD
   if (!isAuthReady) {
     return (
       <div className="h-screen flex items-center justify-center app-web-bg">
-        Loading app...
+        {t('loadingApp')}
       </div>
     );
   }
@@ -56,7 +56,7 @@ export default function DashboardLayout({ children }: { children: React.ReactNod
   if (!user || !currentOrganization) {
     return (
       <div className="h-screen flex items-center justify-center app-web-bg">
-        Loading workspace...
+        {t('loadingWorkspace')}
       </div>
     );
   }
@@ -88,9 +88,9 @@ const DashboardHeader = memo(function DashboardHeader({
       <h2 className="text-lg font-medium truncate min-w-0">{organizationName}</h2>
 
       <div className="flex items-center gap-3 shrink-0">
-        <ThemeToggle />
+        <TopBarControls />
         <DashboardAccountMenu />
       </div>
     </header>
   );
-});
\ No newline at end of file
+});
diff --git a/frontend/src/app/(dashboard)/organizations/page.tsx b/frontend/src/app/[locale]/(dashboard)/organizations/page.tsx
similarity index 84%
rename from frontend/src/app/(dashboard)/organizations/page.tsx
rename to frontend/src/app/[locale]/(dashboard)/organizations/page.tsx
index df889a0..c0ffcfc 100644
--- a/frontend/src/app/(dashboard)/organizations/page.tsx
+++ b/frontend/src/app/[locale]/(dashboard)/organizations/page.tsx
@@ -1,6 +1,7 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
+import { useTranslations } from 'next-intl';
 import { useToast } from '@/lib/hooks/useToast';
 import { Check, Trash2, UserPlus, X } from 'lucide-react';
 import { useAuth } from '@/lib/hooks/useAuth';
@@ -29,32 +30,6 @@ function formatOrganizationStatusLabel(status: string): string {
   return lower.charAt(0).toUpperCase() + lower.slice(1);
 }
 
-function formatConnectionStatusLabel(
-  row: CounterpartItemDto,
-  currentOrganizationId: string,
-): string {
-  if (row.status === 'PENDING') {
-    if (
-      row.pendingInvitationId &&
-      row.requestedByOrganizationId === currentOrganizationId
-    ) {
-      return 'Invitation pending';
-    }
-    return 'Connection request pending';
-  }
-  if (row.status === 'ACTIVE') return 'Connected';
-  if (row.status === 'REJECTED') return 'Connection request declined';
-  return formatOrganizationStatusLabel(row.status);
-}
-
-function formatApiMessage(err: unknown): string {
-  if (!err || typeof err !== 'object') return 'Something went wrong';
-  const m = (err as ApiError).message;
-  if (Array.isArray(m)) return m.join(', ');
-  if (typeof m === 'string') return m;
-  return 'Something went wrong';
-}
-
 function formatTableDate(value: string): string {
   const d = new Date(value);
   if (Number.isNaN(d.getTime())) return '\u2014';
@@ -64,10 +39,42 @@ function formatTableDate(value: string): string {
 type TableMode = 'existing' | 'search';
 
 export default function OrganizationsPage() {
+  const t = useTranslations('organizations');
+  const tNav = useTranslations('nav');
+  const tCommon = useTranslations('common');
   const { currentOrganization } = useAuth();
   const [loading, setLoading] = useState(true);
   const toast = useToast();
 
+  const formatApiMessage = useCallback(
+    (err: unknown): string => {
+      if (!err || typeof err !== 'object') return tCommon('errorGeneric');
+      const m = (err as ApiError).message;
+      if (Array.isArray(m)) return m.join(', ');
+      if (typeof m === 'string') return m;
+      return tCommon('errorGeneric');
+    },
+    [tCommon],
+  );
+
+  const formatConnectionStatusLabel = useCallback(
+    (row: CounterpartItemDto, currentOrganizationId: string): string => {
+      if (row.status === 'PENDING') {
+        if (
+          row.pendingInvitationId &&
+          row.requestedByOrganizationId === currentOrganizationId
+        ) {
+          return t('statusInvitationPending');
+        }
+        return t('statusConnectionPending');
+      }
+      if (row.status === 'ACTIVE') return t('statusConnected');
+      if (row.status === 'REJECTED') return t('statusDeclined');
+      return formatOrganizationStatusLabel(row.status);
+    },
+    [t],
+  );
+
   const [query, setQuery] = useState('');
   const [mode, setMode] = useState<TableMode>('existing');
   const [searching, setSearching] = useState(false);
@@ -92,8 +99,9 @@ export default function OrganizationsPage() {
     pruneAcceptedLinks,
   } = useOrganizationInviteLinkCopy(currentOrganization?.id);
 
-  const counterpartLabel = currentOrganization?.type === 'LAB' ? 'Clinic' : 'Lab';
-  const tabLabel = currentOrganization?.type === 'LAB' ? 'Clinics' : 'Labs';
+  const counterpart =
+    currentOrganization?.type === 'LAB' ? t('counterpartClinic') : t('counterpartLab');
+  const tabLabel = currentOrganization?.type === 'LAB' ? tNav('clinics') : tNav('labs');
 
   const existingRows = items;
 
@@ -143,7 +151,7 @@ export default function OrganizationsPage() {
     toast.setError('');
     try {
       await organizationApi.createConnectionRequest(targetOrganizationId);
-      toast.showSuccess(`${counterpartLabel} connection request sent.`);
+      toast.showSuccess(t('successConnectionSent', { counterpart }));
       setSearchResults([]);
       setQuery('');
       setMode('existing');
@@ -164,7 +172,7 @@ export default function OrganizationsPage() {
         ownerEmail: manualOwnerEmail.trim(),
       });
       storeInviteLink(res.data.invitationId, manualOwnerEmail, res.data.invitationUrl);
-      toast.showSuccess(`Invitation link created for ${manualOwnerEmail.trim()}`);
+      toast.showSuccess(t('successInviteCreated', { email: manualOwnerEmail.trim() }));
       setManualOrganizationName('');
       setManualOwnerEmail('');
       setShowInviteForm(false);
@@ -207,7 +215,7 @@ export default function OrganizationsPage() {
           await loadInvitationHistory();
         },
       });
-      toast.showSuccess('Invitation link copied to clipboard.');
+      toast.showSuccess(t('successLinkCopied'));
     } catch (e) {
       toast.showError(formatApiMessage(e));
     }
@@ -233,7 +241,7 @@ export default function OrganizationsPage() {
           },
         },
       );
-      toast.showSuccess('Invitation link copied to clipboard.');
+      toast.showSuccess(t('successLinkCopied'));
     } catch (e) {
       toast.showError(formatApiMessage(e));
     }
@@ -245,7 +253,7 @@ export default function OrganizationsPage() {
     try {
       await organizationApi.respondToConnectionRequest(connectionId, action);
       toast.showSuccess(
-        action === 'ACCEPT' ? 'Connection request accepted.' : 'Connection request declined.',
+        action === 'ACCEPT' ? t('successAccepted') : t('successDeclined'),
       );
       notifyPendingConnectionsChanged();
       await loadList();
@@ -261,7 +269,7 @@ export default function OrganizationsPage() {
     toast.setError('');
     try {
       await organizationApi.deleteConnection(connectionId);
-      toast.showSuccess('Connection removed.');
+      toast.showSuccess(t('successRemoved'));
       await loadList();
     } catch (e) {
       toast.showError(formatApiMessage(e));
@@ -278,7 +286,7 @@ export default function OrganizationsPage() {
   }
 
   if (!currentOrganization) {
-    return <p className="text-sm text-text-secondary">Loading organization...</p>;
+    return <p className="text-sm text-text-secondary">{t('loadingOrganization')}</p>;
   }
 
   return (
@@ -286,13 +294,10 @@ export default function OrganizationsPage() {
       <div className="flex flex-col gap-1 sm:flex-row sm:items-start sm:justify-between">
         <div>
           <h1 className="text-2xl font-semibold text-text-primary">{tabLabel}</h1>
-          <p className="text-sm text-text-secondary mt-1">
-            Search organizations, send connection requests to existing accounts, or invitation
-            links when they are not on DyoLink yet.
-          </p>
+          <p className="text-sm text-text-secondary mt-1">{t('subtitle')}</p>
         </div>
         <Button type="button" size="sm" onClick={() => void openInvitationHistory()}>
-          Invitation History
+          {t('invitationHistory')}
         </Button>
       </div>
 
@@ -302,7 +307,7 @@ export default function OrganizationsPage() {
         value={query}
         onChange={setQuery}
         onSubmit={() => void runSearch()}
-        placeholder={`Search ${counterpartLabel.toLowerCase()} by name, email, or phone...`}
+        placeholder={t('searchPlaceholder', { counterpart: counterpart.toLowerCase() })}
         actions={
           <>
             <button
@@ -311,7 +316,7 @@ export default function OrganizationsPage() {
               disabled={searching}
               className="px-4 py-2 rounded-[var(--radius-sm)] text-sm font-medium border bg-primary-soft text-primary border-primary/50 disabled:opacity-60"
             >
-              Search
+              {tCommon('search')}
             </button>
             {mode === 'search' && (
               <button
@@ -319,7 +324,7 @@ export default function OrganizationsPage() {
                 onClick={clearSearchView}
                 className="px-4 py-2 rounded-[var(--radius-sm)] text-sm font-medium border text-text-secondary border-border/40 hover:bg-background-card/70 hover:border-border"
               >
-                Back to list
+                {t('backToList')}
               </button>
             )}
           </>
@@ -330,19 +335,19 @@ export default function OrganizationsPage() {
         headers={
             <tr>
               <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
-                Organization
+                {t('tableOrganization')}
               </th>
               <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
-                Owner email
+                {t('tableOwnerEmail')}
               </th>
               <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
-                Date
+                {t('tableDate')}
               </th>
               <th className="px-6 py-3 text-center text-xs font-medium text-text-muted uppercase tracking-wider">
-                Status
+                {t('tableStatus')}
               </th>
               <th className="px-6 py-3 text-right text-xs font-medium text-text-muted uppercase tracking-wider">
-                Action
+                {t('tableAction')}
               </th>
             </tr>
         }
@@ -351,14 +356,14 @@ export default function OrganizationsPage() {
             {loading ? (
               <tr>
                 <td colSpan={5} className="px-6 py-8 text-sm text-text-secondary">
-                  Loading...
+                  {tCommon('loadingEllipsis')}
                 </td>
               </tr>
             ) : mode === 'existing' ? (
               existingRows.length === 0 ? (
                 <tr>
                   <td colSpan={5} className="px-6 py-8 text-sm text-text-secondary">
-                    No connections yet. Search to send a connection request or an invitation link.
+                    {t('emptyConnections')}
                   </td>
                 </tr>
               ) : (
@@ -403,8 +408,8 @@ export default function OrganizationsPage() {
                                 className="p-2 rounded-md text-text-secondary hover:bg-background-card/80 hover:text-text-primary disabled:text-text-muted disabled:opacity-50"
                                 disabled={pendingConnectionRowId !== null && pendingConnectionRowId !== row.id}
                                 onClick={() => void respondToPendingConnection(row.id, 'ACCEPT')}
-                                aria-label="Accept connection request"
-                                title="Accept connection request"
+                                aria-label={t('acceptRequest')}
+                                title={t('acceptRequest')}
                               >
                                 <Check className="w-4 h-4" />
                               </button>
@@ -413,8 +418,8 @@ export default function OrganizationsPage() {
                                 className="p-2 rounded-md text-text-secondary hover:bg-red-500/15 hover:text-red-600 disabled:text-text-muted disabled:opacity-50"
                                 disabled={pendingConnectionRowId !== null && pendingConnectionRowId !== row.id}
                                 onClick={() => void respondToPendingConnection(row.id, 'REJECT')}
-                                aria-label="Decline connection request"
-                                title="Decline connection request"
+                                aria-label={t('declineRequest')}
+                                title={t('declineRequest')}
                               >
                                 <X className="w-4 h-4" />
                               </button>
@@ -426,8 +431,8 @@ export default function OrganizationsPage() {
                               className="p-2 rounded-md text-text-secondary hover:bg-red-500/15 hover:text-red-600 disabled:text-text-muted disabled:opacity-50"
                               disabled={deleteConnectionRowId !== null && deleteConnectionRowId !== row.id}
                               onClick={() => void deleteConnection(row.id)}
-                              aria-label="Remove connection"
-                              title="Remove connection"
+                              aria-label={t('removeConnection')}
+                              title={t('removeConnection')}
                             >
                               <Trash2 className="w-4 h-4" />
                             </button>
@@ -443,9 +448,9 @@ export default function OrganizationsPage() {
                 <tr key={r.id} className="hover:bg-background-secondary/45">
                   <td className="px-6 py-1.5 text-sm font-medium text-text-primary">{r.name}</td>
                   <td className="px-6 py-1.5 text-sm text-text-secondary">{r.owner.email}</td>
-                  <td className="px-6 py-1.5 text-sm text-text-secondary">Today</td>
+                  <td className="px-6 py-1.5 text-sm text-text-secondary">{t('statusToday')}</td>
                   <td className="px-6 py-1.5 text-center align-middle">
-                    <Badge variant="default" fixedWidth={false}>Found</Badge>
+                    <Badge variant="default" fixedWidth={false}>{t('statusFound')}</Badge>
                   </td>
                   <td className="px-6 py-1.5 text-right">
                     <button
@@ -455,8 +460,8 @@ export default function OrganizationsPage() {
                         pendingConnectionRowId !== null && pendingConnectionRowId !== r.id
                       }
                       onClick={() => void submitConnectionRequest(r.id)}
-                      aria-label="Send connection request"
-                      title="Send connection request"
+                      aria-label={t('sendRequest')}
+                      title={t('sendRequest')}
                     >
                       <UserPlus className="w-4 h-4" />
                     </button>
@@ -468,22 +473,22 @@ export default function OrganizationsPage() {
                 <td colSpan={5} className="px-6 py-6">
                   <div className="flex flex-col gap-3">
                     <p className="text-sm text-text-secondary">
-                      No organization found in directory search.
+                      {t('noDirectoryResults')}
                     </p>
                     <div className="flex flex-wrap items-center gap-2">
                       <Button type="button" onClick={() => setShowInviteForm((v) => !v)}>
-                        {showInviteForm ? 'Hide invitation fields' : 'Send invitation link'}
+                        {showInviteForm ? t('hideInvitationFields') : t('sendInvitationLink')}
                       </Button>
                     </div>
                     {showInviteForm && (
                       <div className="grid gap-3 sm:grid-cols-3 mt-1">
                         <Input
-                          label={`${counterpartLabel} name`}
+                          label={t('counterpartNameLabel', { counterpart })}
                           value={manualOrganizationName}
                           onChange={(e) => setManualOrganizationName(e.target.value)}
                         />
                         <Input
-                          label="Owner email"
+                          label={t('ownerEmailLabel')}
                           type="email"
                           value={manualOwnerEmail}
                           onChange={(e) => setManualOwnerEmail(e.target.value)}
@@ -496,7 +501,7 @@ export default function OrganizationsPage() {
                             onClick={() => void sendInvite()}
                             className="w-full"
                           >
-                            Send invitation
+                            {t('sendInvitation')}
                           </Button>
                         </div>
                       </div>
diff --git a/frontend/src/app/[locale]/(dashboard)/patients/page.tsx b/frontend/src/app/[locale]/(dashboard)/patients/page.tsx
new file mode 100644
index 0000000..61a5f21
--- /dev/null
+++ b/frontend/src/app/[locale]/(dashboard)/patients/page.tsx
@@ -0,0 +1,151 @@
+'use client';

+

+import { useEffect, useMemo, useState } from 'react';

+import { useTranslations } from 'next-intl';

+import { Button } from '@/components/ui/shared/Button';

+import { ToastStack } from '@/components/ui/shared/Toast';

+import { patientsApi } from '@/lib/api/patients';

+import { formatApiErrorMessage } from '@/components/shared/formatApiError';

+import { useAuth } from '@/lib/hooks/useAuth';

+import { useToast } from '@/lib/hooks/useToast';

+import { hasPermission } from '@/components/shared/permissions';

+import { CreatePatientInput, Patient } from '@/types/patient';

+import { PatientSearchSelect } from '@/components/ui/patient/PatientSearchSelect';

+import { CreatePatientModal } from '@/components/ui/patient/CreatePatientModal';

+import { PatientSummaryCard } from '@/components/ui/patient/PatientSummaryCard';

+

+const EMPTY_PATIENT_FORM: CreatePatientInput = {

+  firstName: '',

+  lastName: '',

+  phone: '',

+  email: '',

+};

+

+export default function PatientsPage() {

+  const t = useTranslations('patients');

+  const tCommon = useTranslations('common');

+  const { currentOrganization } = useAuth();

+  const toast = useToast();

+  const [search, setSearch] = useState('');

+  const [patients, setPatients] = useState<Patient[]>([]);

+  const [selectedPatient, setSelectedPatient] = useState<Patient | undefined>();

+  const [loadingPatients, setLoadingPatients] = useState(false);

+  const [isCreateOpen, setIsCreateOpen] = useState(false);

+  const [savingPatient, setSavingPatient] = useState(false);

+  const [patientForm, setPatientForm] = useState<CreatePatientInput>(EMPTY_PATIENT_FORM);

+  const canEditPatients = hasPermission(currentOrganization, 'TAB_PATIENTS_EDIT');

+

+  const sortedPatients = useMemo(

+    () =>

+      [...patients].sort((a, b) =>

+        `${a.firstName} ${a.lastName}`.localeCompare(`${b.firstName} ${b.lastName}`),

+      ),

+    [patients],

+  );

+

+  useEffect(() => {

+    const timeout = setTimeout(() => {

+      void loadPatients(search);

+    }, 300);

+    return () => clearTimeout(timeout);

+  }, [search]);

+

+  useEffect(() => {

+    void loadPatients('');

+  }, []);

+

+  async function loadPatients(q: string) {

+    setLoadingPatients(true);

+    toast.setError('');

+    try {

+      const response = await patientsApi.list({ q, page: 1, limit: 25 });

+      const items = response.data.items;

+      setPatients(items);

+

+      if (selectedPatient) {

+        const freshSelected = items.find((item) => item.id === selectedPatient.id);

+        setSelectedPatient(freshSelected);

+      }

+    } catch (error: unknown) {

+      toast.showError(formatApiErrorMessage(error, t('errorLoadPatients')));

+    } finally {

+      setLoadingPatients(false);

+    }

+  }

+

+  async function handleCreatePatient() {

+    setSavingPatient(true);

+    toast.setError('');

+    try {

+      const response = await patientsApi.create(patientForm);

+      setIsCreateOpen(false);

+      setPatientForm(EMPTY_PATIENT_FORM);

+      await loadPatients(search);

+      setSelectedPatient(response.data);

+      toast.showSuccess(

+        t('successPatientSaved', {

+          firstName: response.data.firstName,

+          lastName: response.data.lastName,

+        }),

+      );

+    } catch (error: unknown) {

+      toast.showError(formatApiErrorMessage(error, t('errorSavePatient')));

+    } finally {

+      setSavingPatient(false);

+    }

+  }

+

+  return (

+    <div className="space-y-6">

+      <div className="flex items-center justify-between gap-3">

+        <h1 className="text-2xl font-semibold text-text-primary">{t('title')}</h1>

+        <Button

+          variant="primary"

+          disabled={!canEditPatients}

+          onClick={() => {

+            if (!canEditPatients) return;

+            toast.clear();

+            setPatientForm(EMPTY_PATIENT_FORM);

+            setIsCreateOpen(true);

+          }}

+          title={!canEditPatients ? tCommon('readOnlyAccess') : undefined}

+        >

+          {t('newPatient')}

+        </Button>

+      </div>

+

+      <ToastStack {...toast.messages} />

+

+      {isCreateOpen && (

+        <CreatePatientModal

+          isOpen={isCreateOpen}

+          formData={patientForm}

+          onChange={(patch) => setPatientForm((prev) => ({ ...prev, ...patch }))}

+          onSubmit={() => void handleCreatePatient()}

+          onClose={() => {

+            setIsCreateOpen(false);

+            setPatientForm(EMPTY_PATIENT_FORM);

+          }}

+          loading={savingPatient}

+        />

+      )}

+

+      <div className="grid grid-cols-1 xl:grid-cols-3 gap-6">

+        <div className="xl:col-span-1">

+          <PatientSearchSelect

+            search={search}

+            onSearchChange={setSearch}

+            patients={sortedPatients}

+            selectedPatientId={selectedPatient?.id}

+            onSelectPatient={setSelectedPatient}

+            loading={loadingPatients}

+          />

+        </div>

+

+        <div className="xl:col-span-2 space-y-4">

+          <PatientSummaryCard patient={selectedPatient} />

+        </div>

+      </div>

+    </div>

+  );

+}

diff --git a/frontend/src/app/(dashboard)/reports/page.tsx b/frontend/src/app/[locale]/(dashboard)/reports/page.tsx
similarity index 100%
rename from frontend/src/app/(dashboard)/reports/page.tsx
rename to frontend/src/app/[locale]/(dashboard)/reports/page.tsx
diff --git a/frontend/src/app/(dashboard)/settings/account/page.tsx b/frontend/src/app/[locale]/(dashboard)/settings/account/page.tsx
similarity index 50%
rename from frontend/src/app/(dashboard)/settings/account/page.tsx
rename to frontend/src/app/[locale]/(dashboard)/settings/account/page.tsx
index 357f4f9..e52411a 100644
--- a/frontend/src/app/(dashboard)/settings/account/page.tsx
+++ b/frontend/src/app/[locale]/(dashboard)/settings/account/page.tsx
@@ -1,8 +1,12 @@
 'use client';
 
-import Link from 'next/link';
+import { useTranslations } from 'next-intl';
+import { Link } from '@/i18n/navigation';
 
 export default function AccountSettingsPage() {
+  const t = useTranslations('settings');
+  const tCommon = useTranslations('common');
+
   return (
     <div className="space-y-6">
       <div>
@@ -10,19 +14,14 @@ export default function AccountSettingsPage() {
           href="/today"
           className="text-sm text-primary hover:opacity-90"
         >
-          ← Back to app
+          {tCommon('backToApp')}
         </Link>
-        <h1 className="text-2xl font-semibold text-text-primary mt-4">Account</h1>
-        <p className="text-text-secondary text-sm mt-2">
-          Profile and security settings for your login.
-        </p>
+        <h1 className="text-2xl font-semibold text-text-primary mt-4">{t('accountTitle')}</h1>
+        <p className="text-text-secondary text-sm mt-2">{t('accountSubtitle')}</p>
       </div>
 
       <div className="surface-card p-6 space-y-3">
-        <p className="text-sm text-text-secondary">
-          Password change and profile editing will be wired here next (e.g. invite
-          flow, reset password).
-        </p>
+        <p className="text-sm text-text-secondary">{t('accountPlaceholder')}</p>
       </div>
     </div>
   );
diff --git a/frontend/src/app/(dashboard)/settings/organizations/page.tsx b/frontend/src/app/[locale]/(dashboard)/settings/organizations/page.tsx
similarity index 72%
rename from frontend/src/app/(dashboard)/settings/organizations/page.tsx
rename to frontend/src/app/[locale]/(dashboard)/settings/organizations/page.tsx
index ccbdb3b..7ad39d8 100644
--- a/frontend/src/app/(dashboard)/settings/organizations/page.tsx
+++ b/frontend/src/app/[locale]/(dashboard)/settings/organizations/page.tsx
@@ -1,9 +1,12 @@
 'use client';
 
-import Link from 'next/link';
+import { useTranslations } from 'next-intl';
+import { Link } from '@/i18n/navigation';
 import { OrganizationSelectorContent } from '@/components/ui/organizations/OrganizationSelectorContent';
 
 export default function DashboardOrganizationsSettingsPage() {
+  const tCommon = useTranslations('common');
+
   return (
     <div className="space-y-6">
       <div>
@@ -11,7 +14,7 @@ export default function DashboardOrganizationsSettingsPage() {
           href="/today"
           className="text-sm text-primary hover:opacity-90"
         >
-          ← Back to app
+          {tCommon('backToApp')}
         </Link>
       </div>
       <OrganizationSelectorContent />
diff --git a/frontend/src/app/(dashboard)/settings/subscriptions/page.tsx b/frontend/src/app/[locale]/(dashboard)/settings/subscriptions/page.tsx
similarity index 71%
rename from frontend/src/app/(dashboard)/settings/subscriptions/page.tsx
rename to frontend/src/app/[locale]/(dashboard)/settings/subscriptions/page.tsx
index 7116c8c..01836c4 100644
--- a/frontend/src/app/(dashboard)/settings/subscriptions/page.tsx
+++ b/frontend/src/app/[locale]/(dashboard)/settings/subscriptions/page.tsx
@@ -1,8 +1,8 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import Link from 'next/link';
-import { useRouter } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+import { Link, useRouter } from '@/i18n/navigation';
 import { useAuth } from '@/lib/hooks/useAuth';
 import { authApi } from '@/lib/api/auth';
 import { Button } from '@/components/ui/shared/Button';
@@ -10,14 +10,16 @@ import { Toast } from '@/components/ui/shared/Toast';
 import type { SubscriptionAlertData } from '@/types/subscription';
 
 const PLAN_OPTIONS = [
-  { id: 'solo', name: 'Solo', maxUsers: 1, price: 19 },
-  { id: 'small', name: 'Small', maxUsers: 5, price: 49 },
-  { id: 'medium', name: 'Medium', maxUsers: 10, price: 89 },
-  { id: 'large', name: 'Large', maxUsers: 15, price: 129 },
-  { id: 'enterprise', name: 'Enterprise', maxUsers: null, price: 199 },
+  { id: 'solo', nameKey: 'planSolo' as const, maxUsers: 1, price: 19 },
+  { id: 'small', nameKey: 'planSmall' as const, maxUsers: 5, price: 49 },
+  { id: 'medium', nameKey: 'planMedium' as const, maxUsers: 10, price: 89 },
+  { id: 'large', nameKey: 'planLarge' as const, maxUsers: 15, price: 129 },
+  { id: 'enterprise', nameKey: 'planEnterprise' as const, maxUsers: null, price: 199 },
 ] as const;
 
 export default function SubscriptionsSettingsPage() {
+  const t = useTranslations('settings');
+  const tCommon = useTranslations('common');
   const { currentOrganization } = useAuth();
   const router = useRouter();
   const [alert, setAlert] = useState<SubscriptionAlertData | null>(null);
@@ -39,13 +41,13 @@ export default function SubscriptionsSettingsPage() {
 
   if (!currentOrganization) {
     return (
-      <p className="text-text-secondary text-sm">Loading...</p>
+      <p className="text-text-secondary text-sm">{tCommon('loadingEllipsis')}</p>
     );
   }
 
   if (!currentOrganization.isOwner) {
     return (
-      <p className="text-text-secondary text-sm">Redirecting...</p>
+      <p className="text-text-secondary text-sm">{tCommon('redirecting')}</p>
     );
   }
 
@@ -76,55 +78,51 @@ export default function SubscriptionsSettingsPage() {
           href="/today"
           className="text-sm text-primary hover:opacity-90"
         >
-          ← Back to app
+          {tCommon('backToApp')}
         </Link>
-        <h1 className="text-2xl font-semibold text-text-primary mt-4">Subscriptions</h1>
+        <h1 className="text-2xl font-semibold text-text-primary mt-4">{t('subscriptionsTitle')}</h1>
         <p className="text-text-secondary text-sm mt-2">
-          Your DyoLink workspace plan and seats for{' '}
-          <span className="text-text-primary font-medium">{currentOrganization.name}</span>.
-          Clinic and lab income tracking stays under the sidebar{' '}
-          <span className="text-text-primary">Billing</span> tab.
+          {t('subscriptionsSubtitle', { orgName: currentOrganization.name })}
         </p>
       </div>
 
       <div className="surface-card p-6 space-y-4">
         {!hasActiveSubscription && (
           <div className="rounded-[var(--radius-md)] border border-amber-500/30 bg-amber-500/10 p-4">
-            <p className="text-sm text-amber-200">
-              This organization has no active subscription. Select a plan below to start
-              the purchase process.
-            </p>
+            <p className="text-sm text-amber-200">{t('noSubscriptionNotice')}</p>
           </div>
         )}
 
         <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-5">
           <div>
-            <p className="text-xs text-text-muted uppercase tracking-wide">Current plan</p>
+            <p className="text-xs text-text-muted uppercase tracking-wide">{t('currentPlan')}</p>
             <p className="text-lg font-medium text-text-primary capitalize">
               {plan?.name ?? '—'}
             </p>
           </div>
           <div>
-            <p className="text-xs text-text-muted uppercase tracking-wide">Plan price</p>
+            <p className="text-xs text-text-muted uppercase tracking-wide">{t('planPrice')}</p>
             <p className="text-lg font-medium text-text-primary">
               {typeof plan?.price === 'number' ? `$${plan.price}` : '—'}
             </p>
           </div>
           <div>
-            <p className="text-xs text-text-muted uppercase tracking-wide">Seats used</p>
+            <p className="text-xs text-text-muted uppercase tracking-wide">{t('seatsUsed')}</p>
             <p className="text-lg font-medium text-text-primary">
               {typeof seatsUsed === 'number' ? seatsUsed : '—'}
-              {typeof maxUsers === 'number' ? ` / ${isUnlimited ? 'Unlimited' : maxUsers}` : ''}
+              {typeof maxUsers === 'number'
+                ? ` / ${isUnlimited ? t('unlimited') : maxUsers}`
+                : ''}
             </p>
           </div>
           <div>
-            <p className="text-xs text-text-muted uppercase tracking-wide">Seats remaining</p>
+            <p className="text-xs text-text-muted uppercase tracking-wide">{t('seatsRemaining')}</p>
             <p className="text-lg font-medium text-text-primary">
-              {isUnlimited ? 'Unlimited' : seatsRemaining ?? '—'}
+              {isUnlimited ? t('unlimited') : seatsRemaining ?? '—'}
             </p>
           </div>
           <div>
-            <p className="text-xs text-text-muted uppercase tracking-wide">Days remaining</p>
+            <p className="text-xs text-text-muted uppercase tracking-wide">{t('daysRemaining')}</p>
             <p className={`text-lg font-medium ${planDayTone}`}>
               {daysUntilPlanEnd ?? '—'}
             </p>
@@ -134,27 +132,24 @@ export default function SubscriptionsSettingsPage() {
         {alert?.showWarning && (
           <div className="text-sm text-text-secondary space-y-1">
             {alert.noActiveSubscription && (
-              <p>No active subscription for this organization.</p>
+              <p>{t('noActiveSubscription')}</p>
             )}
             {alert.trialExpired && (
-              <p>Trial period has ended. Choose a plan when checkout is available.</p>
+              <p>{t('trialEnded')}</p>
             )}
             {!alert.trialExpired && alert.trialEndingSoon && (
               <p>
-                Trial ends in {alert.daysUntilTrialEnd ?? '—'} day(s).
+                {t('trialEndsIn', { days: alert.daysUntilTrialEnd ?? '—' })}
               </p>
             )}
             {!alert.trialExpired && !alert.trialEndingSoon && alert.seatsLow && (
-              <p>Seat usage is high for this organization.</p>
+              <p>{t('seatsLow')}</p>
             )}
           </div>
         )}
 
         <div className="space-y-3 pt-2">
-          <p className="text-sm text-text-secondary">
-            Choose a plan to continue. Purchase integration is not active yet, so this
-            currently prepares the selection step only.
-          </p>
+          <p className="text-sm text-text-secondary">{t('choosePlanIntro')}</p>
           <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
             {PLAN_OPTIONS.map((option) => {
               const selected = selectedPlanId === option.id;
@@ -169,11 +164,15 @@ export default function SubscriptionsSettingsPage() {
                       : 'border-border hover:border-border-strong'
                   }`}
                 >
-                  <p className="text-base font-medium text-text-primary">{option.name}</p>
+                  <p className="text-base font-medium text-text-primary">{t(option.nameKey)}</p>
                   <p className="text-sm text-text-secondary mt-1">
-                    {option.maxUsers == null ? 'Unlimited seats' : `${option.maxUsers} seats`}
+                    {option.maxUsers == null
+                      ? t('unlimitedSeats')
+                      : t('seatsCount', { n: option.maxUsers })}
+                  </p>
+                  <p className="text-sm text-text-secondary mt-1">
+                    {t('pricePerMonth', { price: option.price })}
                   </p>
-                  <p className="text-sm text-text-secondary mt-1">${option.price} / month</p>
                 </button>
               );
             })}
@@ -182,13 +181,13 @@ export default function SubscriptionsSettingsPage() {
             type="button"
             variant="primary"
             onClick={() => {
-              const selectedPlanLabel = selectedPlan?.name ?? 'the selected plan';
-              setPurchaseNotice(
-                `Purchase flow will be enabled soon. ${selectedPlanLabel} is selected and ready for checkout setup.`,
-              );
+              const selectedPlanLabel = selectedPlan
+                ? t(selectedPlan.nameKey)
+                : t('planSolo');
+              setPurchaseNotice(t('purchaseNotice', { plan: selectedPlanLabel }));
             }}
           >
-            Start purchase process
+            {t('startPurchase')}
           </Button>
         </div>
       </div>
diff --git a/frontend/src/app/(dashboard)/staff/page.tsx b/frontend/src/app/[locale]/(dashboard)/staff/page.tsx
similarity index 64%
rename from frontend/src/app/(dashboard)/staff/page.tsx
rename to frontend/src/app/[locale]/(dashboard)/staff/page.tsx
index 0f8eb87..73a0171 100644
--- a/frontend/src/app/(dashboard)/staff/page.tsx
+++ b/frontend/src/app/[locale]/(dashboard)/staff/page.tsx
@@ -1,7 +1,8 @@
 'use client';
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { useRouter } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+import { useRouter } from '@/i18n/navigation';
 import {
   firstAccessibleDashboardPath,
   canEditStaff,
@@ -12,10 +13,18 @@ import {
   permissionNamesFromFeatureState,
   emptyFeaturePermissionState,
   featureStateFromPermissionNames,
+  featureStateHasTreatmentEdit,
   resolveStaffFeatureLabel,
   formatAccessSummary,
   type FeaturePermState,
-} from '../../../components/staff/staff-permission-form';
+} from '@/components/staff/staff-permission-form';
+import {
+  StaffWorkingHoursStep,
+  createDefaultWorkingHoursState,
+  workingHoursPayloadFromState,
+  workingHoursStateFromApi,
+} from '@/components/staff/StaffWorkingHoursStep';
+import { validateEditorDays, type WorkingHoursEditorDay } from '@/components/staff/workingHours';
 import { Pencil, Trash2, Copy, Check, X, UserX, UserCheck } from 'lucide-react';
 import { DialogCloseButton } from '@/components/ui/shared/DialogCloseButton';
 import { useAuth } from '@/lib/hooks/useAuth';
@@ -82,6 +91,9 @@ function PermissionGrid({
   disabled?: boolean;
   organizationType?: 'CLINIC' | 'LAB';
 }) {
+  const t = useTranslations('staff');
+  const tFeatures = useTranslations('staff.features');
+
   const setRead = (editKey: string, read: boolean) => {
     const cur = state[editKey] ?? { read: false, edit: false };
     onChange({
@@ -108,19 +120,19 @@ function PermissionGrid({
             className="flex flex-col gap-3 rounded-[var(--radius-md)] border border-border/60 bg-background-card/50 px-3 py-3"
           >
             <span className="text-sm font-medium text-text-primary">
-              {resolveStaffFeatureLabel(g, organizationType)}
+              {resolveStaffFeatureLabel(g, organizationType, tFeatures)}
             </span>
             <div className="flex flex-col gap-2.5 pl-0.5">
               <Checkbox
                 checked={cell.read}
                 disabled={disabled}
-                label="View"
+                label={t('permissionView')}
                 onChange={(v) => setRead(g.edit, v)}
               />
               <Checkbox
                 checked={cell.edit}
                 disabled={disabled}
-                label="Edit"
+                label={t('permissionEdit')}
                 onChange={(v) => setEdit(g.edit, v)}
               />
             </div>
@@ -133,6 +145,10 @@ function PermissionGrid({
 
 export default function StaffPage() {
   const router = useRouter();
+  const t = useTranslations('staff');
+  const tCommon = useTranslations('common');
+  const tFeatures = useTranslations('staff.features');
+  const tWorkingHours = useTranslations('staff.workingHours');
   const { currentOrganization, user } = useAuth();
   const [members, setMembers] = useState<StaffMemberDto[]>([]);
   const [seats, setSeats] = useState<{
@@ -144,9 +160,15 @@ export default function StaffPage() {
   const toast = useToast();
 
   const [inviteOpen, setInviteOpen] = useState(false);
+  const [inviteStep, setInviteStep] = useState<1 | 2>(1);
   const [inviteEmail, setInviteEmail] = useState('');
   const [inviteName, setInviteName] = useState('');
   const [invitePerms, setInvitePerms] = useState(() => emptyFeaturePermissionState());
+  const [inviteWorkingHoursDays, setInviteWorkingHoursDays] = useState<WorkingHoursEditorDay[]>(
+    () => createDefaultWorkingHoursState().days,
+  );
+  const [inviteAutoRepeatWeekly, setInviteAutoRepeatWeekly] = useState(true);
+  const [inviteHoursValidationError, setInviteHoursValidationError] = useState<string | null>(null);
   const [inviteLoading, setInviteLoading] = useState(false);
   const [copiedInviteMembershipId, setCopiedInviteMembershipId] = useState<string | null>(null);
   const [copyingInviteMembershipId, setCopyingInviteMembershipId] = useState<string | null>(null);
@@ -160,8 +182,15 @@ export default function StaffPage() {
   const [pendingInviteLinks, setPendingInviteLinks] = useState<Record<string, StoredInviteLink>>({});
 
   const [editing, setEditing] = useState<StaffMemberDto | null>(null);
+  const [editStep, setEditStep] = useState<1 | 2>(1);
   const [editName, setEditName] = useState('');
   const [editPerms, setEditPerms] = useState(() => emptyFeaturePermissionState());
+  const [editWorkingHoursDays, setEditWorkingHoursDays] = useState<WorkingHoursEditorDay[]>(
+    () => createDefaultWorkingHoursState().days,
+  );
+  const [editAutoRepeatWeekly, setEditAutoRepeatWeekly] = useState(true);
+  const [editHoursValidationError, setEditHoursValidationError] = useState<string | null>(null);
+  const [editLoadingWorkingHours, setEditLoadingWorkingHours] = useState(false);
   const [editLoading, setEditLoading] = useState(false);
   const [disableTarget, setDisableTarget] = useState<StaffMemberDto | null>(null);
   const [disablingMembershipId, setDisablingMembershipId] = useState<string | null>(null);
@@ -169,6 +198,11 @@ export default function StaffPage() {
   const [enablingMembershipId, setEnablingMembershipId] = useState<string | null>(null);
 
   const canEdit = useMemo(() => canEditStaff(currentOrganization), [currentOrganization]);
+  const inviteHasTreatmentEdit = useMemo(
+    () => featureStateHasTreatmentEdit(invitePerms),
+    [invitePerms],
+  );
+  const editHasTreatmentEdit = useMemo(() => featureStateHasTreatmentEdit(editPerms), [editPerms]);
   const hasActivePlan = Boolean(currentOrganization?.plan);
   const atSeatLimit = useMemo(() => {
     if (!seats || seats.unlimited) return false;
@@ -190,11 +224,11 @@ export default function StaffPage() {
       setMembers(res.data.members);
       setSeats(res.data.seats);
     } catch (e) {
-      toast.showError(formatApiErrorMessage(e, 'Failed to load staff.'));
+      toast.showError(formatApiErrorMessage(e, t('errorLoadStaff')));
     } finally {
       setLoading(false);
     }
-  }, []);
+  }, [t]);
 
   useEffect(() => {
     if (!currentOrganization?.id) return;
@@ -265,25 +299,66 @@ export default function StaffPage() {
         await load();
       }
     } catch (e) {
-      toast.showError(formatApiErrorMessage(e, 'Could not copy invitation link.'));
+      toast.showError(formatApiErrorMessage(e, t('errorCopyInvite')));
     } finally {
       setCopyingInviteMembershipId(null);
     }
   }
 
-  async function submitInvite() {
+  function resetInviteForm() {
+    setInviteStep(1);
+    setInviteEmail('');
+    setInviteName('');
+    setInvitePerms(emptyFeaturePermissionState());
+    const defaults = createDefaultWorkingHoursState();
+    setInviteWorkingHoursDays(defaults.days);
+    setInviteAutoRepeatWeekly(defaults.autoRepeatWeekly);
+    setInviteHoursValidationError(null);
+  }
+
+  async function saveInviteWorkingHours(membershipId: string, includeHours: boolean) {
+    if (!includeHours || !inviteHasTreatmentEdit) {
+      return;
+    }
+    const validationError = validateEditorDays(inviteWorkingHoursDays, tWorkingHours);
+    if (validationError) {
+      throw new Error(validationError);
+    }
+    await staffApi.upsertWorkingHours(
+      membershipId,
+      workingHoursPayloadFromState({
+        days: inviteWorkingHoursDays,
+        autoRepeatWeekly: inviteAutoRepeatWeekly,
+      }),
+    );
+  }
+
+  async function submitInvite(includeWorkingHours: boolean) {
     setInviteLoading(true);
     toast.setError('');
     setLastInviteInfo(null);
     const displayName = inviteName.trim();
     const displayEmail = inviteEmail.trim();
     try {
+      if (includeWorkingHours && inviteHasTreatmentEdit) {
+        const validationError = validateEditorDays(inviteWorkingHoursDays, tWorkingHours);
+        if (validationError) {
+          toast.showError(validationError);
+          return;
+        }
+      }
+
       const permissionNames = permissionNamesFromFeatureState(invitePerms);
       const res = await staffApi.invite({
         email: displayEmail,
         name: displayName,
         permissionNames,
       });
+
+      if (includeWorkingHours) {
+        await saveInviteWorkingHours(res.data.membershipId, true);
+      }
+
       setLastInviteInfo({
         membershipId: res.data.membershipId,
         name: displayName,
@@ -304,47 +379,79 @@ export default function StaffPage() {
         writeStoredInviteLinks(currentOrganization.id, nextLinks);
       }
       setInviteOpen(false);
-      setInviteEmail('');
-      setInviteName('');
-      setInvitePerms(emptyFeaturePermissionState());
+      resetInviteForm();
       await load();
     } catch (e) {
-      toast.showError(formatApiErrorMessage(e, 'Failed to send invitation.'));
+      toast.showError(formatApiErrorMessage(e, t('errorSendInvite')));
     } finally {
       setInviteLoading(false);
     }
   }
 
-  function openEdit(m: StaffMemberDto) {
+  async function openEdit(m: StaffMemberDto) {
     if (m.isOwner) return;
     setEditing(m);
+    setEditStep(1);
     setEditName(m.name);
-    setEditPerms(
-      featureStateFromPermissionNames(m.permissions ?? []),
-    );
+    setEditPerms(featureStateFromPermissionNames(m.permissions ?? []));
+    setEditHoursValidationError(null);
+    const defaults = createDefaultWorkingHoursState();
+    setEditWorkingHoursDays(defaults.days);
+    setEditAutoRepeatWeekly(defaults.autoRepeatWeekly);
+    setEditLoadingWorkingHours(true);
+    try {
+      const res = await staffApi.getWorkingHours(m.id);
+      const state = workingHoursStateFromApi(res.data);
+      setEditWorkingHoursDays(state.days);
+      setEditAutoRepeatWeekly(state.autoRepeatWeekly);
+    } catch (e) {
+      toast.showError(formatApiErrorMessage(e, t('errorLoadWorkingHours')));
+    } finally {
+      setEditLoadingWorkingHours(false);
+    }
   }
 
   async function submitEdit() {
     if (!editing) return;
+    if (editHasTreatmentEdit) {
+      const validationError = validateEditorDays(editWorkingHoursDays, tWorkingHours);
+      if (validationError) {
+        toast.showError(validationError);
+        return;
+      }
+    }
+
     setEditLoading(true);
     toast.setError('');
     try {
+      if (editHasTreatmentEdit) {
+        await staffApi.upsertWorkingHours(
+          editing.id,
+          workingHoursPayloadFromState({
+            days: editWorkingHoursDays,
+            autoRepeatWeekly: editAutoRepeatWeekly,
+          }),
+        );
+      }
+
       await staffApi.updateMember(editing.id, {
         name: editName.trim(),
         permissionNames: permissionNamesFromFeatureState(editPerms),
       });
-      toast.showSuccess('Member updated.');
+
+      toast.showSuccess(t('successMemberUpdated'));
       setEditing(null);
+      setEditStep(1);
       await load();
     } catch (e) {
-      toast.showError(formatApiErrorMessage(e, 'Failed to update member.'));
+      toast.showError(formatApiErrorMessage(e, t('errorUpdateMember')));
     } finally {
       setEditLoading(false);
     }
   }
 
   function handleDeleteMember() {
-    toast.showError('Delete is not implemented yet.');
+    toast.showError(t('errorDeleteNotImplemented'));
   }
 
   async function confirmDisableMember() {
@@ -354,11 +461,11 @@ export default function StaffPage() {
     toast.setError('');
     try {
       await staffApi.disableMember(disableTarget.id);
-      toast.showSuccess(`${disableTarget.name} was disabled. A seat is now available.`);
+      toast.showSuccess(t('successMemberDisabled', { name: disableTarget.name }));
       setDisableTarget(null);
       await load();
     } catch (e) {
-      toast.showError(formatApiErrorMessage(e, 'Failed to disable member.'));
+      toast.showError(formatApiErrorMessage(e, t('errorDisableMember')));
     } finally {
       setDisablingMembershipId(null);
     }
@@ -371,11 +478,11 @@ export default function StaffPage() {
     toast.setError('');
     try {
       await staffApi.enableMember(enableTarget.id);
-      toast.showSuccess(`${enableTarget.name} was enabled and can sign in again.`);
+      toast.showSuccess(t('successMemberEnabled', { name: enableTarget.name }));
       setEnableTarget(null);
       await load();
     } catch (e) {
-      toast.showError(formatApiErrorMessage(e, 'Failed to enable member.'));
+      toast.showError(formatApiErrorMessage(e, t('errorEnableMember')));
     } finally {
       setEnablingMembershipId(null);
     }
@@ -383,7 +490,7 @@ export default function StaffPage() {
 
   if (!currentOrganization || !canViewStaff(currentOrganization)) {
     return (
-      <p className="text-sm text-text-secondary">Redirecting…</p>
+      <p className="text-sm text-text-secondary">{t('redirecting')}</p>
     );
   }
 
@@ -391,23 +498,22 @@ export default function StaffPage() {
     <div className="space-y-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
         <div>
-          <h1 className="text-2xl font-semibold text-text-primary">Staff Management</h1>
-          <p className="text-sm text-text-secondary mt-1">
-            Invite teammates, set tab access, and stay within your plan seat limit.
-          </p>
+          <h1 className="text-2xl font-semibold text-text-primary">{t('title')}</h1>
+          <p className="text-sm text-text-secondary mt-1">{t('subtitle')}</p>
         </div>
         <Button
           size="sm"
           onClick={() => {
             if (!canEdit || atSeatLimit) return;
+            resetInviteForm();
             setInviteOpen(true);
             setLastInviteInfo(null);
           }}
           disabled={!canEdit || atSeatLimit}
           className="shrink-0"
-          title={!canEdit ? 'Read-only access for this organization.' : undefined}
+          title={!canEdit ? tCommon('readOnlyAccess') : undefined}
         >
-          Invite member
+          {t('inviteMember')}
         </Button>
       </div>
 
@@ -415,16 +521,14 @@ export default function StaffPage() {
 
       {seats && (
         <p className="text-sm text-text-secondary">
-          Seats:{' '}
+          {t('seatsLabel')}{' '}
           <span className="text-text-primary font-medium">
             {seats.used}
-            {seats.unlimited ? ' (unlimited plan)' : ` / ${seats.limit}`}
+            {seats.unlimited ? ` ${t('unlimitedPlan')}` : ` / ${seats.limit}`}
           </span>
           {!seats.unlimited && atSeatLimit && (
             <span className="text-amber-600 dark:text-amber-400 ml-2">
-              {hasActivePlan
-                ? 'Plan seat limit reached for this organization.'
-                : 'No active plan selected for this organization. Choose a subscription plan to invite members.'}
+              {hasActivePlan ? t('seatLimitReached') : t('noActivePlan')}
             </span>
           )}
         </p>
@@ -435,7 +539,7 @@ export default function StaffPage() {
           <button
             type="button"
             className="absolute right-2 top-2 p-1.5 rounded-[var(--radius-sm)] text-text-muted hover:text-text-primary hover:bg-background-card/80"
-            aria-label="Dismiss"
+            aria-label={tCommon('dismiss')}
             onClick={() => {
               setLastInviteInfo(null);
             }}
@@ -443,15 +547,15 @@ export default function StaffPage() {
             <X className="w-4 h-4" />
           </button>
           <p className="text-sm text-text-primary pr-6">
-            <span className="font-medium">{lastInviteInfo.name}</span> ({lastInviteInfo.email}) was invited.
+            {t('successInvited', { name: lastInviteInfo.name, email: lastInviteInfo.email })}
             {lastInviteInfo.invitationStatus === 'PENDING'
-              ? ' Invitation is pending until they open the link, set a password, and log in.'
-              : ' Invitation was accepted immediately.'}
+              ? ` ${t('invitedPending')}`
+              : ` ${t('invitedAccepted')}`}
           </p>
           {lastInviteInfo.invitationStatus === 'PENDING' && (
             <div className="space-y-2 pt-1 border-t border-border/60">
               <p className="text-xs font-medium text-text-secondary uppercase tracking-wide">
-                Invite link
+                {t('inviteLinkHeading')}
               </p>
               {lastInviteInfo.invitationUrl && (
                 <code className="block text-sm px-2 py-1.5 rounded-[var(--radius-sm)] bg-background-card border border-border font-mono break-all">
@@ -491,36 +595,36 @@ export default function StaffPage() {
                       setCopiedInviteMembershipId(lastInviteInfo.membershipId);
                       setTimeout(() => setCopiedInviteMembershipId(null), 1500);
                     } catch (e) {
-                      toast.showError(formatApiErrorMessage(e, 'Could not copy invitation link.'));
+                      toast.showError(formatApiErrorMessage(e, t('errorCopyInvite')));
                     } finally {
                       setCopyingInviteMembershipId(null);
                     }
                   })();
                 }}
               >
-                {copiedInviteMembershipId === lastInviteInfo.membershipId ? 'Copied' : 'Copy link'}
+                {copiedInviteMembershipId === lastInviteInfo.membershipId
+                  ? tCommon('copied')
+                  : tCommon('copyLink')}
               </Button>
-              <p className="text-xs text-text-muted">
-                Share this link manually via SMS or email. A new link is generated if the previous one expired or was lost.
-              </p>
+              <p className="text-xs text-text-muted">{t('shareLinkHint')}</p>
             </div>
           )}
         </div>
       )}
 
       {loading ? (
-        <p className="text-sm text-text-secondary">Loading team…</p>
+        <p className="text-sm text-text-secondary">{t('loadingTeam')}</p>
       ) : (
         <Table
           headers={
             <tr>
-              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">Name</th>
-              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">Email</th>
-              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">Role</th>
-              <th className="px-6 py-3 text-center text-xs font-medium text-text-muted uppercase tracking-wider">Status</th>
-              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">Access</th>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">{t('tableName')}</th>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">{t('tableEmail')}</th>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">{t('tableRole')}</th>
+              <th className="px-6 py-3 text-center text-xs font-medium text-text-muted uppercase tracking-wider">{t('tableStatus')}</th>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">{t('tableAccess')}</th>
               <th className="px-6 py-3 text-center text-xs font-medium text-text-muted uppercase tracking-wider w-36">
-                Action
+                {t('tableAction')}
               </th>
             </tr>
           }
@@ -532,28 +636,28 @@ export default function StaffPage() {
                   <td className="px-6 py-1.5 text-sm text-text-secondary">{m.email}</td>
                   <td className="px-6 py-1.5 text-sm">
                     {m.isOwner ? (
-                      <span className="text-primary font-medium">Owner</span>
+                      <span className="text-primary font-medium">{t('roleOwner')}</span>
                     ) : (
-                      <span className="text-text-secondary">Staff</span>
+                      <span className="text-text-secondary">{t('roleStaff')}</span>
                     )}
                   </td>
                   <td className="px-6 py-1.5 align-middle text-center">
                     {m.isOwner || m.invitationStatus === 'ACTIVE' ? (
-                      <Badge variant="success">Active</Badge>
+                      <Badge variant="success">{t('statusActive')}</Badge>
                     ) : m.invitationStatus === 'PENDING' ? (
-                      <Badge variant="warning">Pending</Badge>
+                      <Badge variant="warning">{t('statusPending')}</Badge>
                     ) : m.invitationStatus === 'DISABLED' ? (
-                      <Badge variant="default">Disabled</Badge>
+                      <Badge variant="default">{t('statusDisabled')}</Badge>
                     ) : (
-                      <Badge variant="danger">Expired</Badge>
+                      <Badge variant="danger">{t('statusExpired')}</Badge>
                     )}
                   </td>
                   <td className="px-6 py-1.5 text-sm text-text-secondary max-w-md">
                     {m.isOwner ? (
-                      <span className="text-text-muted">All features</span>
+                      <span className="text-text-muted">{t('allFeatures')}</span>
                     ) : (
                       <span className="line-clamp-3 text-sm leading-relaxed">
-                        {formatAccessSummary(m.permissions, currentOrganization?.type)}
+                        {formatAccessSummary(m.permissions, currentOrganization?.type, tFeatures)}
                       </span>
                     )}
                   </td>
@@ -566,8 +670,8 @@ export default function StaffPage() {
                             className="p-2 rounded-md text-text-secondary hover:bg-background-card/80 hover:text-text-primary disabled:opacity-50"
                             disabled={copyingInviteMembershipId === m.id}
                             onClick={() => void copyStaffInviteLink(m)}
-                            aria-label="Copy invitation link"
-                            title="Copy invitation link (generates a new link if needed)"
+                            aria-label={t('copyInviteLink')}
+                            title={t('copyInviteLinkTitle')}
                           >
                             {copiedInviteMembershipId === m.id ? (
                               <Check className="w-4 h-4" />
@@ -584,9 +688,9 @@ export default function StaffPage() {
                                 ? 'text-text-secondary hover:bg-background-card/80 hover:text-primary'
                                 : 'text-text-muted opacity-50 cursor-not-allowed'
                             }`}
-                            aria-label="Enable member"
+                            aria-label={t('enableMemberAria')}
                             disabled={!canEdit || enablingMembershipId === m.id}
-                            title="Enable member (uses a seat)"
+                            title={t('enableMemberTitle')}
                             onClick={() => {
                               if (!canEdit) return;
                               setEnableTarget(m);
@@ -603,9 +707,9 @@ export default function StaffPage() {
                                 ? 'text-text-secondary hover:bg-background-card/80 hover:text-amber-600'
                                 : 'text-text-muted opacity-50 cursor-not-allowed'
                             }`}
-                            aria-label="Disable member"
+                            aria-label={t('disableMemberAria')}
                             disabled={!canEdit || disablingMembershipId === m.id}
-                            title="Disable member (frees a seat)"
+                            title={t('disableMemberTitle')}
                             onClick={() => {
                               if (!canEdit) return;
                               setDisableTarget(m);
@@ -621,7 +725,7 @@ export default function StaffPage() {
                               ? 'text-text-secondary hover:bg-background-card/80 hover:text-text-primary'
                               : 'text-text-muted opacity-50 cursor-not-allowed'
                           }`}
-                          aria-label="Edit member"
+                          aria-label={t('editMemberAria')}
                           disabled={!canEdit}
                           onClick={() => {
                             if (!canEdit) return;
@@ -637,9 +741,9 @@ export default function StaffPage() {
                               ? 'text-text-secondary hover:bg-red-500/15 hover:text-red-600'
                               : 'text-text-muted opacity-50 cursor-not-allowed'
                           }`}
-                          aria-label="Delete member"
+                          aria-label={t('deleteMemberAria')}
                           disabled={!canEdit}
-                          title="Delete member (not implemented)"
+                          title={t('deleteMemberTitle')}
                           onClick={() => {
                             if (!canEdit) return;
                             handleDeleteMember();
@@ -666,43 +770,110 @@ export default function StaffPage() {
             aria-labelledby="invite-staff-title"
           >
             <div className="flex items-start justify-between gap-3">
-              <h2 id="invite-staff-title" className="text-lg font-semibold text-text-primary pr-2">
-                Invite team member
-              </h2>
-              <DialogCloseButton onClick={() => setInviteOpen(false)} />
-            </div>
-            <Input
-              label="Email"
-              type="email"
-              value={inviteEmail}
-              onChange={(e) => setInviteEmail(e.target.value)}
-              autoComplete="off"
-            />
-            <Input
-              label="Display name"
-              value={inviteName}
-              onChange={(e) => setInviteName(e.target.value)}
-            />
-            <div>
-              <p className="text-sm font-medium text-text-secondary mb-2">Tab access</p>
-              <PermissionGrid
-                state={invitePerms}
-                onChange={setInvitePerms}
-                organizationType={currentOrganization?.type}
+              <div>
+                <h2 id="invite-staff-title" className="text-lg font-semibold text-text-primary pr-2">
+                  {t('inviteModalTitle')}
+                </h2>
+                {inviteHasTreatmentEdit && (
+                  <p className="text-xs text-text-muted mt-1">{t('stepOf', { step: inviteStep })}</p>
+                )}
+              </div>
+              <DialogCloseButton
+                onClick={() => {
+                  setInviteOpen(false);
+                  resetInviteForm();
+                }}
               />
             </div>
+
+            {inviteStep === 1 ? (
+              <>
+                <Input
+                  label={t('labelEmail')}
+                  type="email"
+                  value={inviteEmail}
+                  onChange={(e) => setInviteEmail(e.target.value)}
+                  autoComplete="off"
+                />
+                <Input
+                  label={t('labelDisplayName')}
+                  value={inviteName}
+                  onChange={(e) => setInviteName(e.target.value)}
+                />
+                <div>
+                  <p className="text-sm font-medium text-text-secondary mb-2">{t('tabAccess')}</p>
+                  <PermissionGrid
+                    state={invitePerms}
+                    onChange={setInvitePerms}
+                    organizationType={currentOrganization?.type}
+                  />
+                </div>
+              </>
+            ) : (
+              <StaffWorkingHoursStep
+                days={inviteWorkingHoursDays}
+                autoRepeatWeekly={inviteAutoRepeatWeekly}
+                onDaysChange={setInviteWorkingHoursDays}
+                onAutoRepeatWeeklyChange={setInviteAutoRepeatWeekly}
+                onValidationChange={setInviteHoursValidationError}
+                disabled={inviteLoading}
+              />
+            )}
+
             <div className="flex justify-end gap-2 pt-2">
-              <Button variant="outline" type="button" onClick={() => setInviteOpen(false)}>
-                Cancel
-              </Button>
               <Button
+                variant="outline"
                 type="button"
-                isLoading={inviteLoading}
-                disabled={!inviteEmail.trim() || !inviteName.trim()}
-                onClick={() => void submitInvite()}
+                onClick={() => {
+                  if (inviteStep === 2) {
+                    setInviteStep(1);
+                    return;
+                  }
+                  setInviteOpen(false);
+                  resetInviteForm();
+                }}
               >
-                Send invite
+                {inviteStep === 2 ? tCommon('back') : tCommon('cancel')}
               </Button>
+              {inviteStep === 1 ? (
+                inviteHasTreatmentEdit ? (
+                  <Button
+                    type="button"
+                    disabled={!inviteEmail.trim() || !inviteName.trim()}
+                    onClick={() => setInviteStep(2)}
+                  >
+                    {tCommon('next')}
+                  </Button>
+                ) : (
+                  <Button
+                    type="button"
+                    isLoading={inviteLoading}
+                    disabled={!inviteEmail.trim() || !inviteName.trim()}
+                    onClick={() => void submitInvite(false)}
+                  >
+                    {t('sendInvite')}
+                  </Button>
+                )
+              ) : (
+                <>
+                  <Button
+                    type="button"
+                    variant="outline"
+                    isLoading={inviteLoading}
+                    onClick={() => void submitInvite(false)}
+                  >
+                    {t('skipForNow')}
+                  </Button>
+                  <Button
+                    type="button"
+                    isLoading={inviteLoading}
+                    disabled={Boolean(inviteHoursValidationError)}
+                    onClick={() => void submitInvite(true)}
+                  >
+                    {t('sendInvite')}
+                  </Button>
+                </>
+              )}
             </div>
           </div>
         </div>
@@ -718,7 +889,7 @@ export default function StaffPage() {
           >
             <div className="flex items-start justify-between gap-2">
               <h2 id="enable-staff-title" className="text-lg font-semibold text-text-primary pr-2">
-                Enable team member
+                {t('enableModalTitle')}
               </h2>
               <DialogCloseButton
                 onClick={() => {
@@ -728,22 +899,15 @@ export default function StaffPage() {
               />
             </div>
             <p className="text-sm text-text-secondary">
-              Enable <span className="font-medium text-text-primary">{enableTarget.name}</span> (
-              {enableTarget.email})?
+              {t('enableConfirm', { name: enableTarget.name, email: enableTarget.email })}
             </p>
             <ul className="text-sm text-text-secondary space-y-2 list-disc pl-5">
-              <li>They can sign in to this organization again with their existing account.</li>
-              <li>No new invitation is sent and no data was removed while they were disabled.</li>
-              <li>
-                Enabling uses <span className="text-text-primary font-medium">one seat</span> on your
-                plan.
-              </li>
+              <li>{t('enableBullet1')}</li>
+              <li>{t('enableBullet2')}</li>
+              <li>{t('enableBullet3')}</li>
             </ul>
             {!hasAvailableSeat && (
-              <p className="text-sm text-amber-600 dark:text-amber-400">
-                No seats are available. Disable another member or upgrade your plan before enabling
-                this person.
-              </p>
+              <p className="text-sm text-amber-600 dark:text-amber-400">{t('noSeatsAvailable')}</p>
             )}
             <div className="flex justify-end gap-2 pt-1">
               <Button
@@ -752,7 +916,7 @@ export default function StaffPage() {
                 disabled={Boolean(enablingMembershipId)}
                 onClick={() => setEnableTarget(null)}
               >
-                Cancel
+                {tCommon('cancel')}
               </Button>
               <Button
                 type="button"
@@ -761,7 +925,7 @@ export default function StaffPage() {
                 disabled={Boolean(enablingMembershipId) || !hasAvailableSeat}
                 onClick={() => void confirmEnableMember()}
               >
-                Enable member
+                {t('enableMemberButton')}
               </Button>
             </div>
           </div>
@@ -778,7 +942,7 @@ export default function StaffPage() {
           >
             <div className="flex items-start justify-between gap-2">
               <h2 id="disable-staff-title" className="text-lg font-semibold text-text-primary pr-2">
-                Disable team member
+                {t('disableModalTitle')}
               </h2>
               <DialogCloseButton
                 onClick={() => {
@@ -788,16 +952,12 @@ export default function StaffPage() {
               />
             </div>
             <p className="text-sm text-text-secondary">
-              Disable <span className="font-medium text-text-primary">{disableTarget.name}</span> (
-              {disableTarget.email})?
+              {t('disableConfirm', { name: disableTarget.name, email: disableTarget.email })}
             </p>
             <ul className="text-sm text-text-secondary space-y-2 list-disc pl-5">
-              <li>They will not be able to sign in to this organization.</li>
-              <li>No data will be removed.</li>
-              <li>
-                Disabling frees <span className="text-text-primary font-medium">one seat</span> on your
-                plan so you can invite someone else.
-              </li>
+              <li>{t('disableBullet1')}</li>
+              <li>{t('disableBullet2')}</li>
+              <li>{t('disableBullet3')}</li>
             </ul>
             <div className="flex justify-end gap-2 pt-1">
               <Button
@@ -806,7 +966,7 @@ export default function StaffPage() {
                 disabled={Boolean(disablingMembershipId)}
                 onClick={() => setDisableTarget(null)}
               >
-                Cancel
+                {tCommon('cancel')}
               </Button>
               <Button
                 type="button"
@@ -815,7 +975,7 @@ export default function StaffPage() {
                 disabled={Boolean(disablingMembershipId)}
                 onClick={() => void confirmDisableMember()}
               >
-                Disable member
+                {t('disableMemberButton')}
               </Button>
             </div>
           </div>
@@ -830,26 +990,85 @@ export default function StaffPage() {
             aria-modal="true"
           >
             <div className="flex items-start justify-between gap-3">
-              <h2 className="text-lg font-semibold text-text-primary pr-2">Edit member</h2>
-              <DialogCloseButton onClick={() => setEditing(null)} />
-            </div>
-            <p className="text-xs text-text-muted">{editing.email}</p>
-            <Input label="Display name" value={editName} onChange={(e) => setEditName(e.target.value)} />
-            <div>
-              <p className="text-sm font-medium text-text-secondary mb-2">Tab access</p>
-              <PermissionGrid
-                state={editPerms}
-                onChange={setEditPerms}
-                organizationType={currentOrganization?.type}
+              <div>
+                <h2 className="text-lg font-semibold text-text-primary pr-2">{t('editModalTitle')}</h2>
+                {editHasTreatmentEdit && (
+                  <p className="text-xs text-text-muted mt-1">{t('stepOf', { step: editStep })}</p>
+                )}
+              </div>
+              <DialogCloseButton
+                onClick={() => {
+                  setEditing(null);
+                  setEditStep(1);
+                }}
               />
             </div>
+            <p className="text-xs text-text-muted">{editing.email}</p>
+
+            {editStep === 1 ? (
+              <>
+                <Input
+                  label={t('labelDisplayName')}
+                  value={editName}
+                  onChange={(e) => setEditName(e.target.value)}
+                />
+                <div>
+                  <p className="text-sm font-medium text-text-secondary mb-2">{t('tabAccess')}</p>
+                  <PermissionGrid
+                    state={editPerms}
+                    onChange={setEditPerms}
+                    organizationType={currentOrganization?.type}
+                  />
+                </div>
+              </>
+            ) : editLoadingWorkingHours ? (
+              <p className="text-sm text-text-secondary">{t('loadingWorkingHours')}</p>
+            ) : (
+              <StaffWorkingHoursStep
+                days={editWorkingHoursDays}
+                autoRepeatWeekly={editAutoRepeatWeekly}
+                onDaysChange={setEditWorkingHoursDays}
+                onAutoRepeatWeeklyChange={setEditAutoRepeatWeekly}
+                onValidationChange={setEditHoursValidationError}
+                disabled={editLoading}
+              />
+            )}
+
             <div className="flex justify-end gap-2 pt-2">
-              <Button variant="outline" type="button" onClick={() => setEditing(null)}>
-                Cancel
-              </Button>
-              <Button type="button" isLoading={editLoading} onClick={() => void submitEdit()}>
-                Save
+              <Button
+                variant="outline"
+                type="button"
+                onClick={() => {
+                  if (editStep === 2) {
+                    setEditStep(1);
+                    return;
+                  }
+                  setEditing(null);
+                  setEditStep(1);
+                }}
+              >
+                {editStep === 2 ? tCommon('back') : tCommon('cancel')}
               </Button>
+              {editStep === 1 ? (
+                editHasTreatmentEdit ? (
+                  <Button type="button" onClick={() => setEditStep(2)}>
+                    {tCommon('next')}
+                  </Button>
+                ) : (
+                  <Button type="button" isLoading={editLoading} onClick={() => void submitEdit()}>
+                    {tCommon('save')}
+                  </Button>
+                )
+              ) : (
+                <Button
+                  type="button"
+                  isLoading={editLoading}
+                  disabled={Boolean(editHoursValidationError)}
+                  onClick={() => void submitEdit()}
+                >
+                  {tCommon('save')}
+                </Button>
+              )}
             </div>
           </div>
         </div>
diff --git a/frontend/src/app/(dashboard)/today/page.tsx b/frontend/src/app/[locale]/(dashboard)/today/page.tsx
similarity index 70%
rename from frontend/src/app/(dashboard)/today/page.tsx
rename to frontend/src/app/[locale]/(dashboard)/today/page.tsx
index 9e7ecf7..107a1c4 100644
--- a/frontend/src/app/(dashboard)/today/page.tsx
+++ b/frontend/src/app/[locale]/(dashboard)/today/page.tsx
@@ -1,10 +1,12 @@
 'use client';
 
-import Link from 'next/link';
+import { useTranslations } from 'next-intl';
+import { Link } from '@/i18n/navigation';
 import { useAuth } from '@/lib/hooks/useAuth';
 import { Card } from '@/components/ui/shared/Card';
 
 export default function TodayPage() {
+  const t = useTranslations('today');
   const { currentOrganization } = useAuth();
   const showNoSubscriptionNotice =
     Boolean(currentOrganization?.isOwner) && !currentOrganization?.plan;
@@ -12,42 +14,42 @@ export default function TodayPage() {
   return (
     <div>
       <h1 className="text-2xl font-semibold mb-6">
-        Welcome back!!
+        {t('welcomeBack')}
       </h1>
 
       {showNoSubscriptionNotice && (
         <div className="mb-6 rounded-[var(--radius-md)] border border-amber-500/30 bg-amber-500/10 p-4">
           <p className="text-sm text-amber-200">
-            This organization does not have an active subscription yet.{' '}
+            {t('noSubscriptionNotice')}{' '}
             <Link href="/settings/subscriptions" className="font-medium underline underline-offset-2">
-              Choose a plan
+              {t('choosePlanLink')}
             </Link>{' '}
-            to start the purchase process.
+            {t('noSubscriptionCta')}
           </p>
         </div>
       )}
 
       <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 gap-4">
         <Card>
-          <p className="text-sm text-card-muted">Today's Appointments</p>
+          <p className="text-sm text-card-muted">{t('cardTodaysAppointments')}</p>
           <p className="text-2xl font-semibold mt-2">12</p>
           <p className="text-xs text-text-muted mt-1">Monday 2/5/2026</p>
         </Card>
         <Card>
-          <p className="text-sm text-card-muted">Active Patients</p>
+          <p className="text-sm text-card-muted">{t('cardActivePatients')}</p>
           <p className="text-2xl font-semibold mt-2">675</p>
         </Card>
         <Card>
-          <p className="text-sm text-card-muted">New Lab Case</p>
+          <p className="text-sm text-card-muted">{t('cardNewLabCase')}</p>
           <p className="text-2xl font-semibold mt-2">5</p>
           <p className="text-xs text-text-muted mt-1">35 ↑</p>
         </Card>
         <Card>
-          <p className="text-sm text-card-muted">Today invoices</p>
+          <p className="text-sm text-card-muted">{t('cardTodayInvoices')}</p>
           <p className="text-2xl font-semibold mt-2">1200$</p>
           <p className="text-xs text-text-muted mt-1">21,300 $</p>
         </Card>
       </div>
     </div>
   );
-}
\ No newline at end of file
+}
diff --git a/frontend/src/app/(dashboard)/treatment/page.tsx b/frontend/src/app/[locale]/(dashboard)/treatment/page.tsx
similarity index 72%
rename from frontend/src/app/(dashboard)/treatment/page.tsx
rename to frontend/src/app/[locale]/(dashboard)/treatment/page.tsx
index 1014b41..6b45904 100644
--- a/frontend/src/app/(dashboard)/treatment/page.tsx
+++ b/frontend/src/app/[locale]/(dashboard)/treatment/page.tsx
@@ -1,14 +1,16 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { TreatmentWorkspace } from '@/components/ui/treatment/TreatmentWorkspace';
 import { useAuth } from '@/lib/hooks/useAuth';
 
 export default function TreatmentPage() {
+  const t = useTranslations('treatment');
   const { user, currentOrganization, isAuthReady } = useAuth();
 
   if (!isAuthReady || !user) {
     return (
-      <div className="text-sm text-text-muted">Loading…</div>
+      <div className="text-sm text-text-muted">{t('loading')}</div>
     );
   }
 
diff --git a/frontend/src/app/(public)/accept-invite/page.tsx b/frontend/src/app/[locale]/(public)/accept-invite/page.tsx
similarity index 66%
rename from frontend/src/app/(public)/accept-invite/page.tsx
rename to frontend/src/app/[locale]/(public)/accept-invite/page.tsx
index 67f6fbb..5cce4df 100644
--- a/frontend/src/app/(public)/accept-invite/page.tsx
+++ b/frontend/src/app/[locale]/(public)/accept-invite/page.tsx
@@ -2,13 +2,15 @@
 
 import { useEffect, useMemo, useState } from 'react';
 import { Suspense } from 'react';
-import Link from 'next/link';
-import { useRouter, useSearchParams } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+import { Link, useRouter } from '@/i18n/navigation';
+import { useSearchParams } from 'next/navigation';
 import { Button } from '@/components/ui/shared/Button';
 import { Input } from '@/components/ui/shared/Input';
 import { staffApi } from '@/lib/api/staff';
 
 function AcceptInviteContent() {
+  const t = useTranslations('auth');
   const params = useSearchParams();
   const router = useRouter();
   const token = useMemo(() => params.get('token') || '', [params]);
@@ -32,7 +34,7 @@ function AcceptInviteContent() {
   useEffect(() => {
     if (!token) {
       setLoading(false);
-      setError('Invalid invitation link');
+      setError(t('invalidInvitationLink'));
       return;
     }
 
@@ -44,30 +46,31 @@ function AcceptInviteContent() {
         setInviteInfo(res.data);
         setName(res.data.name || '');
         if (res.data.status === 'ACCEPTED') {
-          setSuccess('This invitation is already accepted. You can log in now.');
+          setSuccess(t('invitationAlreadyAccepted'));
         }
-      } catch (e: any) {
-        setError(e?.message || 'Could not load invitation');
+      } catch (e: unknown) {
+        const message = e && typeof e === 'object' && 'message' in e ? String(e.message) : '';
+        setError(message || t('errorLoadInvitation'));
       } finally {
         setLoading(false);
       }
     })();
-  }, [token]);
+  }, [token, t]);
 
   async function onAccept() {
     if (!token) return;
     setError('');
     setSuccess('');
     if (!name.trim()) {
-      setError('Name is required');
+      setError(t('nameRequired'));
       return;
     }
     if (password.length < 8) {
-      setError('Password must be at least 8 characters');
+      setError(t('passwordMinLength8'));
       return;
     }
     if (password !== confirmPassword) {
-      setError('Passwords do not match');
+      setError(t('passwordsDoNotMatch'));
       return;
     }
 
@@ -78,12 +81,13 @@ function AcceptInviteContent() {
         name: name.trim(),
         password,
       });
-      setSuccess('Invitation Accepted. Redirecting to login...');
+      setSuccess(t('invitationAcceptedRedirect'));
       setTimeout(() => {
         router.replace('/login');
       }, 1000);
-    } catch (e: any) {
-      setError(e?.message || 'Could not accept invitation');
+    } catch (e: unknown) {
+      const message = e && typeof e === 'object' && 'message' in e ? String(e.message) : '';
+      setError(message || t('errorAcceptInvitation'));
     } finally {
       setSubmitting(false);
     }
@@ -92,19 +96,21 @@ function AcceptInviteContent() {
   return (
     <div className="min-h-screen app-web-bg flex items-center justify-center p-4">
       <div className="w-full max-w-md surface-card p-6 space-y-5">
-        <h1 className="text-xl font-semibold text-text-primary">Accept invitation</h1>
+        <h1 className="text-xl font-semibold text-text-primary">{t('acceptInviteTitle')}</h1>
 
         {loading ? (
-          <p className="text-sm text-text-secondary">Loading invitation...</p>
+          <p className="text-sm text-text-secondary">{t('loadingInvitation')}</p>
         ) : (
           <>
             {inviteInfo && (
               <div className="rounded-[var(--radius-md)] border border-border/70 bg-background-secondary/70 px-3 py-2 text-sm text-text-secondary space-y-1">
                 <p>
-                  Organization: <span className="text-text-primary">{inviteInfo.organizationName}</span>
+                  {t('organizationLabel')}{' '}
+                  <span className="text-text-primary">{inviteInfo.organizationName}</span>
                 </p>
                 <p>
-                  Email: <span className="text-text-primary">{inviteInfo.email}</span>
+                  {t('emailLabel')}{' '}
+                  <span className="text-text-primary">{inviteInfo.email}</span>
                 </p>
               </div>
             )}
@@ -122,27 +128,28 @@ function AcceptInviteContent() {
 
             {inviteInfo?.status !== 'ACCEPTED' && (
               <div className="space-y-3">
-                <Input label="Name" value={name} onChange={(e) => setName(e.target.value)} />
+                <Input label={t('labelName')} value={name} onChange={(e) => setName(e.target.value)} />
                 <Input
-                  label="Create password"
+                  label={t('labelCreatePassword')}
                   type="password"
                   value={password}
                   onChange={(e) => setPassword(e.target.value)}
                 />
                 <Input
-                  label="Confirm password"
+                  label={t('labelConfirmPassword')}
                   type="password"
                   value={confirmPassword}
                   onChange={(e) => setConfirmPassword(e.target.value)}
                 />
                 <Button type="button" fullWidth isLoading={submitting} onClick={() => void onAccept()}>
-                  Activate account
+                  {t('activateAccount')}
                 </Button>
               </div>
             )}
 
             <p className="text-xs text-text-muted">
-              Already have access? <Link href="/login" className="text-primary">Go to login</Link>
+              {t('alreadyHaveAccess')}{' '}
+              <Link href="/login" className="text-primary">{t('goToLogin')}</Link>
             </p>
           </>
         )}
@@ -151,15 +158,18 @@ function AcceptInviteContent() {
   );
 }
 
+function AcceptInviteFallback() {
+  const t = useTranslations('auth');
+  return (
+    <div className="min-h-screen app-web-bg flex items-center justify-center">
+      <p className="text-sm text-text-secondary">{t('loadingInvitation')}</p>
+    </div>
+  );
+}
+
 export default function AcceptInvitePage() {
   return (
-    <Suspense
-      fallback={
-        <div className="min-h-screen app-web-bg flex items-center justify-center">
-          <p className="text-sm text-text-secondary">Loading invitation...</p>
-        </div>
-      }
-    >
+    <Suspense fallback={<AcceptInviteFallback />}>
       <AcceptInviteContent />
     </Suspense>
   );
diff --git a/frontend/src/app/(public)/accept-organization-invite/page.tsx b/frontend/src/app/[locale]/(public)/accept-organization-invite/page.tsx
similarity index 73%
rename from frontend/src/app/(public)/accept-organization-invite/page.tsx
rename to frontend/src/app/[locale]/(public)/accept-organization-invite/page.tsx
index 782ea2f..a6434d5 100644
--- a/frontend/src/app/(public)/accept-organization-invite/page.tsx
+++ b/frontend/src/app/[locale]/(public)/accept-organization-invite/page.tsx
@@ -1,8 +1,9 @@
 'use client';
 
 import { Suspense, useEffect, useMemo, useState } from 'react';
-import Link from 'next/link';
-import { useRouter, useSearchParams } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+import { Link, useRouter } from '@/i18n/navigation';
+import { useSearchParams } from 'next/navigation';
 import { useForm, type FieldErrors, type UseFormRegister, type UseFormSetValue } from 'react-hook-form';
 import type { OrganizationDetailsFormValues } from '@/components/ui/auth/OrganizationDetailsFields';
 import { zodResolver } from '@hookform/resolvers/zod';
@@ -14,33 +15,47 @@ import { OrganizationDetailsFields } from '@/components/ui/auth/OrganizationDeta
 import { RegistrationProgressSteps } from '@/components/ui/auth/RegistrationProgressSteps';
 import { organizationApi } from '@/lib/api/organization';
 
-const acceptOrganizationInviteSchema = z
-  .object({
-    ownerName: z.string().min(2, 'Name must be at least 2 characters'),
-    password: z
-      .string()
-      .min(8, 'Password must be at least 8 characters')
-      .regex(/[A-Z]/, 'Password must contain at least one uppercase letter')
-      .regex(/[0-9]/, 'Password must contain at least one number'),
-    confirmPassword: z.string(),
-    organizationName: z.string().min(2, 'Organization name must be at least 2 characters'),
-    organizationEmail: z.string().email('Please enter a valid organization email'),
-    organizationType: z.enum(['CLINIC', 'LAB'], {
-      message: 'Please select organization type',
-    }),
-  })
-  .refine((data) => data.password === data.confirmPassword, {
-    message: "Passwords don't match",
-    path: ['confirmPassword'],
-  });
-
-type AcceptOrganizationInviteForm = z.infer<typeof acceptOrganizationInviteSchema>;
+type AcceptOrganizationInviteForm = {
+  ownerName: string;
+  password: string;
+  confirmPassword: string;
+  organizationName: string;
+  organizationEmail: string;
+  organizationType: 'CLINIC' | 'LAB';
+};
 
 function AcceptOrganizationInviteContent() {
+  const t = useTranslations('auth');
+  const tCommon = useTranslations('common');
+  const tValidation = useTranslations('validation');
   const params = useSearchParams();
   const router = useRouter();
   const token = useMemo(() => params.get('token') || '', [params]);
 
+  const acceptOrganizationInviteSchema = useMemo(
+    () =>
+      z
+        .object({
+          ownerName: z.string().min(2, tValidation('nameMinLength')),
+          password: z
+            .string()
+            .min(8, tValidation('passwordMinLength'))
+            .regex(/[A-Z]/, tValidation('passwordUppercase'))
+            .regex(/[0-9]/, tValidation('passwordNumber')),
+          confirmPassword: z.string(),
+          organizationName: z.string().min(2, tValidation('organizationNameMinLength')),
+          organizationEmail: z.string().email(tValidation('organizationEmailInvalid')),
+          organizationType: z.enum(['CLINIC', 'LAB'], {
+            message: tValidation('organizationTypeRequired'),
+          }),
+        })
+        .refine((data) => data.password === data.confirmPassword, {
+          message: tValidation('passwordsDoNotMatch'),
+          path: ['confirmPassword'],
+        }),
+    [tValidation],
+  );
+
   const [step, setStep] = useState(1);
   const [loading, setLoading] = useState(true);
   const [submitting, setSubmitting] = useState(false);
@@ -77,7 +92,7 @@ function AcceptOrganizationInviteContent() {
   useEffect(() => {
     if (!token) {
       setLoading(false);
-      setError('Invalid invitation link');
+      setError(t('invalidInvitationLink'));
       return;
     }
 
@@ -96,16 +111,16 @@ function AcceptOrganizationInviteContent() {
           organizationType: res.data.organizationType,
         });
         if (res.data.status === 'ACCEPTED') {
-          setSuccess('This invitation is already accepted. You can log in now.');
+          setSuccess(t('invitationAlreadyAccepted'));
         }
       } catch (e: unknown) {
         const message = e && typeof e === 'object' && 'message' in e ? String(e.message) : '';
-        setError(message || 'Could not load invitation');
+        setError(message || t('errorLoadInvitation'));
       } finally {
         setLoading(false);
       }
     })();
-  }, [token, reset]);
+  }, [token, reset, t]);
 
   const handleNext = async () => {
     const isValid = await trigger(['ownerName', 'password', 'confirmPassword']);
@@ -129,11 +144,11 @@ function AcceptOrganizationInviteContent() {
         organizationEmail: data.organizationEmail.trim(),
         organizationType: data.organizationType,
       });
-      setSuccess('Invitation accepted. Redirecting to login...');
+      setSuccess(t('organizationAcceptedRedirect'));
       setTimeout(() => router.replace('/login'), 1000);
     } catch (e: unknown) {
       const message = e && typeof e === 'object' && 'message' in e ? String(e.message) : '';
-      setError(message || 'Could not accept invitation');
+      setError(message || t('errorAcceptInvitation'));
     } finally {
       setSubmitting(false);
     }
@@ -143,15 +158,15 @@ function AcceptOrganizationInviteContent() {
     <div className="min-h-screen app-web-bg flex flex-col justify-center py-12 sm:px-6 lg:px-8">
       <div className="sm:mx-auto sm:w-full sm:max-w-md">
         <Link href="/" className="flex justify-center">
-          <span className="text-3xl font-semibold text-text-primary">DyoLink</span>
+          <span className="text-3xl font-semibold text-text-primary">{tCommon('appName')}</span>
         </Link>
         <h2 className="mt-6 text-center text-2xl font-semibold text-text-primary">
-          Accept organization invitation
+          {t('acceptOrganizationTitle')}
         </h2>
         <p className="mt-2 text-center text-sm text-text-secondary">
-          Already have an account?{' '}
+          {t('alreadyHaveAccount')}{' '}
           <Link href="/login" className="font-medium text-primary hover:opacity-90">
-            Sign in
+            {t('signInLink')}
           </Link>
         </p>
       </div>
@@ -159,13 +174,13 @@ function AcceptOrganizationInviteContent() {
       <div className="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
         <div className="surface-card py-8 px-4 sm:px-10">
           {loading ? (
-            <p className="text-sm text-text-secondary">Loading invitation...</p>
+            <p className="text-sm text-text-secondary">{t('loadingInvitation')}</p>
           ) : (
             <>
               {inviteInfo && (
                 <div className="mb-6 rounded-[var(--radius-md)] border border-border/70 bg-background-secondary/70 px-3 py-2 text-sm text-text-secondary space-y-1">
                   <p>
-                    Invited by:{' '}
+                    {t('invitedBy')}{' '}
                     <span className="text-text-primary">{inviteInfo.inviterOrganizationName}</span>
                   </p>
                 </div>
@@ -191,37 +206,37 @@ function AcceptOrganizationInviteContent() {
                   {step === 1 && (
                     <>
                       <Input
-                        label="Owner email"
+                        label={t('ownerEmail')}
                         value={inviteInfo?.ownerEmail ?? ''}
                         readOnly
                         disabled
                         icon={<Mail className="h-5 w-5 icon-flat" />}
                       />
                       <Input
-                        label="Full name"
+                        label={t('fullName')}
                         {...register('ownerName')}
-                        placeholder="John Doe"
+                        placeholder={t('namePlaceholder')}
                         error={errors.ownerName?.message}
                         icon={<User className="h-5 w-5 icon-flat" />}
                       />
                       <Input
-                        label="Password"
+                        label={t('password')}
                         {...register('password')}
                         type="password"
-                        placeholder="••••••••"
+                        placeholder={t('passwordPlaceholder')}
                         error={errors.password?.message}
                         icon={<Lock className="h-5 w-5 icon-flat" />}
                       />
                       <Input
-                        label="Confirm password"
+                        label={t('confirmPassword')}
                         {...register('confirmPassword')}
                         type="password"
-                        placeholder="••••••••"
+                        placeholder={t('passwordPlaceholder')}
                         error={errors.confirmPassword?.message}
                         icon={<Lock className="h-5 w-5 icon-flat" />}
                       />
                       <Button type="button" variant="primary" onClick={() => void handleNext()} fullWidth>
-                        Continue
+                        {tCommon('continue')}
                       </Button>
                     </>
                   )}
@@ -236,10 +251,10 @@ function AcceptOrganizationInviteContent() {
                       />
                       <div className="flex gap-3">
                         <Button type="button" variant="outline" onClick={() => setStep(1)}>
-                          Back
+                          {tCommon('back')}
                         </Button>
                         <Button type="submit" variant="primary" isLoading={submitting} fullWidth>
-                          Activate organization
+                          {t('activateOrganization')}
                         </Button>
                       </div>
                     </>
@@ -254,15 +269,18 @@ function AcceptOrganizationInviteContent() {
   );
 }
 
+function AcceptOrganizationInviteFallback() {
+  const t = useTranslations('auth');
+  return (
+    <div className="min-h-screen app-web-bg flex items-center justify-center">
+      <p className="text-sm text-text-secondary">{t('loadingInvitation')}</p>
+    </div>
+  );
+}
+
 export default function AcceptOrganizationInvitePage() {
   return (
-    <Suspense
-      fallback={
-        <div className="min-h-screen app-web-bg flex items-center justify-center">
-          <p className="text-sm text-text-secondary">Loading invitation...</p>
-        </div>
-      }
-    >
+    <Suspense fallback={<AcceptOrganizationInviteFallback />}>
       <AcceptOrganizationInviteContent />
     </Suspense>
   );
diff --git a/frontend/src/app/[locale]/(public)/login/page.tsx b/frontend/src/app/[locale]/(public)/login/page.tsx
new file mode 100644
index 0000000..fc2f8ff
--- /dev/null
+++ b/frontend/src/app/[locale]/(public)/login/page.tsx
@@ -0,0 +1,144 @@
+'use client';
+
+import { useState, useEffect, useMemo } from 'react';
+import { useRouter } from '@/i18n/navigation';
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import * as z from 'zod';
+import { useTranslations } from 'next-intl';
+import { Link } from '@/i18n/navigation';
+import { Mail, Lock } from 'lucide-react';
+import { useAuth } from '@/lib/hooks/useAuth';
+import { Button } from '@/components/ui/shared/Button';
+import { Input } from '@/components/ui/shared/Input';
+import { TopBarControls } from '@/components/ui/shared/TopBarControls';
+
+type LoginForm = {
+  email: string;
+  password: string;
+};
+
+export default function LoginPage() {
+  const t = useTranslations('auth');
+  const tCommon = useTranslations('common');
+  const tValidation = useTranslations('validation');
+  const { login, isLoading, user, isAuthReady } = useAuth();
+  const router = useRouter();
+  const [error, setError] = useState<string | null>(null);
+
+  const loginSchema = useMemo(
+    () =>
+      z.object({
+        email: z.string().email(tValidation('emailInvalid')),
+        password: z.string().min(1, tValidation('passwordRequired')),
+      }),
+    [tValidation],
+  );
+
+  useEffect(() => {
+    if (isAuthReady && user) {
+      router.push('/today');
+    }
+  }, [user, isAuthReady, router]);
+
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+  } = useForm<LoginForm>({
+    resolver: zodResolver(loginSchema),
+  });
+
+  const onSubmit = async (data: LoginForm) => {
+    try {
+      setError(null);
+      await login(data.email, data.password);
+    } catch (err: unknown) {
+      const message = err instanceof Error ? err.message : t('invalidCredentials');
+      setError(message || t('invalidCredentials'));
+    }
+  };
+
+  if (!isAuthReady) {
+    return (
+      <div className="min-h-screen app-web-bg flex items-center justify-center">
+        <p className="text-text-secondary">{tCommon('loading')}</p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="relative min-h-screen app-web-bg flex flex-col justify-center py-12 sm:px-6 lg:px-8">
+      <div className="absolute top-4 right-4">
+        <TopBarControls />
+      </div>
+
+      <div className="sm:mx-auto sm:w-full sm:max-w-md">
+        <Link href="/" className="flex justify-center">
+          <span className="text-3xl font-semibold text-text-primary">{tCommon('appName')}</span>
+        </Link>
+        <h2 className="mt-6 text-center text-3xl font-semibold text-text-primary">
+          {t('signInTitle')}
+        </h2>
+        <p className="mt-2 text-center text-sm text-text-secondary">
+          {tCommon('or')}{' '}
+          <Link href="/register" className="font-medium text-primary hover:opacity-90">
+            {t('startTrialLink')}
+          </Link>
+        </p>
+      </div>
+
+      <div className="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
+        <div className="surface-card py-8 px-4 sm:px-10">
+          <form className="space-y-6" onSubmit={handleSubmit(onSubmit)}>
+            <Input
+              label={t('email')}
+              {...register('email')}
+              type="email"
+              placeholder={t('emailPlaceholder')}
+              error={errors.email?.message}
+              icon={<Mail className="h-5 w-5 icon-flat" />}
+            />
+            <Input
+              label={t('password')}
+              {...register('password')}
+              type="password"
+              placeholder={t('passwordPlaceholder')}
+              error={errors.password?.message}
+              icon={<Lock className="h-5 w-5 icon-flat" />}
+            />
+
+            <div className="flex items-center justify-between">
+              <div className="flex items-center">
+                <input
+                  id="remember-me"
+                  name="remember-me"
+                  type="checkbox"
+                  className="h-4 w-4 rounded border-border bg-background-secondary text-primary focus:ring-primary/40"
+                />
+                <label htmlFor="remember-me" className="ml-2 block text-sm text-text-secondary">
+                  {t('rememberMe')}
+                </label>
+              </div>
+              <div className="text-sm">
+                <Link href="/forgot-password" className="font-medium text-primary hover:opacity-90">
+                  {t('forgotPassword')}
+                </Link>
+              </div>
+            </div>
+
+            {error && (
+              <div className="p-3 bg-red-50 border border-red-200 rounded-lg">
+                <p className="text-sm text-red-600">{error}</p>
+              </div>
+            )}
+
+            <Button type="submit" variant="primary" isLoading={isLoading} fullWidth>
+              {t('signIn')}
+            </Button>
+          </form>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/src/app/(public)/page.tsx b/frontend/src/app/[locale]/(public)/page.tsx
similarity index 64%
rename from frontend/src/app/(public)/page.tsx
rename to frontend/src/app/[locale]/(public)/page.tsx
index a654924..4ce81db 100644
--- a/frontend/src/app/(public)/page.tsx
+++ b/frontend/src/app/[locale]/(public)/page.tsx
@@ -1,120 +1,112 @@
 'use client';
 
-import Link from 'next/link';
+import { useTranslations } from 'next-intl';
+import { Link } from '@/i18n/navigation';
 import { useAuth } from '@/lib/hooks/useAuth';
 import { Button } from '@/components/ui/shared/Button';
-import { ThemeToggle } from '@/components/ui/shared/ThemeToggle';
+import { TopBarControls } from '@/components/ui/shared/TopBarControls';
 import { Building2, Beaker, Calendar, Shield, Clock, Users } from 'lucide-react';
 
 export default function HomePage() {
+  const t = useTranslations('landing');
+  const tAuth = useTranslations('auth');
+  const tCommon = useTranslations('common');
   const { user } = useAuth();
 
   return (
     <div className="min-h-screen app-web-bg text-text-primary">
-
-      {/* Header */}
       <header className="border-b border-border/70 bg-background-secondary/65 backdrop-blur-sm fixed top-0 w-full z-10">
         <div className="container mx-auto px-4 py-4 flex justify-between items-center">
           <div className="text-2xl font-semibold text-text-primary">
-            DyoLink
+            {tCommon('appName')}
           </div>
 
           <div className="flex items-center gap-3">
-            <ThemeToggle />
+            <TopBarControls />
             {user ? (
               <Link href="/today">
-                <Button variant="primary">Dashboard</Button>
+                <Button variant="primary">{tAuth('dashboard')}</Button>
               </Link>
             ) : (
               <>
                 <Link href="/login">
-                  <Button variant="outline">Login</Button>
+                  <Button variant="outline">{tAuth('login')}</Button>
                 </Link>
                 <Link href="/register">
-                  <Button variant="primary">Start Trial</Button>
+                  <Button variant="primary">{tAuth('startTrial')}</Button>
                 </Link>
               </>
             )}
           </div>
-
         </div>
       </header>
 
-      {/* Hero Section */}
       <main className="container mx-auto px-4 pt-32 pb-20">
-
         <div className="max-w-4xl mx-auto text-center">
-
           <h1 className="text-5xl md:text-6xl font-semibold mb-6 leading-tight">
-            Connect Dental Clinics & Labs
-            <span className="text-primary"> Seamlessly</span>
+            {t('heroTitle')}
+            <span className="text-primary"> {t('heroHighlight')}</span>
           </h1>
 
           <p className="text-lg text-text-secondary mb-8 max-w-2xl mx-auto">
-            Streamline communication between dental professionals. Start with
-            a 30-day free trial, no credit card required.
+            {t('heroSubtitle')}
           </p>
 
           {!user && (
             <Link href="/register">
               <Button size="lg" variant="primary" className="px-8">
-                Start Free Trial
+                {tAuth('startFreeTrial')}
               </Button>
             </Link>
           )}
         </div>
 
-        {/* Features */}
         <div className="mt-20 grid md:grid-cols-3 gap-6">
           <FeatureCard
             icon={<Building2 className="h-6 w-6 icon-flat" />}
-            title="For Clinics"
-            description="Manage patients, appointments, and send cases to labs instantly."
+            title={t('featureClinicsTitle')}
+            description={t('featureClinicsDescription')}
           />
           <FeatureCard
             icon={<Beaker className="h-6 w-6 icon-flat" />}
-            title="For Labs"
-            description="Receive cases, track progress, and communicate with clinics."
+            title={t('featureLabsTitle')}
+            description={t('featureLabsDescription')}
           />
           <FeatureCard
             icon={<Users className="h-6 w-6 icon-flat" />}
-            title="Team Management"
-            description="Add up to 5 team members during trial. Scale as you grow."
+            title={t('featureTeamTitle')}
+            description={t('featureTeamDescription')}
           />
           <FeatureCard
             icon={<Calendar className="h-6 w-6 icon-flat" />}
-            title="30-Day Trial"
-            description="Full access to all features. No credit card required."
+            title={t('featureTrialTitle')}
+            description={t('featureTrialDescription')}
           />
           <FeatureCard
             icon={<Clock className="h-6 w-6 icon-flat" />}
-            title="Real-time Updates"
-            description="Get instant notifications on case status changes."
+            title={t('featureRealtimeTitle')}
+            description={t('featureRealtimeDescription')}
           />
           <FeatureCard
             icon={<Shield className="h-6 w-6 icon-flat" />}
-            title="Secure & Compliant"
-            description="HIPAA-compliant with enterprise-grade security."
+            title={t('featureSecurityTitle')}
+            description={t('featureSecurityDescription')}
           />
         </div>
-
       </main>
 
-      {/* Footer */}
       <footer className="border-t border-border/70 bg-background-secondary/80">
         <div className="container mx-auto px-4 py-8 flex flex-col md:flex-row justify-between items-center text-sm text-text-secondary">
-
-          <div>© 2026 DyoLink. All rights reserved.</div>
+          <div>{t('footerCopyright')}</div>
 
           <div className="flex gap-6 mt-4 md:mt-0">
             <Link href="/terms" className="hover:text-primary transition-colors">
-              Terms & Conditions
+              {t('termsAndConditions')}
             </Link>
             <Link href="/privacy" className="hover:text-primary transition-colors">
-              Privacy Policy
+              {tAuth('privacyPolicy')}
             </Link>
           </div>
-
         </div>
       </footer>
     </div>
@@ -132,19 +124,9 @@ function FeatureCard({
 }) {
   return (
     <div className="surface-card p-5 transition-all hover:border-primary/70 hover:shadow-[0_0_20px_rgba(0,194,255,0.12)]">
-
-      <div className="text-primary mb-4">
-        {icon}
-      </div>
-
-      <h3 className="text-base font-medium text-text-primary mb-2">
-        {title}
-      </h3>
-
-      <p className="text-sm text-text-secondary">
-        {description}
-      </p>
-
+      <div className="text-primary mb-4">{icon}</div>
+      <h3 className="text-base font-medium text-text-primary mb-2">{title}</h3>
+      <p className="text-sm text-text-secondary">{description}</p>
     </div>
   );
-}
\ No newline at end of file
+}
diff --git a/frontend/src/app/[locale]/(public)/register/page.tsx b/frontend/src/app/[locale]/(public)/register/page.tsx
new file mode 100644
index 0000000..6523dd2
--- /dev/null
+++ b/frontend/src/app/[locale]/(public)/register/page.tsx
@@ -0,0 +1,221 @@
+'use client';
+
+import { useMemo, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import * as z from 'zod';
+import { useTranslations } from 'next-intl';
+import { Link } from '@/i18n/navigation';
+import { Mail, Lock, User } from 'lucide-react';
+import { useAuth } from '@/lib/hooks/useAuth';
+import { OrganizationDetailsFields } from '@/components/ui/auth/OrganizationDetailsFields';
+import { RegistrationProgressSteps } from '@/components/ui/auth/RegistrationProgressSteps';
+import { Button } from '@/components/ui/shared/Button';
+import { Input } from '@/components/ui/shared/Input';
+import { TopBarControls } from '@/components/ui/shared/TopBarControls';
+
+type RegisterForm = {
+  name: string;
+  email: string;
+  password: string;
+  confirmPassword: string;
+  organizationName: string;
+  organizationEmail: string;
+  organizationType: 'CLINIC' | 'LAB';
+};
+
+export default function RegisterPage() {
+  const t = useTranslations('auth');
+  const tCommon = useTranslations('common');
+  const tValidation = useTranslations('validation');
+  const { registerTrial, isLoading } = useAuth();
+  const [step, setStep] = useState(1);
+  const [error, setError] = useState<string | null>(null);
+
+  const registerSchema = useMemo(
+    () =>
+      z
+        .object({
+          name: z.string().min(2, tValidation('nameMinLength')),
+          email: z.string().email(tValidation('emailInvalid')),
+          password: z
+            .string()
+            .min(8, tValidation('passwordMinLength'))
+            .regex(/[A-Z]/, tValidation('passwordUppercase'))
+            .regex(/[0-9]/, tValidation('passwordNumber')),
+          confirmPassword: z.string(),
+          organizationName: z.string().min(2, tValidation('organizationNameMinLength')),
+          organizationEmail: z.string().email(tValidation('organizationEmailInvalid')),
+          organizationType: z.enum(['CLINIC', 'LAB'], {
+            message: tValidation('organizationTypeRequired'),
+          }),
+        })
+        .refine((data) => data.password === data.confirmPassword, {
+          message: tValidation('passwordsDoNotMatch'),
+          path: ['confirmPassword'],
+        }),
+    [tValidation],
+  );
+
+  const {
+    register,
+    handleSubmit,
+    watch,
+    formState: { errors },
+    trigger,
+    setValue,
+  } = useForm<RegisterForm>({
+    resolver: zodResolver(registerSchema),
+    mode: 'onChange',
+  });
+
+  const organizationType = watch('organizationType');
+
+  const handleNext = async () => {
+    const fieldsToValidate =
+      step === 1
+        ? (['name', 'email', 'password', 'confirmPassword'] as const)
+        : (['organizationName', 'organizationEmail', 'organizationType'] as const);
+
+    const isValid = await trigger([...fieldsToValidate]);
+    if (isValid) {
+      setStep(step + 1);
+    }
+  };
+
+  const onSubmit = async (data: RegisterForm) => {
+    try {
+      setError(null);
+      await registerTrial(
+        data.email,
+        data.password,
+        data.name,
+        data.organizationName,
+        data.organizationEmail,
+        data.organizationType,
+      );
+    } catch (err: unknown) {
+      const message = err instanceof Error ? err.message : t('registrationFailed');
+      setError(message || t('registrationFailed'));
+    }
+  };
+
+  return (
+    <div className="relative min-h-screen app-web-bg flex flex-col justify-center py-12 sm:px-6 lg:px-8">
+      <div className="absolute top-4 right-4">
+        <TopBarControls />
+      </div>
+
+      <div className="sm:mx-auto sm:w-full sm:max-w-md">
+        <Link href="/" className="flex justify-center">
+          <span className="text-3xl font-semibold text-text-primary">{tCommon('appName')}</span>
+        </Link>
+        <h2 className="mt-6 text-center text-3xl font-semibold text-text-primary">
+          {t('registerTitle')}
+        </h2>
+        <p className="mt-2 text-center text-sm text-text-secondary">
+          {t('registerPrompt')}{' '}
+          <Link href="/login" className="font-medium text-primary hover:opacity-90">
+            {t('signInLink')}
+          </Link>
+        </p>
+      </div>
+
+      <div className="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
+        <div className="surface-card py-8 px-4 sm:px-10">
+          <RegistrationProgressSteps step={step} />
+          <div className="mb-6 p-4 bg-primary-soft rounded-[var(--radius-md)] border border-primary/35">
+            <h3 className="text-sm font-medium text-text-primary mb-2">{t('trialIncludes')}</h3>
+            <ul className="text-sm text-text-secondary space-y-1">
+              <li className="flex items-center">
+                <span className="mr-2">✓</span> {t('trialTeamMembers')}
+              </li>
+              <li className="flex items-center">
+                <span className="mr-2">✓</span> {t('trialFullAccess')}
+              </li>
+              <li className="flex items-center">
+                <span className="mr-2">✓</span> {t('trialNoCard')}
+              </li>
+            </ul>
+          </div>
+
+          <form onSubmit={handleSubmit(onSubmit)} className="space-y-6">
+            {step === 1 && (
+              <>
+                <Input
+                  label={t('fullName')}
+                  {...register('name')}
+                  placeholder={t('namePlaceholder')}
+                  error={errors.name?.message}
+                  icon={<User className="h-5 w-5 icon-flat" />}
+                />
+                <Input
+                  label={t('email')}
+                  {...register('email')}
+                  type="email"
+                  placeholder={t('emailPlaceholder')}
+                  error={errors.email?.message}
+                  icon={<Mail className="h-5 w-5 icon-flat" />}
+                />
+                <Input
+                  label={t('password')}
+                  {...register('password')}
+                  type="password"
+                  placeholder={t('passwordPlaceholder')}
+                  error={errors.password?.message}
+                  icon={<Lock className="h-5 w-5 icon-flat" />}
+                />
+                <Input
+                  label={t('confirmPassword')}
+                  {...register('confirmPassword')}
+                  type="password"
+                  placeholder={t('passwordPlaceholder')}
+                  error={errors.confirmPassword?.message}
+                  icon={<Lock className="h-5 w-5 icon-flat" />}
+                />
+                <Button type="button" variant="primary" onClick={handleNext} fullWidth>
+                  {tCommon('continue')}
+                </Button>
+              </>
+            )}
+
+            {step === 2 && (
+              <>
+                <OrganizationDetailsFields
+                  register={register as never}
+                  errors={errors as never}
+                  organizationType={organizationType}
+                  setValue={setValue as never}
+                />
+                {error && (
+                  <div className="p-3 bg-red-950/30 border border-red-600/40 rounded-[var(--radius-md)]">
+                    <p className="text-sm text-red-600">{error}</p>
+                  </div>
+                )}
+                <div className="flex gap-3">
+                  <Button type="button" variant="outline" onClick={() => setStep(1)}>
+                    {tCommon('back')}
+                  </Button>
+                  <Button type="submit" variant="primary" isLoading={isLoading} fullWidth>
+                    {t('startMyFreeTrial')}
+                  </Button>
+                </div>
+              </>
+            )}
+          </form>
+
+          <p className="mt-6 text-xs text-center text-text-muted">
+            {t('termsIntro')}{' '}
+            <Link href="/terms" className="text-primary hover:opacity-90">
+              {t('termsOfService')}
+            </Link>{' '}
+            {tCommon('and')}{' '}
+            <Link href="/privacy" className="text-primary hover:opacity-90">
+              {t('privacyPolicy')}
+            </Link>
+          </p>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/src/app/(public)/select-organization/page.tsx b/frontend/src/app/[locale]/(public)/select-organization/page.tsx
similarity index 100%
rename from frontend/src/app/(public)/select-organization/page.tsx
rename to frontend/src/app/[locale]/(public)/select-organization/page.tsx
diff --git a/frontend/src/app/[locale]/layout.tsx b/frontend/src/app/[locale]/layout.tsx
new file mode 100644
index 0000000..570d0ab
--- /dev/null
+++ b/frontend/src/app/[locale]/layout.tsx
@@ -0,0 +1,56 @@
+import type { Metadata } from 'next';
+import { NextIntlClientProvider } from 'next-intl';
+import { getMessages, setRequestLocale } from 'next-intl/server';
+import { hasLocale } from 'next-intl';
+import { notFound } from 'next/navigation';
+import Script from 'next/script';
+import '@/styles/globals.css';
+import '@/styles/background-web.css';
+import { AuthProvider } from '@/lib/hooks/useAuth';
+import { THEME_STORAGE_KEY } from '@/lib/theme';
+import { routing, localeHtmlLang } from '@/i18n/routing';
+import { LocaleSync } from '@/components/i18n/LocaleSync';
+
+export const metadata: Metadata = {
+  title: 'DyoLink - Dental Clinic & Lab Communication Hub',
+  description: 'Connect dental clinics and laboratories seamlessly',
+};
+
+export function generateStaticParams() {
+  return routing.locales.map((locale) => ({ locale }));
+}
+
+export default async function LocaleLayout({
+  children,
+  params,
+}: {
+  children: React.ReactNode;
+  params: Promise<{ locale: string }>;
+}) {
+  const { locale } = await params;
+
+  if (!hasLocale(routing.locales, locale)) {
+    notFound();
+  }
+
+  setRequestLocale(locale);
+  const messages = await getMessages();
+
+  const themeInit = `(function(){try{var k=${JSON.stringify(THEME_STORAGE_KEY)};var t=localStorage.getItem(k);document.documentElement.setAttribute('data-theme',t==='light'||t==='dark'?t:'dark');}catch(e){document.documentElement.setAttribute('data-theme','dark');}})();`;
+
+  return (
+    <html lang={localeHtmlLang(locale)} dir="ltr" suppressHydrationWarning>
+      <body>
+        <Script id="theme-init" strategy="beforeInteractive">
+          {themeInit}
+        </Script>
+        <NextIntlClientProvider messages={messages}>
+          <AuthProvider>
+            <LocaleSync />
+            {children}
+          </AuthProvider>
+        </NextIntlClientProvider>
+      </body>
+    </html>
+  );
+}
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
index eecf822..cd4a053 100644
--- a/frontend/src/app/layout.tsx
+++ b/frontend/src/app/layout.tsx
@@ -1,33 +1,7 @@
-// src/app/layout.tsx
-import type { Metadata } from 'next';
-import Script from 'next/script';
-import '@/styles/globals.css';
-import '@/styles/background-web.css';
-import { AuthProvider } from '@/lib/hooks/useAuth';
-import { THEME_STORAGE_KEY } from '@/lib/theme';
-
-export const metadata: Metadata = {
-  title: 'DyoLink - Dental Clinic & Lab Communication Hub',
-  description: 'Connect dental clinics and laboratories seamlessly',
-};
-
 export default function RootLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-  const themeInit = `(function(){try{var k=${JSON.stringify(THEME_STORAGE_KEY)};var t=localStorage.getItem(k);document.documentElement.setAttribute('data-theme',t==='light'||t==='dark'?t:'dark');}catch(e){document.documentElement.setAttribute('data-theme','dark');}})();`;
-
-  return (
-    <html lang="en" suppressHydrationWarning>
-      <body>
-        <Script id="theme-init" strategy="beforeInteractive">
-          {themeInit}
-        </Script>
-        <AuthProvider>
-          {children}
-        </AuthProvider>
-      </body>
-    </html>
-  );
-}
\ No newline at end of file
+  return children;
+}
diff --git a/frontend/src/components/i18n/LocaleSync.tsx b/frontend/src/components/i18n/LocaleSync.tsx
new file mode 100644
index 0000000..cc59e66
--- /dev/null
+++ b/frontend/src/components/i18n/LocaleSync.tsx
@@ -0,0 +1,27 @@
+'use client';
+
+import { useEffect } from 'react';
+import { useLocale } from 'next-intl';
+import { useAuth } from '@/lib/hooks/useAuth';
+import { usePathname, useRouter } from '@/i18n/navigation';
+import type { AppLocale } from '@/i18n/routing';
+import { isAppLocale } from '@/i18n/routing';
+
+/** Redirect authenticated users to their saved profile language when it differs from the URL. */
+export function LocaleSync() {
+  const locale = useLocale();
+  const router = useRouter();
+  const pathname = usePathname();
+  const { user, isAuthReady } = useAuth();
+
+  useEffect(() => {
+    if (!isAuthReady || !user?.language) return;
+
+    const preferred = user.language;
+    if (!isAppLocale(preferred) || preferred === locale) return;
+
+    router.replace(pathname, { locale: preferred as AppLocale });
+  }, [isAuthReady, user?.language, locale, pathname, router]);
+
+  return null;
+}
diff --git a/frontend/src/components/staff/StaffWorkingHoursStep.tsx b/frontend/src/components/staff/StaffWorkingHoursStep.tsx
new file mode 100644
index 0000000..e972af7
--- /dev/null
+++ b/frontend/src/components/staff/StaffWorkingHoursStep.tsx
@@ -0,0 +1,103 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { useTranslations } from 'next-intl';
+import { WorkingHoursEditor } from '@/components/staff/WorkingHoursEditor';
+import {
+  blocksFromEditorDays,
+  editorDaysFromBlocks,
+  emptyWorkingHoursEditorDays,
+  validateEditorDays,
+  type WorkingHoursEditorDay,
+} from '@/components/staff/workingHours';
+
+interface StaffWorkingHoursStepProps {
+  days: WorkingHoursEditorDay[];
+  autoRepeatWeekly: boolean;
+  onDaysChange: (days: WorkingHoursEditorDay[]) => void;
+  onAutoRepeatWeeklyChange: (value: boolean) => void;
+  onValidationChange?: (error: string | null) => void;
+  disabled?: boolean;
+}
+
+export function StaffWorkingHoursStep({
+  days,
+  autoRepeatWeekly,
+  onDaysChange,
+  onAutoRepeatWeeklyChange,
+  onValidationChange,
+  disabled,
+}: StaffWorkingHoursStepProps) {
+  const t = useTranslations('staff.workingHours');
+
+  useEffect(() => {
+    onValidationChange?.(validateEditorDays(days, t));
+  }, [days, onValidationChange, t]);
+
+  return (
+    <div className="space-y-3">
+      <div className="rounded-[var(--radius-md)] border border-primary/25 bg-primary/5 px-3 py-3">
+        <p className="text-sm text-text-primary font-medium">{t('recommendedTitle')}</p>
+        <p className="text-sm text-text-secondary mt-1">{t('recommendedBody')}</p>
+      </div>
+      <WorkingHoursEditor
+        days={days}
+        autoRepeatWeekly={autoRepeatWeekly}
+        onDaysChange={onDaysChange}
+        onAutoRepeatWeeklyChange={onAutoRepeatWeeklyChange}
+        disabled={disabled}
+      />
+    </div>
+  );
+}
+
+export function createDefaultWorkingHoursState() {
+  return {
+    days: emptyWorkingHoursEditorDays(),
+    autoRepeatWeekly: true,
+  };
+}
+
+export function workingHoursPayloadFromState(state: {
+  days: WorkingHoursEditorDay[];
+  autoRepeatWeekly: boolean;
+}) {
+  return {
+    autoRepeatWeekly: state.autoRepeatWeekly,
+    blocks: blocksFromEditorDays(state.days),
+  };
+}
+
+export function workingHoursStateFromApi(data: {
+  autoRepeatWeekly: boolean;
+  blocks: { dayOfWeek: number; startMinute: number; endMinute: number; sortOrder?: number }[];
+}) {
+  const hasBlocks = data.blocks.length > 0;
+  return {
+    days: hasBlocks ? editorDaysFromBlocks(data.blocks) : emptyWorkingHoursEditorDays(),
+    autoRepeatWeekly: data.autoRepeatWeekly,
+  };
+}
+
+export function useWorkingHoursForm(initial?: {
+  days: WorkingHoursEditorDay[];
+  autoRepeatWeekly: boolean;
+}) {
+  const [days, setDays] = useState(initial?.days ?? emptyWorkingHoursEditorDays());
+  const [autoRepeatWeekly, setAutoRepeatWeekly] = useState(initial?.autoRepeatWeekly ?? true);
+  const [validationError, setValidationError] = useState<string | null>(null);
+
+  return {
+    days,
+    setDays,
+    autoRepeatWeekly,
+    setAutoRepeatWeekly,
+    validationError,
+    setValidationError,
+    reset(next?: { days: WorkingHoursEditorDay[]; autoRepeatWeekly: boolean }) {
+      setDays(next?.days ?? emptyWorkingHoursEditorDays());
+      setAutoRepeatWeekly(next?.autoRepeatWeekly ?? true);
+      setValidationError(null);
+    },
+  };
+}
diff --git a/frontend/src/components/staff/WorkingHoursEditor.tsx b/frontend/src/components/staff/WorkingHoursEditor.tsx
new file mode 100644
index 0000000..0629225
--- /dev/null
+++ b/frontend/src/components/staff/WorkingHoursEditor.tsx
@@ -0,0 +1,171 @@
+'use client';
+
+import { Plus, Trash2 } from 'lucide-react';
+import { useTranslations } from 'next-intl';
+import { Button } from '@/components/ui/shared/Button';
+import { Checkbox } from '@/components/ui/shared/Checkbox';
+import {
+  MINUTES_PER_DAY,
+  WEEKDAY_KEYS,
+  minutesToTimeInput,
+  timeInputToMinutes,
+  type WorkingHoursEditorDay,
+} from '@/components/staff/workingHours';
+
+interface WorkingHoursEditorProps {
+  days: WorkingHoursEditorDay[];
+  autoRepeatWeekly: boolean;
+  onDaysChange: (days: WorkingHoursEditorDay[]) => void;
+  onAutoRepeatWeeklyChange: (value: boolean) => void;
+  disabled?: boolean;
+}
+
+const timeInputClass =
+  'w-full rounded-[var(--radius-md)] border border-border bg-background-secondary/90 text-text-primary px-2 py-1.5 text-sm focus:outline-none focus:ring-2 focus:ring-primary/35';
+
+export function WorkingHoursEditor({
+  days,
+  autoRepeatWeekly,
+  onDaysChange,
+  onAutoRepeatWeeklyChange,
+  disabled = false,
+}: WorkingHoursEditorProps) {
+  const t = useTranslations('staff.workingHours');
+
+  function updateDay(dayOfWeek: number, patch: Partial<WorkingHoursEditorDay>) {
+    onDaysChange(
+      days.map((day) => (day.dayOfWeek === dayOfWeek ? { ...day, ...patch } : day)),
+    );
+  }
+
+  function updateShift(
+    dayOfWeek: number,
+    shiftIndex: number,
+    field: 'startMinute' | 'endMinute',
+    value: string,
+  ) {
+    const minutes = timeInputToMinutes(value);
+    if (minutes == null) return;
+    const day = days.find((d) => d.dayOfWeek === dayOfWeek);
+    if (!day) return;
+    const shifts = day.shifts.map((shift, index) =>
+      index === shiftIndex ? { ...shift, [field]: minutes } : shift,
+    );
+    updateDay(dayOfWeek, { shifts });
+  }
+
+  function addShift(dayOfWeek: number) {
+    const day = days.find((d) => d.dayOfWeek === dayOfWeek);
+    if (!day) return;
+    const last = day.shifts[day.shifts.length - 1];
+    const startMinute = last ? Math.min(last.endMinute + 60, MINUTES_PER_DAY - 60) : 9 * 60;
+    updateDay(dayOfWeek, {
+      shifts: [...day.shifts, { startMinute, endMinute: Math.min(startMinute + 120, MINUTES_PER_DAY) }],
+    });
+  }
+
+  function removeShift(dayOfWeek: number, shiftIndex: number) {
+    const day = days.find((d) => d.dayOfWeek === dayOfWeek);
+    if (!day || day.shifts.length <= 1) return;
+    updateDay(dayOfWeek, {
+      shifts: day.shifts.filter((_, index) => index !== shiftIndex),
+    });
+  }
+
+  return (
+    <div className="space-y-4">
+      <p className="text-sm text-text-secondary">{t('intro')}</p>
+
+      <div className="space-y-3">
+        {days.map((day) => (
+          <div
+            key={day.dayOfWeek}
+            className="rounded-[var(--radius-md)] border border-border/60 bg-background-card/40 px-3 py-3 space-y-3"
+          >
+            <div className="flex items-center justify-between gap-3">
+              <span className="text-sm font-medium text-text-primary w-10">
+                {t(WEEKDAY_KEYS[day.dayOfWeek])}
+              </span>
+              <Checkbox
+                checked={day.isWorking}
+                disabled={disabled}
+                label={t('workingDay')}
+                onChange={(checked) => {
+                  updateDay(day.dayOfWeek, {
+                    isWorking: checked,
+                    shifts: checked
+                      ? day.shifts.length > 0
+                        ? day.shifts
+                        : [{ startMinute: 9 * 60, endMinute: 17 * 60 }]
+                      : day.shifts,
+                  });
+                }}
+              />
+            </div>
+
+            {day.isWorking && (
+              <div className="space-y-2 pl-0 sm:pl-10">
+                {day.shifts.map((shift, shiftIndex) => (
+                  <div key={shiftIndex} className="flex items-end gap-2">
+                    <div className="flex-1">
+                      <label className="block text-xs text-text-muted mb-1">{t('start')}</label>
+                      <input
+                        type="time"
+                        step={300}
+                        disabled={disabled}
+                        className={timeInputClass}
+                        value={minutesToTimeInput(shift.startMinute)}
+                        onChange={(e) =>
+                          updateShift(day.dayOfWeek, shiftIndex, 'startMinute', e.target.value)
+                        }
+                      />
+                    </div>
+                    <div className="flex-1">
+                      <label className="block text-xs text-text-muted mb-1">{t('end')}</label>
+                      <input
+                        type="time"
+                        step={300}
+                        disabled={disabled}
+                        className={timeInputClass}
+                        value={minutesToTimeInput(shift.endMinute)}
+                        onChange={(e) =>
+                          updateShift(day.dayOfWeek, shiftIndex, 'endMinute', e.target.value)
+                        }
+                      />
+                    </div>
+                    <button
+                      type="button"
+                      disabled={disabled || day.shifts.length <= 1}
+                      className="p-2 rounded-md text-text-muted hover:text-red-500 hover:bg-red-500/10 disabled:opacity-40 disabled:cursor-not-allowed"
+                      aria-label={t('removeShift')}
+                      onClick={() => removeShift(day.dayOfWeek, shiftIndex)}
+                    >
+                      <Trash2 className="w-4 h-4" />
+                    </button>
+                  </div>
+                ))}
+                <Button
+                  type="button"
+                  variant="outline"
+                  size="sm"
+                  disabled={disabled}
+                  onClick={() => addShift(day.dayOfWeek)}
+                >
+                  <Plus className="w-3.5 h-3.5 mr-1" />
+                  {t('addShift')}
+                </Button>
+              </div>
+            )}
+          </div>
+        ))}
+      </div>
+
+      <Checkbox
+        checked={autoRepeatWeekly}
+        disabled={disabled}
+        label={t('autoRepeatWeekly')}
+        onChange={onAutoRepeatWeeklyChange}
+      />
+    </div>
+  );
+}
diff --git a/frontend/src/components/staff/staff-permission-form.ts b/frontend/src/components/staff/staff-permission-form.ts
index 54787f2..a14ff02 100644
--- a/frontend/src/components/staff/staff-permission-form.ts
+++ b/frontend/src/components/staff/staff-permission-form.ts
@@ -4,27 +4,30 @@
  */
 
 export const STAFF_FEATURE_GROUPS = [
-  { label: 'Today', read: 'TAB_TODAY_READ', edit: 'TAB_TODAY_EDIT' },
-  { label: 'Staff', read: 'TAB_STAFF_READ', edit: 'TAB_STAFF_EDIT' },
-  { label: 'Organizations', read: 'TAB_ORGANIZATIONS_READ', edit: 'TAB_ORGANIZATIONS_EDIT' },
-  { label: 'Patients', read: 'TAB_PATIENTS_READ', edit: 'TAB_PATIENTS_EDIT' },
-  { label: 'Appointment', read: 'TAB_APPOINTMENTS_READ', edit: 'TAB_APPOINTMENTS_EDIT' },
-  { label: 'Treatment', read: 'TAB_TREATMENT_READ', edit: 'TAB_TREATMENT_EDIT' },
-  { label: 'Billing', read: 'TAB_BILLING_READ', edit: 'TAB_BILLING_EDIT' },
-  { label: 'Reports', read: 'TAB_REPORTS_READ', edit: 'TAB_REPORTS_EDIT' },
+  { labelKey: 'featureToday', read: 'TAB_TODAY_READ', edit: 'TAB_TODAY_EDIT' },
+  { labelKey: 'featureStaff', read: 'TAB_STAFF_READ', edit: 'TAB_STAFF_EDIT' },
+  { labelKey: 'featureOrganizations', read: 'TAB_ORGANIZATIONS_READ', edit: 'TAB_ORGANIZATIONS_EDIT' },
+  { labelKey: 'featurePatients', read: 'TAB_PATIENTS_READ', edit: 'TAB_PATIENTS_EDIT' },
+  { labelKey: 'featureAppointment', read: 'TAB_APPOINTMENTS_READ', edit: 'TAB_APPOINTMENTS_EDIT' },
+  { labelKey: 'featureTreatment', read: 'TAB_TREATMENT_READ', edit: 'TAB_TREATMENT_EDIT' },
+  { labelKey: 'featureBilling', read: 'TAB_BILLING_READ', edit: 'TAB_BILLING_EDIT' },
+  { labelKey: 'featureReports', read: 'TAB_REPORTS_READ', edit: 'TAB_REPORTS_EDIT' },
 ] as const;
 
 export type FeaturePermState = Record<string, { read: boolean; edit: boolean }>;
 export type OrgType = 'CLINIC' | 'LAB' | null | undefined;
 
+type StaffFeaturesTranslate = (key: string) => string;
+
 export function resolveStaffFeatureLabel(
   group: (typeof STAFF_FEATURE_GROUPS)[number],
   organizationType: OrgType,
+  t: StaffFeaturesTranslate,
 ): string {
   if (group.read === 'TAB_ORGANIZATIONS_READ') {
-    return organizationType === 'LAB' ? 'Clinics' : 'Labs';
+    return organizationType === 'LAB' ? t('featureClinics') : t('featureLabs');
   }
-  return group.label;
+  return t(group.labelKey);
 }
 
 export function emptyFeaturePermissionState(): FeaturePermState {
@@ -57,20 +60,25 @@ export function permissionNamesFromFeatureState(state: FeaturePermState): string
   return out;
 }
 
+export function featureStateHasTreatmentEdit(state: FeaturePermState): boolean {
+  return Boolean(state.TAB_TREATMENT_EDIT?.edit);
+}
+
 /** Human-readable access for the team table — feature name, or "Feature (Read only)" */
 export function formatAccessSummary(
   permissionNames: string[] | null | undefined,
-  organizationType?: OrgType,
+  organizationType: OrgType,
+  t: StaffFeaturesTranslate,
 ): string {
-  if (!permissionNames?.length) return 'No tab access';
+  if (!permissionNames?.length) return t('noTabAccess');
   const set = new Set(permissionNames);
   const parts: string[] = [];
   for (const g of STAFF_FEATURE_GROUPS) {
     const hasEdit = set.has(g.edit);
     const hasRead = set.has(g.read) || hasEdit;
     if (!hasRead) continue;
-    const label = resolveStaffFeatureLabel(g, organizationType);
-    parts.push(hasEdit ? label : `${label} (Read only)`);
+    const label = resolveStaffFeatureLabel(g, organizationType, t);
+    parts.push(hasEdit ? label : `${label} ${t('readOnlySuffix')}`);
   }
-  return parts.length ? parts.join(' · ') : 'No tab access';
+  return parts.length ? parts.join(' · ') : t('noTabAccess');
 }
diff --git a/frontend/src/components/staff/workingHours.ts b/frontend/src/components/staff/workingHours.ts
new file mode 100644
index 0000000..f4f646c
--- /dev/null
+++ b/frontend/src/components/staff/workingHours.ts
@@ -0,0 +1,227 @@
+export const MINUTES_PER_DAY = 24 * 60;
+export const SCHEDULE_SLOT_MINUTES = 15;
+
+export const WEEKDAY_KEYS = [
+  'weekdayMon',
+  'weekdayTue',
+  'weekdayWed',
+  'weekdayThu',
+  'weekdayFri',
+  'weekdaySat',
+  'weekdaySun',
+] as const;
+
+type WorkingHoursTranslate = (key: string, values?: { day: string }) => string;
+
+export type WorkingHoursBlock = {
+  dayOfWeek: number;
+  startMinute: number;
+  endMinute: number;
+  sortOrder?: number;
+};
+
+export type WorkingHoursDayBlock = {
+  startMinute: number;
+  endMinute: number;
+};
+
+export type WorkingHoursEditorDay = {
+  dayOfWeek: number;
+  isWorking: boolean;
+  shifts: { startMinute: number; endMinute: number }[];
+};
+
+export function localDayOfWeekMondayZero(dayOfWeekJs: number): number {
+  return dayOfWeekJs === 0 ? 6 : dayOfWeekJs - 1;
+}
+
+export function minutesToTimeInput(minutes: number): string {
+  const h = Math.floor(minutes / 60);
+  const m = minutes % 60;
+  return `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`;
+}
+
+export function timeInputToMinutes(value: string): number | null {
+  const match = /^(\d{1,2}):(\d{2})$/.exec(value.trim());
+  if (!match) return null;
+  const h = Number(match[1]);
+  const m = Number(match[2]);
+  if (h < 0 || h > 23 || m < 0 || m > 59) return null;
+  return h * 60 + m;
+}
+
+export function formatMinuteLabel(minute: number): string {
+  const d = new Date(2000, 0, 1, Math.floor(minute / 60), minute % 60, 0, 0);
+  return d.toLocaleTimeString(undefined, { hour: 'numeric', minute: '2-digit', hour12: true });
+}
+
+export function emptyWorkingHoursEditorDays(): WorkingHoursEditorDay[] {
+  return WEEKDAY_KEYS.map((_, dayOfWeek) => ({
+    dayOfWeek,
+    isWorking: false,
+    shifts: [{ startMinute: 9 * 60, endMinute: 17 * 60 }],
+  }));
+}
+
+export function editorDaysFromBlocks(blocks: WorkingHoursBlock[]): WorkingHoursEditorDay[] {
+  const byDay = new Map<number, WorkingHoursDayBlock[]>();
+  for (const block of blocks) {
+    const list = byDay.get(block.dayOfWeek) ?? [];
+    list.push({ startMinute: block.startMinute, endMinute: block.endMinute });
+    byDay.set(block.dayOfWeek, list);
+  }
+
+  return WEEKDAY_KEYS.map((_, dayOfWeek) => {
+    const shifts = (byDay.get(dayOfWeek) ?? []).sort(
+      (a, b) => a.startMinute - b.startMinute || a.endMinute - b.endMinute,
+    );
+    return {
+      dayOfWeek,
+      isWorking: shifts.length > 0,
+      shifts: shifts.length > 0 ? shifts : [{ startMinute: 9 * 60, endMinute: 17 * 60 }],
+    };
+  });
+}
+
+export function blocksFromEditorDays(days: WorkingHoursEditorDay[]): WorkingHoursBlock[] {
+  const blocks: WorkingHoursBlock[] = [];
+  for (const day of days) {
+    if (!day.isWorking) continue;
+    day.shifts.forEach((shift, index) => {
+      blocks.push({
+        dayOfWeek: day.dayOfWeek,
+        startMinute: shift.startMinute,
+        endMinute: shift.endMinute,
+        sortOrder: index,
+      });
+    });
+  }
+  return blocks;
+}
+
+export function validateEditorDays(
+  days: WorkingHoursEditorDay[],
+  t: WorkingHoursTranslate,
+): string | null {
+  for (const day of days) {
+    if (!day.isWorking) continue;
+    const dayLabel = t(WEEKDAY_KEYS[day.dayOfWeek]);
+    if (day.shifts.length === 0) {
+      return t('validationNeedsShift', { day: dayLabel });
+    }
+    const sorted = [...day.shifts].sort((a, b) => a.startMinute - b.startMinute);
+    for (const shift of sorted) {
+      if (shift.endMinute <= shift.startMinute) {
+        return t('validationEndAfterStart', { day: dayLabel });
+      }
+    }
+    for (let i = 1; i < sorted.length; i += 1) {
+      if (sorted[i].startMinute < sorted[i - 1].endMinute) {
+        return t('validationOverlap', { day: dayLabel });
+      }
+    }
+  }
+  return null;
+}
+
+export function blocksForDay(blocks: WorkingHoursBlock[], dayOfWeek: number): WorkingHoursDayBlock[] {
+  return blocks
+    .filter((b) => b.dayOfWeek === dayOfWeek)
+    .sort((a, b) => a.startMinute - b.startMinute || a.endMinute - b.endMinute)
+    .map((b) => ({ startMinute: b.startMinute, endMinute: b.endMinute }));
+}
+
+export function isMinuteWithinWorkingBlocks(
+  minute: number,
+  dayBlocks: WorkingHoursDayBlock[],
+): boolean {
+  return dayBlocks.some((b) => minute >= b.startMinute && minute < b.endMinute);
+}
+
+export function isSlotWithinWorkingBlocks(
+  slotStartMinute: number,
+  slotMinutes: number,
+  dayBlocks: WorkingHoursDayBlock[],
+): boolean {
+  const slotEnd = slotStartMinute + slotMinutes;
+  for (let m = slotStartMinute; m < slotEnd; m += 1) {
+    if (!isMinuteWithinWorkingBlocks(m, dayBlocks)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+export function appointmentWithinWorkingHours(
+  startAt: Date,
+  endAt: Date,
+  dayBlocks: WorkingHoursDayBlock[],
+): boolean {
+  const startMinute = startAt.getHours() * 60 + startAt.getMinutes();
+  const endMinute = endAt.getHours() * 60 + endAt.getMinutes();
+  if (endMinute <= startMinute) return false;
+  for (let m = startMinute; m < endMinute; m += 1) {
+    if (!isMinuteWithinWorkingBlocks(m, dayBlocks)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+export function unionDayBlockRange(dayBlocksList: WorkingHoursDayBlock[][]): {
+  startMinute: number;
+  endMinute: number;
+} | null {
+  let startMinute: number | null = null;
+  let endMinute: number | null = null;
+
+  for (const dayBlocks of dayBlocksList) {
+    for (const block of dayBlocks) {
+      startMinute =
+        startMinute == null ? block.startMinute : Math.min(startMinute, block.startMinute);
+      endMinute = endMinute == null ? block.endMinute : Math.max(endMinute, block.endMinute);
+    }
+  }
+
+  if (startMinute == null || endMinute == null) {
+    return null;
+  }
+
+  return { startMinute, endMinute };
+}
+
+export function snapRangeToSlots(
+  startMinute: number,
+  endMinute: number,
+  slotMinutes: number,
+): { startMinute: number; endMinute: number; slotCount: number } {
+  const start = Math.floor(startMinute / slotMinutes) * slotMinutes;
+  const end = Math.ceil(endMinute / slotMinutes) * slotMinutes;
+  return {
+    startMinute: start,
+    endMinute: end,
+    slotCount: Math.max(1, (end - start) / slotMinutes),
+  };
+}
+
+export function generateSlotStarts(
+  startMinute: number,
+  endMinute: number,
+  slotMinutes: number,
+): number[] {
+  const slots: number[] = [];
+  for (let m = startMinute; m < endMinute; m += slotMinutes) {
+    slots.push(m);
+  }
+  return slots;
+}
+
+export function generateHourLabelsInRange(startMinute: number, endMinute: number): number[] {
+  const firstHour = Math.floor(startMinute / 60);
+  const lastHour = Math.ceil(endMinute / 60);
+  const hours: number[] = [];
+  for (let h = firstHour; h < lastHour; h += 1) {
+    hours.push(h);
+  }
+  return hours;
+}
diff --git a/frontend/src/components/treatment/caseSendLabel.ts b/frontend/src/components/treatment/caseSendLabel.ts
index 029dc3e..c2856c9 100644
--- a/frontend/src/components/treatment/caseSendLabel.ts
+++ b/frontend/src/components/treatment/caseSendLabel.ts
@@ -1,17 +1,23 @@
 import type { LinkedOrganizationOption, TreatmentCaseSendInfo } from '@/types/treatment';
 
+export type CaseSendLabelT = (
+  key: 'sentToAt' | 'fallbackOrgName',
+  values?: { orgName: string; datetime: string },
+) => string;
+
 export function formatCaseSentLines(
   sends: TreatmentCaseSendInfo[] | undefined,
-  fallback?: {
+  fallback: {
     organizationIds: string[];
     sentAt: string | null;
     orgs?: LinkedOrganizationOption[];
-  },
+  } | undefined,
+  t: CaseSendLabelT,
 ): string[] {
   if (sends?.length) {
     return sends.map((s) => {
       const at = new Date(s.sentAt).toLocaleString();
-      return `Sent to ${s.organizationName} at ${at}`;
+      return t('sentToAt', { orgName: s.organizationName, datetime: at });
     });
   }
 
@@ -19,8 +25,8 @@ export function formatCaseSentLines(
     const at = new Date(fallback.sentAt).toLocaleString();
     const nameById = new Map(fallback.orgs?.map((o) => [o.id, o.name]) ?? []);
     return fallback.organizationIds.map((id) => {
-      const name = nameById.get(id) ?? 'organization';
-      return `Sent to ${name} at ${at}`;
+      const name = nameById.get(id) ?? t('fallbackOrgName');
+      return t('sentToAt', { orgName: name, datetime: at });
     });
   }
 
@@ -29,12 +35,13 @@ export function formatCaseSentLines(
 
 export function formatCaseSentSummary(
   sends: TreatmentCaseSendInfo[] | undefined,
-  fallback?: {
+  fallback: {
     organizationIds: string[];
     sentAt: string | null;
     orgs?: LinkedOrganizationOption[];
-  },
+  } | undefined,
+  t: CaseSendLabelT,
 ): string | null {
-  const lines = formatCaseSentLines(sends, fallback);
+  const lines = formatCaseSentLines(sends, fallback, t);
   return lines.length > 0 ? lines.join(' · ') : null;
 }
diff --git a/frontend/src/components/ui/appointments/AppointmentBookingModal.tsx b/frontend/src/components/ui/appointments/AppointmentBookingModal.tsx
index 17921df..0d38723 100644
--- a/frontend/src/components/ui/appointments/AppointmentBookingModal.tsx
+++ b/frontend/src/components/ui/appointments/AppointmentBookingModal.tsx
@@ -1,11 +1,13 @@
 'use client';
 
 import { useEffect, useState } from 'react';
+import { useTranslations } from 'next-intl';
 import { Button } from '@/components/ui/shared/Button';
 import { DialogCloseButton } from '@/components/ui/shared/DialogCloseButton';
 import { Dropdown } from '@/components/ui/shared/Dropdown';
 import type { AppointmentPurpose, AppointmentRecord } from '@/types/appointment';
-import { APPOINTMENT_PURPOSE_LABEL } from '@/components/ui/appointments/appointmentPurposeStyles';
+import { APPOINTMENT_PURPOSES } from '@/types/appointment';
+import { getPurposeLabel } from '@/components/ui/appointments/appointmentPurposeStyles';
 import type { Patient } from '@/types/patient';
 import {
   combineLocalDateAndTime,
@@ -20,7 +22,7 @@ interface AppointmentBookingModalProps {
   patient: Patient | undefined;
   providerUserId: string | null;
   providerName: string;
-  initialHour: number;
+  initialStartMinute: number;
   onClose: () => void;
   onSubmit: (payload: {
     patientId: string;
@@ -36,13 +38,21 @@ interface AppointmentBookingModalProps {
   deleting?: boolean;
 }
 
+const PURPOSE_OPTION_COLORS: Record<AppointmentPurpose, string> = {
+  consultation: '#ddd6fe',
+  filling: '#fed7aa',
+  endo: '#fecaca',
+  visit: '#bae6fd',
+  hygiene: '#d9f99d',
+};
+
 export function AppointmentBookingModal({
   open,
   scheduleDate,
   patient,
   providerUserId,
   providerName,
-  initialHour,
+  initialStartMinute,
   onClose,
   onSubmit,
   editingAppointment = null,
@@ -51,20 +61,15 @@ export function AppointmentBookingModal({
   onDelete,
   deleting = false,
 }: AppointmentBookingModalProps) {
+  const t = useTranslations('appointments');
+  const tCommon = useTranslations('common');
+  const tPatients = useTranslations('patients');
+
   const [startTime, setStartTime] = useState('09:00');
   const [endTime, setEndTime] = useState('10:00');
   const [purpose, setPurpose] = useState<AppointmentPurpose>('consultation');
   const [error, setError] = useState('');
-  const purposeTextColor =
-    purpose === 'consultation'
-      ? '#ddd6fe'
-      : purpose === 'filling'
-        ? '#fed7aa'
-        : purpose === 'endo'
-          ? '#fecaca'
-          : purpose === 'visit'
-            ? '#bae6fd'
-            : '#d9f99d';
+  const purposeTextColor = PURPOSE_OPTION_COLORS[purpose];
 
   useEffect(() => {
     if (!open) {
@@ -81,17 +86,18 @@ export function AppointmentBookingModal({
         scheduleDate.getFullYear(),
         scheduleDate.getMonth(),
         scheduleDate.getDate(),
-        initialHour,
-        0,
+        Math.floor(initialStartMinute / 60),
+        initialStartMinute % 60,
         0,
         0,
       );
+      const endMinute = Math.min(initialStartMinute + 60, 24 * 60 - 1);
       const end = new Date(
         scheduleDate.getFullYear(),
         scheduleDate.getMonth(),
         scheduleDate.getDate(),
-        initialHour < 23 ? initialHour + 1 : 23,
-        initialHour < 23 ? 0 : 59,
+        Math.floor(endMinute / 60),
+        endMinute % 60,
         0,
         0,
       );
@@ -100,7 +106,7 @@ export function AppointmentBookingModal({
       setPurpose('consultation');
     }
     setError('');
-  }, [open, scheduleDate, initialHour, editingAppointment]);
+  }, [open, scheduleDate, initialStartMinute, editingAppointment]);
 
   if (!open || !providerUserId) {
     return null;
@@ -115,7 +121,7 @@ export function AppointmentBookingModal({
       return;
     }
     if (!editingAppointment && !patient) {
-      setError('Select a patient first.');
+      setError(t('errorSelectPatient'));
       return;
     }
 
@@ -123,26 +129,26 @@ export function AppointmentBookingModal({
     const endAt = combineLocalDateAndTime(scheduleDate, endTime);
 
     if (endAt <= startAt) {
-      setError('End time must be after start time.');
+      setError(t('errorEndAfterStart'));
       return;
     }
 
     const now = new Date();
     if (isSameLocalCalendarDay(scheduleDate, now) && startAt.getTime() < now.getTime()) {
-      setError('Cannot schedule in the past.');
+      setError(t('errorPastSchedule'));
       return;
     }
 
     const today = new Date();
     if (compareLocalDayStart(scheduleDate, today) < 0) {
-      setError('Past appointments are view-only.');
+      setError(t('errorPastViewOnly'));
       return;
     }
 
     const effectivePatientId = editingAppointment?.patientId ?? patient?.id;
     const effectiveProviderId = editingAppointment?.providerUserId ?? providerUserId;
     if (!effectivePatientId || !effectiveProviderId) {
-      setError('Missing appointment details.');
+      setError(t('errorMissingDetails'));
       return;
     }
 
@@ -165,29 +171,34 @@ export function AppointmentBookingModal({
       >
         <div className="flex items-start justify-between gap-2">
           <h2 id="appointment-modal-title" className="text-lg font-semibold text-text-primary pr-2">
-            {editingAppointment ? 'Edit appointment' : 'New appointment'}
+            {editingAppointment ? t('editTitle') : t('newTitle')}
           </h2>
           <DialogCloseButton onClick={onClose} />
         </div>
 
         <p className="text-sm text-text-secondary">
-          Provider: <span className="text-text-primary font-medium">{providerName}</span>
+          {t('providerLabel')}{' '}
+          <span className="text-text-primary font-medium">{providerName}</span>
         </p>
 
         <div>
-          <label className="block text-sm font-medium text-text-secondary mb-1">Patient</label>
+          <label className="block text-sm font-medium text-text-secondary mb-1">
+            {t('patientLabel')}
+          </label>
           <p className="text-sm text-text-primary rounded-[var(--radius-md)] border border-border bg-background-secondary/60 px-3 py-2">
             {editingAppointment
               ? `${editingAppointment.patient.firstName} ${editingAppointment.patient.lastName}`
               : patient
                 ? `${patient.firstName} ${patient.lastName}`
-                : '—'}
+                : tPatients('emptyValue')}
           </p>
         </div>
 
         <div className="grid grid-cols-2 gap-3">
           <div>
-            <label className="block text-sm font-medium text-text-secondary mb-1">Start</label>
+            <label className="block text-sm font-medium text-text-secondary mb-1">
+              {t('startLabel')}
+            </label>
             <input
               type="time"
               step={60}
@@ -197,7 +208,9 @@ export function AppointmentBookingModal({
             />
           </div>
           <div>
-            <label className="block text-sm font-medium text-text-secondary mb-1">End</label>
+            <label className="block text-sm font-medium text-text-secondary mb-1">
+              {t('endLabel')}
+            </label>
             <input
               type="time"
               step={60}
@@ -209,26 +222,20 @@ export function AppointmentBookingModal({
         </div>
 
         <Dropdown
-          label="Purpose"
+          label={t('purposeLabel')}
           value={purpose}
           onChange={(e) => setPurpose(e.target.value as AppointmentPurpose)}
           style={{ color: purposeTextColor }}
         >
-          <option value="consultation" style={{ color: '#ddd6fe', backgroundColor: '#14253d' }}>
-            {APPOINTMENT_PURPOSE_LABEL.consultation}
-          </option>
-          <option value="filling" style={{ color: '#fed7aa', backgroundColor: '#14253d' }}>
-            {APPOINTMENT_PURPOSE_LABEL.filling}
-          </option>
-          <option value="endo" style={{ color: '#fecaca', backgroundColor: '#14253d' }}>
-            {APPOINTMENT_PURPOSE_LABEL.endo}
-          </option>
-          <option value="visit" style={{ color: '#bae6fd', backgroundColor: '#14253d' }}>
-            {APPOINTMENT_PURPOSE_LABEL.visit}
-          </option>
-          <option value="hygiene" style={{ color: '#d9f99d', backgroundColor: '#14253d' }}>
-            {APPOINTMENT_PURPOSE_LABEL.hygiene}
-          </option>
+          {APPOINTMENT_PURPOSES.map((purposeOption) => (
+            <option
+              key={purposeOption}
+              value={purposeOption}
+              style={{ color: PURPOSE_OPTION_COLORS[purposeOption], backgroundColor: '#14253d' }}
+            >
+              {getPurposeLabel(purposeOption, t)}
+            </option>
+          ))}
         </Dropdown>
 
         {error && <p className="text-sm text-red-400">{error}</p>}
@@ -242,14 +249,14 @@ export function AppointmentBookingModal({
               disabled={loading || deleting}
               isLoading={deleting}
             >
-              Delete
+              {tCommon('delete')}
             </Button>
           ) : (
             <span />
           )}
           <div className="flex gap-2 ml-auto">
             <Button type="button" variant="ghost" onClick={onClose} disabled={loading || deleting}>
-              Cancel
+              {tCommon('cancel')}
             </Button>
             <Button
               type="button"
@@ -258,7 +265,7 @@ export function AppointmentBookingModal({
               isLoading={loading}
               disabled={deleting}
             >
-              Save
+              {tCommon('save')}
             </Button>
           </div>
         </div>
diff --git a/frontend/src/components/ui/appointments/AppointmentOverlapPopover.tsx b/frontend/src/components/ui/appointments/AppointmentOverlapPopover.tsx
index 49cd6ad..5d18b14 100644
--- a/frontend/src/components/ui/appointments/AppointmentOverlapPopover.tsx
+++ b/frontend/src/components/ui/appointments/AppointmentOverlapPopover.tsx
@@ -1,12 +1,13 @@
 'use client';
 
 import { useEffect, useRef } from 'react';
+import { useTranslations } from 'next-intl';
 import { DialogCloseButton } from '@/components/ui/shared/DialogCloseButton';
 import {
-  APPOINTMENT_PURPOSE_LABEL,
+  getPurposeLabel,
   purposeStyle,
 } from '@/components/ui/appointments/appointmentPurposeStyles';
-import type { AppointmentRecord } from '@/types/appointment';
+import type { AppointmentPurpose, AppointmentRecord } from '@/types/appointment';
 
 type AppointmentOverlapPopoverProps = {
   appointments: AppointmentRecord[];
@@ -28,6 +29,7 @@ export function AppointmentOverlapPopover({
   onSelect,
   onClose,
 }: AppointmentOverlapPopoverProps) {
+  const t = useTranslations('appointments');
   const panelRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
@@ -75,13 +77,13 @@ export function AppointmentOverlapPopover({
       >
         <div className="flex items-start justify-between gap-2 mb-2">
           <h3 id="overlap-popover-title" className="text-sm font-semibold text-text-primary pr-2">
-            Overlapping appointments ({sorted.length})
+            {t('overlappingTitle', { count: sorted.length })}
           </h3>
           <DialogCloseButton onClick={onClose} />
         </div>
         <ul className="space-y-1.5 max-h-[min(16rem,50vh)] overflow-y-auto">
           {sorted.map((apt) => {
-            const purpose = apt.purpose as keyof typeof APPOINTMENT_PURPOSE_LABEL;
+            const purpose = apt.purpose as AppointmentPurpose;
             return (
               <li key={apt.id}>
                 <button
@@ -97,7 +99,7 @@ export function AppointmentOverlapPopover({
                   </p>
                   <p className="text-[11px] opacity-90 tabular-nums">{formatTimeRange(apt)}</p>
                   <p className="text-[10px] opacity-80 truncate">
-                    {APPOINTMENT_PURPOSE_LABEL[purpose] ?? apt.purpose}
+                    {getPurposeLabel(purpose, t) ?? apt.purpose}
                   </p>
                 </button>
               </li>
diff --git a/frontend/src/components/ui/appointments/AppointmentScheduleGrid.tsx b/frontend/src/components/ui/appointments/AppointmentScheduleGrid.tsx
index 041d050..2f90b9d 100644
--- a/frontend/src/components/ui/appointments/AppointmentScheduleGrid.tsx
+++ b/frontend/src/components/ui/appointments/AppointmentScheduleGrid.tsx
@@ -1,8 +1,18 @@
 'use client';
 
 import { useMemo, useState } from 'react';
+import { useTranslations } from 'next-intl';
 import type { AppointmentColumnProvider, AppointmentRecord } from '@/types/appointment';
-import { formatHourLabel } from '@/components/appointments/appointmentTime';
+import {
+  SCHEDULE_SLOT_MINUTES,
+  appointmentWithinWorkingHours,
+  formatMinuteLabel,
+  generateHourLabelsInRange,
+  generateSlotStarts,
+  isSlotWithinWorkingBlocks,
+  snapRangeToSlots,
+  unionDayBlockRange,
+} from '@/components/staff/workingHours';
 import {
   computeAppointmentLaneLayouts,
   findOverlapCluster,
@@ -10,23 +20,30 @@ import {
 } from '@/components/appointments/appointmentOverlapLayout';
 import { purposeStyle } from '@/components/ui/appointments/appointmentPurposeStyles';
 import { AppointmentOverlapPopover } from '@/components/ui/appointments/AppointmentOverlapPopover';
+import { startOfLocalDay } from '@/components/appointments/appointmentTime';
 
-const HOUR_PX = 40;
-const HOURS = Array.from({ length: 24 }, (_, i) => i);
+const HOUR_PX = 80;
+const SLOT_PX = (HOUR_PX * SCHEDULE_SLOT_MINUTES) / 60;
 
-function layoutBlock(apt: AppointmentRecord, day: Date): { top: string; height: string } | null {
-  const dayStart = new Date(day.getFullYear(), day.getMonth(), day.getDate(), 0, 0, 0, 0);
-  const dayEnd = new Date(day.getFullYear(), day.getMonth(), day.getDate() + 1, 0, 0, 0, 0);
+function layoutBlockInRange(
+  apt: AppointmentRecord,
+  day: Date,
+  rangeStartMinute: number,
+  rangeEndMinute: number,
+): { top: string; height: string } | null {
+  const dayStart = startOfLocalDay(day);
+  const rangeStartMs = dayStart.getTime() + rangeStartMinute * 60_000;
+  const rangeEndMs = dayStart.getTime() + rangeEndMinute * 60_000;
   const start = new Date(apt.startAt);
   const end = new Date(apt.endAt);
-  const ms = dayEnd.getTime() - dayStart.getTime();
-  const clipStart = Math.max(start.getTime(), dayStart.getTime());
-  const clipEnd = Math.min(end.getTime(), dayEnd.getTime());
+  const clipStart = Math.max(start.getTime(), rangeStartMs);
+  const clipEnd = Math.min(end.getTime(), rangeEndMs);
   if (clipEnd <= clipStart) {
     return null;
   }
-  const top = ((clipStart - dayStart.getTime()) / ms) * 100;
-  const height = ((clipEnd - clipStart) / ms) * 100;
+  const rangeMs = rangeEndMs - rangeStartMs;
+  const top = ((clipStart - rangeStartMs) / rangeMs) * 100;
+  const height = ((clipEnd - clipStart) / rangeMs) * 100;
   return { top: `${top}%`, height: `${height}%` };
 }
 
@@ -36,12 +53,12 @@ function appointmentDurationMinutes(apt: AppointmentRecord): number {
   return Math.max(0, Math.round((end - start) / 60_000));
 }
 
-function appointmentBannerHeightPx(durationMin: number): number {
-  return (durationMin / (24 * 60)) * HOURS.length * HOUR_PX;
+function appointmentBannerHeightPx(durationMin: number, rangeMinutes: number, gridHeight: number): number {
+  return (durationMin / rangeMinutes) * gridHeight;
 }
 
-function shortBannerNameClass(durationMin: number): string {
-  const heightPx = appointmentBannerHeightPx(durationMin);
+function shortBannerNameClass(durationMin: number, rangeMinutes: number, gridHeight: number): string {
+  const heightPx = appointmentBannerHeightPx(durationMin, rangeMinutes, gridHeight);
   if (heightPx < 18) {
     return 'text-[8px] leading-none';
   }
@@ -61,8 +78,9 @@ interface AppointmentScheduleGridProps {
   providers: AppointmentColumnProvider[];
   appointments: AppointmentRecord[];
   canBook: boolean;
-  onSlotClick: (hour: number, providerUserId: string, providerName: string) => void;
+  onSlotClick: (startMinute: number, providerUserId: string, providerName: string) => void;
   onAppointmentClick?: (appointment: AppointmentRecord) => void;
+  onAppointmentOutsideHours?: (appointment: AppointmentRecord) => void;
 }
 
 export function AppointmentScheduleGrid({
@@ -72,10 +90,40 @@ export function AppointmentScheduleGrid({
   canBook,
   onSlotClick,
   onAppointmentClick,
+  onAppointmentOutsideHours,
 }: AppointmentScheduleGridProps) {
-  const gridHeight = HOURS.length * HOUR_PX;
+  const t = useTranslations('appointments');
   const [overlapPopover, setOverlapPopover] = useState<OverlapPopoverState | null>(null);
 
+  const visibleRange = useMemo(() => {
+    const activeDayBlocks = providers
+      .filter((p) => p.hasWorkingHours && p.dayBlocks.length > 0)
+      .map((p) => p.dayBlocks);
+    return unionDayBlockRange(activeDayBlocks);
+  }, [providers]);
+
+  const snappedRange = useMemo(() => {
+    if (!visibleRange) return null;
+    return snapRangeToSlots(visibleRange.startMinute, visibleRange.endMinute, SCHEDULE_SLOT_MINUTES);
+  }, [visibleRange]);
+
+  const slotStarts = useMemo(() => {
+    if (!snappedRange) return [];
+    return generateSlotStarts(
+      snappedRange.startMinute,
+      snappedRange.endMinute,
+      SCHEDULE_SLOT_MINUTES,
+    );
+  }, [snappedRange]);
+
+  const hourLabels = useMemo(() => {
+    if (!snappedRange) return [];
+    return generateHourLabelsInRange(snappedRange.startMinute, snappedRange.endMinute);
+  }, [snappedRange]);
+
+  const gridHeight = slotStarts.length * SLOT_PX;
+  const rangeMinutes = snappedRange ? snappedRange.endMinute - snappedRange.startMinute : 0;
+
   const laneLayoutsByProvider = useMemo(() => {
     const map = new Map<string, ReturnType<typeof computeAppointmentLaneLayouts>>();
     for (const provider of providers) {
@@ -87,9 +135,19 @@ export function AppointmentScheduleGrid({
 
   function handleAppointmentBannerClick(
     apt: AppointmentRecord,
+    provider: AppointmentColumnProvider,
     providerAppointments: AppointmentRecord[],
     anchor: HTMLElement,
   ) {
+    if (
+      provider.hasWorkingHours &&
+      provider.dayBlocks.length > 0 &&
+      !appointmentWithinWorkingHours(new Date(apt.startAt), new Date(apt.endAt), provider.dayBlocks)
+    ) {
+      onAppointmentOutsideHours?.(apt);
+      return;
+    }
+
     const cluster = findOverlapCluster(apt.id, providerAppointments);
     if (cluster.length > 1) {
       setOverlapPopover({
@@ -103,9 +161,13 @@ export function AppointmentScheduleGrid({
 
   if (providers.length === 0) {
     return (
-      <div className="surface-card p-6 text-sm text-text-muted">
-        No providers available. Add staff with treatment edit access to see columns here.
-      </div>
+      <div className="surface-card p-6 text-sm text-text-muted">{t('noProviders')}</div>
+    );
+  }
+
+  if (!snappedRange || slotStarts.length === 0) {
+    return (
+      <div className="surface-card p-6 text-sm text-text-muted">{t('noWorkingHours')}</div>
     );
   }
 
@@ -121,21 +183,38 @@ export function AppointmentScheduleGrid({
                 className="flex-1 min-w-[130px] text-center text-sm font-medium text-text-primary py-2.5 px-1 border-l border-border"
               >
                 {p.name}
+                {!p.hasWorkingHours && (
+                  <span className="block text-[10px] font-normal text-text-muted mt-0.5">
+                    {t('noHoursSet')}
+                  </span>
+                )}
+                {p.hasWorkingHours && p.dayBlocks.length === 0 && (
+                  <span className="block text-[10px] font-normal text-text-muted mt-0.5">
+                    {t('offToday')}
+                  </span>
+                )}
               </div>
             ))}
           </div>
 
           <div className="flex">
-            <div className="w-14 flex-shrink-0 border-r border-border bg-background-secondary/40">
-              {HOURS.map((h) => (
-                <div
-                  key={h}
-                  className="text-[11px] text-text-muted flex items-start justify-end pr-1.5 pt-0.5 border-b border-border/50"
-                  style={{ height: HOUR_PX }}
-                >
-                  {formatHourLabel(h)}
-                </div>
-              ))}
+            <div
+              className="w-14 flex-shrink-0 border-r border-border bg-background-secondary/40 relative"
+              style={{ height: gridHeight }}
+            >
+              {hourLabels.map((hour) => {
+                const top = ((hour * 60 - snappedRange.startMinute) / rangeMinutes) * gridHeight;
+                const height = (60 / rangeMinutes) * gridHeight;
+                return (
+                  <div
+                    key={hour}
+                    className="absolute left-0 right-0 text-[11px] text-text-muted flex items-start justify-end pr-1.5 pt-0.5 border-b border-border/50"
+                    style={{ top, height }}
+                  >
+                    {formatMinuteLabel(hour * 60)}
+                  </div>
+                );
+              })}
             </div>
 
             <div className="flex-1 flex min-w-0">
@@ -144,6 +223,7 @@ export function AppointmentScheduleGrid({
                   (a) => a.providerUserId === p.userId,
                 );
                 const laneLayouts = laneLayoutsByProvider.get(p.userId) ?? new Map();
+                const columnFullyDisabled = !p.hasWorkingHours || p.dayBlocks.length === 0;
 
                 return (
                   <div
@@ -151,31 +231,52 @@ export function AppointmentScheduleGrid({
                     className="flex-1 min-w-[130px] border-l border-border relative"
                     style={{ height: gridHeight }}
                   >
-                    {HOURS.map((h) => {
-                      const slotDisabled = !canBook;
+                    {slotStarts.map((slotStartMinute, index) => {
+                      const slotActive =
+                        !columnFullyDisabled &&
+                        isSlotWithinWorkingBlocks(
+                          slotStartMinute,
+                          SCHEDULE_SLOT_MINUTES,
+                          p.dayBlocks,
+                        );
+                      const slotDisabled = !canBook || columnFullyDisabled || !slotActive;
+
                       return (
                         <button
-                          key={h}
+                          key={`${p.userId}-${slotStartMinute}`}
                           type="button"
                           disabled={slotDisabled}
                           title={
-                            slotDisabled
-                              ? 'You cannot create appointments'
-                              : `Book ${formatHourLabel(h)}`
+                            columnFullyDisabled
+                              ? p.hasWorkingHours
+                                ? t('slotOffToday')
+                                : t('slotHoursNotConfigured')
+                              : !slotActive
+                                ? t('slotOutsideHours')
+                                : slotDisabled
+                                  ? t('slotCannotCreate')
+                                  : t('slotBookAt', {
+                                      time: formatMinuteLabel(slotStartMinute),
+                                    })
                           }
                           className={`absolute left-0 right-0 border-b border-border/50 transition-colors ${
                             slotDisabled
-                              ? 'cursor-not-allowed opacity-50'
+                              ? 'cursor-not-allowed bg-background-secondary/35 opacity-60'
                               : 'hover:bg-primary/8 cursor-pointer'
                           }`}
-                          style={{ top: h * HOUR_PX, height: HOUR_PX }}
-                          onClick={() => onSlotClick(h, p.userId, p.name)}
+                          style={{ top: index * SLOT_PX, height: SLOT_PX }}
+                          onClick={() => onSlotClick(slotStartMinute, p.userId, p.name)}
                         />
                       );
                     })}
 
                     {providerAppointments.map((apt) => {
-                      const pos = layoutBlock(apt, day);
+                      const pos = layoutBlockInRange(
+                        apt,
+                        day,
+                        snappedRange.startMinute,
+                        snappedRange.endMinute,
+                      );
                       if (!pos) {
                         return null;
                       }
@@ -184,10 +285,21 @@ export function AppointmentScheduleGrid({
                       const durationMin = appointmentDurationMinutes(apt);
                       const clusterSize = findOverlapCluster(apt.id, providerAppointments).length;
                       const isUnderOneHour = durationMin < 60;
+                      const outsideHours =
+                        p.hasWorkingHours &&
+                        p.dayBlocks.length > 0 &&
+                        !appointmentWithinWorkingHours(
+                          new Date(apt.startAt),
+                          new Date(apt.endAt),
+                          p.dayBlocks,
+                        );
                       const patientName = `${apt.patient.firstName} ${apt.patient.lastName}`;
                       const bannerTitle = [
                         patientName,
-                        clusterSize > 1 ? `${clusterSize} overlapping — click to choose` : null,
+                        outsideHours ? t('outsideHoursBlocked') : null,
+                        clusterSize > 1
+                          ? t('overlappingChoose', { count: clusterSize })
+                          : null,
                         !isUnderOneHour && apt.patient.phone ? apt.patient.phone : null,
                       ]
                         .filter(Boolean)
@@ -198,9 +310,16 @@ export function AppointmentScheduleGrid({
                           type="button"
                           key={apt.id}
                           onClick={(e) =>
-                            handleAppointmentBannerClick(apt, providerAppointments, e.currentTarget)
+                            handleAppointmentBannerClick(
+                              apt,
+                              p,
+                              providerAppointments,
+                              e.currentTarget,
+                            )
                           }
                           className={`absolute min-h-0 overflow-hidden rounded-[var(--radius-sm)] border pointer-events-auto z-10 flex text-left ${purposeStyle(apt.purpose)} focus:outline-none focus-visible:ring-2 focus-visible:ring-primary/35 ${
+                            outsideHours ? 'opacity-70 ring-1 ring-amber-500/60' : ''
+                          } ${
                             isUnderOneHour
                               ? 'items-center justify-center px-0.5 py-0'
                               : 'flex-col justify-start gap-0.5 px-1 py-0.5'
@@ -214,7 +333,7 @@ export function AppointmentScheduleGrid({
                           title={bannerTitle}
                         >
                           <span
-                            className={`block w-full truncate pointer-events-none font-medium ${shortBannerNameClass(durationMin)}`}
+                            className={`block w-full truncate pointer-events-none font-medium ${shortBannerNameClass(durationMin, rangeMinutes, gridHeight)}`}
                           >
                             {patientName}
                           </span>
@@ -227,7 +346,7 @@ export function AppointmentScheduleGrid({
                             )}
                           {!isUnderOneHour && clusterSize > 1 && (
                             <span className="block w-full truncate pointer-events-none text-[9px] leading-tight opacity-75">
-                              {clusterSize} overlapping
+                              {t('overlapping', { count: clusterSize })}
                             </span>
                           )}
                         </button>
@@ -245,7 +364,24 @@ export function AppointmentScheduleGrid({
         <AppointmentOverlapPopover
           appointments={overlapPopover.appointments}
           anchorRect={overlapPopover.anchorRect}
-          onSelect={(apt) => onAppointmentClick?.(apt)}
+          onSelect={(apt) => {
+            const provider = providers.find((p) => p.userId === apt.providerUserId);
+            if (
+              provider &&
+              provider.hasWorkingHours &&
+              provider.dayBlocks.length > 0 &&
+              !appointmentWithinWorkingHours(
+                new Date(apt.startAt),
+                new Date(apt.endAt),
+                provider.dayBlocks,
+              )
+            ) {
+              onAppointmentOutsideHours?.(apt);
+              setOverlapPopover(null);
+              return;
+            }
+            onAppointmentClick?.(apt);
+          }}
           onClose={() => setOverlapPopover(null)}
         />
       )}
diff --git a/frontend/src/components/ui/appointments/AppointmentScheduleLegend.tsx b/frontend/src/components/ui/appointments/AppointmentScheduleLegend.tsx
index 6e36de3..8ab970f 100644
--- a/frontend/src/components/ui/appointments/AppointmentScheduleLegend.tsx
+++ b/frontend/src/components/ui/appointments/AppointmentScheduleLegend.tsx
@@ -1,20 +1,25 @@
+'use client';
+
+import { useTranslations } from 'next-intl';
 import {
-  APPOINTMENT_PURPOSE_LABEL,
   APPOINTMENT_PURPOSE_LEGEND_SWATCH,
+  getPurposeLabel,
 } from '@/components/ui/appointments/appointmentPurposeStyles';
 import { APPOINTMENT_PURPOSES } from '@/types/appointment';
 
 export function AppointmentScheduleLegend() {
+  const t = useTranslations('appointments');
+
   return (
     <div className="surface-panel px-4 py-3">
-      <p className="text-xs font-medium text-text-secondary mb-2">Legend</p>
+      <p className="text-xs font-medium text-text-secondary mb-2">{t('legend')}</p>
       <div className="flex flex-wrap gap-3">
         {APPOINTMENT_PURPOSES.map((p) => (
           <div key={p} className="flex items-center gap-1.5 text-xs text-text-secondary">
             <span
               className={`inline-block h-3 w-3 rounded-sm border ${APPOINTMENT_PURPOSE_LEGEND_SWATCH[p]}`}
             />
-            {APPOINTMENT_PURPOSE_LABEL[p]}
+            {getPurposeLabel(p, t)}
           </div>
         ))}
       </div>
diff --git a/frontend/src/components/ui/appointments/AppointmentsPatientSearch.tsx b/frontend/src/components/ui/appointments/AppointmentsPatientSearch.tsx
index e0817fd..5dce8a1 100644
--- a/frontend/src/components/ui/appointments/AppointmentsPatientSearch.tsx
+++ b/frontend/src/components/ui/appointments/AppointmentsPatientSearch.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { Search } from 'lucide-react';
+import { useTranslations } from 'next-intl';
 import { Button } from '@/components/ui/shared/Button';
 import { Input } from '@/components/ui/shared/Input';
 import type { Patient } from '@/types/patient';
@@ -26,6 +27,9 @@ export function AppointmentsPatientSearch({
   canAddPatient,
   onAddPatient,
 }: AppointmentsPatientSearchProps) {
+  const t = useTranslations('appointments');
+  const tPatients = useTranslations('patients');
+
   const trimmed = search.trim();
   const showAddForEmptyResults =
     trimmed.length > 0 && !loading && patients.length === 0;
@@ -35,7 +39,7 @@ export function AppointmentsPatientSearch({
       <div className="flex flex-col sm:flex-row gap-3 sm:items-center">
         <div className="flex-1">
           <Input
-            placeholder="Search existing patients"
+            placeholder={t('searchPlaceholder')}
             value={search}
             onChange={(e) => onSearchChange(e.target.value)}
             icon={<Search className="h-4 w-4 icon-flat" />}
@@ -47,18 +51,18 @@ export function AppointmentsPatientSearch({
             variant="primary"
             disabled={!canAddPatient}
             onClick={onAddPatient}
-            title={!canAddPatient ? 'You do not have permission to add patients.' : undefined}
+            title={!canAddPatient ? t('noPermissionAdd') : undefined}
           >
-            New Patient
+            {tPatients('newPatient')}
           </Button>
         )}
       </div>
 
       <div className="space-y-2 max-h-72 overflow-y-auto">
-        {loading && <p className="text-sm text-text-muted">Searching…</p>}
+        {loading && <p className="text-sm text-text-muted">{t('searching')}</p>}
 
         {!loading && trimmed.length === 0 && (
-          <p className="text-sm text-text-muted">Type to search patients by name, phone, or email.</p>
+          <p className="text-sm text-text-muted">{t('searchHint')}</p>
         )}
 
         {patients.map((patient) => {
@@ -77,7 +81,9 @@ export function AppointmentsPatientSearch({
               <p className="text-sm font-medium text-text-primary">
                 {patient.firstName} {patient.lastName}
               </p>
-              <p className="text-xs text-text-muted">{patient.phone || patient.email || 'No contact'}</p>
+              <p className="text-xs text-text-muted">
+                {patient.phone || patient.email || tPatients('noContact')}
+              </p>
             </button>
           );
         })}
diff --git a/frontend/src/components/ui/appointments/appointmentPurposeStyles.ts b/frontend/src/components/ui/appointments/appointmentPurposeStyles.ts
index c0803ba..813befa 100644
--- a/frontend/src/components/ui/appointments/appointmentPurposeStyles.ts
+++ b/frontend/src/components/ui/appointments/appointmentPurposeStyles.ts
@@ -1,12 +1,25 @@
 import type { AppointmentPurpose } from '@/types/appointment';
 
-export const APPOINTMENT_PURPOSE_LABEL: Record<AppointmentPurpose, string> = {
-  consultation: 'Consultation',
-  filling: 'Filling',
-  endo: 'Endo',
-  visit: 'Visit',
-  hygiene: 'Hygiene',
-};
+export const APPOINTMENT_PURPOSE_LABEL_KEYS = {
+  consultation: 'purposeConsultation',
+  filling: 'purposeFilling',
+  endo: 'purposeEndo',
+  visit: 'purposeVisit',
+  hygiene: 'purposeHygiene',
+} as const satisfies Record<AppointmentPurpose, string>;
+
+export type AppointmentPurposeLabelKey =
+  (typeof APPOINTMENT_PURPOSE_LABEL_KEYS)[AppointmentPurpose];
+
+export type AppointmentPurposeTranslate = (key: AppointmentPurposeLabelKey) => string;
+
+export function getPurposeLabel(
+  purpose: AppointmentPurpose,
+  t: AppointmentPurposeTranslate,
+): string {
+  const key = APPOINTMENT_PURPOSE_LABEL_KEYS[purpose];
+  return key ? t(key) : purpose;
+}
 
 /** Background + border for blocks / legend (matches reference palette). */
 export const APPOINTMENT_PURPOSE_STYLES: Record<AppointmentPurpose, string> = {
diff --git a/frontend/src/components/ui/auth/OrganizationDetailsFields.tsx b/frontend/src/components/ui/auth/OrganizationDetailsFields.tsx
index d4fd1de..4b9fa1e 100644
--- a/frontend/src/components/ui/auth/OrganizationDetailsFields.tsx
+++ b/frontend/src/components/ui/auth/OrganizationDetailsFields.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { Building2, Mail } from 'lucide-react';
 import type { FieldErrors, UseFormRegister, UseFormSetValue } from 'react-hook-form';
 import { Input } from '@/components/ui/shared/Input';
@@ -23,26 +24,28 @@ export function OrganizationDetailsFields({
   organizationType,
   setValue,
 }: OrganizationDetailsFieldsProps) {
+  const t = useTranslations('auth');
+
   return (
     <>
       <Input
-        label="Organization name"
+        label={t('organizationName')}
         {...register('organizationName')}
-        placeholder="Sunshine Dental Clinic"
+        placeholder={t('organizationNamePlaceholder')}
         error={errors.organizationName?.message}
         icon={<Building2 className="h-5 w-5 icon-flat" />}
       />
       <Input
-        label="Organization email"
+        label={t('organizationEmail')}
         {...register('organizationEmail')}
         type="email"
-        placeholder="contact@sunshineclinic.com"
+        placeholder={t('organizationEmailPlaceholder')}
         error={errors.organizationEmail?.message}
         icon={<Mail className="h-5 w-5 icon-flat" />}
       />
       <div>
         <label className="block text-sm font-medium text-text-secondary mb-2">
-          Organization type
+          {t('organizationType')}
         </label>
         <input type="hidden" {...register('organizationType')} />
         <div className="grid grid-cols-2 gap-4">
@@ -58,7 +61,7 @@ export function OrganizationDetailsFields({
             }`}
           >
             <Building2 className="h-8 w-8 mx-auto mb-2 icon-flat" />
-            <span className="text-sm font-medium">Dental Clinic</span>
+            <span className="text-sm font-medium">{t('dentalClinic')}</span>
           </button>
           <button
             type="button"
@@ -72,7 +75,7 @@ export function OrganizationDetailsFields({
             }`}
           >
             <Building2 className="h-8 w-8 mx-auto mb-2 icon-flat" />
-            <span className="text-sm font-medium">Dental Lab</span>
+            <span className="text-sm font-medium">{t('dentalLab')}</span>
           </button>
         </div>
         {errors.organizationType && (
diff --git a/frontend/src/components/ui/auth/RegistrationProgressSteps.tsx b/frontend/src/components/ui/auth/RegistrationProgressSteps.tsx
index 16d91de..a4ee8f1 100644
--- a/frontend/src/components/ui/auth/RegistrationProgressSteps.tsx
+++ b/frontend/src/components/ui/auth/RegistrationProgressSteps.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { ChevronRight } from 'lucide-react';
 
 type RegistrationProgressStepsProps = {
@@ -10,9 +11,11 @@ type RegistrationProgressStepsProps = {
 
 export function RegistrationProgressSteps({
   step,
-  firstLabel = 'Account',
-  secondLabel = 'Organization',
+  firstLabel,
+  secondLabel,
 }: RegistrationProgressStepsProps) {
+  const t = useTranslations('auth');
+
   return (
     <div className="mb-8">
       <div className="flex items-center justify-between">
@@ -31,7 +34,7 @@ export function RegistrationProgressSteps({
               step >= 1 ? 'text-primary' : 'text-text-muted'
             }`}
           >
-            {firstLabel}
+            {firstLabel ?? t('stepAccount')}
           </div>
         </div>
         <ChevronRight className="h-5 w-5 text-text-muted icon-flat" />
@@ -50,7 +53,7 @@ export function RegistrationProgressSteps({
               step >= 2 ? 'text-primary' : 'text-text-muted'
             }`}
           >
-            {secondLabel}
+            {secondLabel ?? t('stepOrganization')}
           </div>
         </div>
       </div>
diff --git a/frontend/src/components/ui/dashboard/DashboardAccountMenu.tsx b/frontend/src/components/ui/dashboard/DashboardAccountMenu.tsx
index c9ee022..661d8a9 100644
--- a/frontend/src/components/ui/dashboard/DashboardAccountMenu.tsx
+++ b/frontend/src/components/ui/dashboard/DashboardAccountMenu.tsx
@@ -1,7 +1,8 @@
 'use client';
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import Link from 'next/link';
+import { useTranslations } from 'next-intl';
+import { Link } from '@/i18n/navigation';
 import {
   Settings,
   AlertTriangle,
@@ -15,16 +16,21 @@ import { useAuth } from '@/lib/hooks/useAuth';
 import { authApi } from '@/lib/api/auth';
 import type { SubscriptionAlertData } from '@/types/subscription';
 
-function warningTooltip(data: SubscriptionAlertData | null): string {
+function warningTooltip(
+  data: SubscriptionAlertData | null,
+  t: ReturnType<typeof useTranslations<'accountMenu'>>,
+): string {
   if (!data?.showWarning) return '';
-  if (data.noActiveSubscription) return 'No active subscription — review Subscriptions';
-  if (data.trialExpired) return 'Trial ended — review Subscriptions';
-  if (data.trialEndingSoon) return 'Trial ending soon — review Subscriptions';
-  if (data.seatsLow) return 'Seats running low — review Subscriptions';
-  return 'Review Subscriptions';
+  if (data.noActiveSubscription) return t('noActiveSubscription');
+  if (data.trialExpired) return t('trialEnded');
+  if (data.trialEndingSoon) return t('trialEndingSoon');
+  if (data.seatsLow) return t('seatsLow');
+  return t('reviewSubscriptions');
 }
 
 export function DashboardAccountMenu() {
+  const t = useTranslations('auth');
+  const tAccount = useTranslations('accountMenu');
   const { user, currentOrganization, logout } = useAuth();
   const [open, setOpen] = useState(false);
   const menuRef = useRef<HTMLDivElement>(null);
@@ -61,7 +67,7 @@ export function DashboardAccountMenu() {
   }, [isOwner, currentOrganization?.id]);
 
   const showWarning = Boolean(isOwner && alert?.showWarning);
-  const tooltip = useMemo(() => warningTooltip(alert), [alert]);
+  const tooltip = useMemo(() => warningTooltip(alert, tAccount), [alert, tAccount]);
 
   const handleLogout = useCallback(() => {
     setOpen(false);
@@ -98,7 +104,7 @@ export function DashboardAccountMenu() {
           className="absolute right-0 mt-2 w-72 rounded-[var(--radius-md)] border border-border bg-background-secondary/95 py-2 shadow-lg z-[200] backdrop-blur-sm"
         >
           <div className="px-3 py-2 border-b border-border/60">
-            <p className="text-xs text-text-muted">Signed in</p>
+            <p className="text-xs text-text-muted">{t('signedIn')}</p>
             <p className="text-sm font-medium truncate">{user?.email}</p>
             <p className="text-xs text-text-secondary mt-1 truncate">
               {currentOrganization?.name}
@@ -113,7 +119,7 @@ export function DashboardAccountMenu() {
               onClick={() => setOpen(false)}
             >
               <Building2 className="h-4 w-4 icon-flat shrink-0" />
-              Switch organization
+              {t('switchOrganization')}
             </Link>
 
             {isOwner && (
@@ -124,7 +130,7 @@ export function DashboardAccountMenu() {
                 onClick={() => setOpen(false)}
               >
                 <CreditCard className="h-4 w-4 icon-flat shrink-0" />
-                Subscriptions
+                {t('subscriptions')}
               </Link>
             )}
 
@@ -135,7 +141,7 @@ export function DashboardAccountMenu() {
               onClick={() => setOpen(false)}
             >
               <User className="h-4 w-4 icon-flat shrink-0" />
-              Account
+              {t('account')}
             </Link>
           </div>
 
@@ -147,7 +153,7 @@ export function DashboardAccountMenu() {
               onClick={handleLogout}
             >
               <LogOut className="h-4 w-4 icon-flat shrink-0" />
-              Log out
+              {t('signOut')}
             </button>
           </div>
         </div>
diff --git a/frontend/src/components/ui/organizations/CopyInvitationLinkButton.tsx b/frontend/src/components/ui/organizations/CopyInvitationLinkButton.tsx
index a8df1c8..734f000 100644
--- a/frontend/src/components/ui/organizations/CopyInvitationLinkButton.tsx
+++ b/frontend/src/components/ui/organizations/CopyInvitationLinkButton.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { Check, Copy } from 'lucide-react';
 import {
   canShareOrganizationInviteLink,
@@ -19,6 +20,8 @@ export function CopyInvitationLinkButton({
   copying,
   onCopy,
 }: CopyInvitationLinkButtonProps) {
+  const t = useTranslations('organizations');
+
   if (!canShareOrganizationInviteLink(invitation)) {
     return <span className="text-xs text-text-muted">—</span>;
   }
@@ -29,8 +32,8 @@ export function CopyInvitationLinkButton({
       className="p-2 rounded-md text-text-secondary hover:bg-background-card/80 hover:text-text-primary disabled:opacity-50"
       disabled={copying}
       onClick={onCopy}
-      aria-label="Copy invitation link"
-      title="Copy invitation link (generates a new link if needed)"
+      aria-label={t('copyInvitationLink')}
+      title={t('copyInvitationLinkTitle')}
     >
       {copied ? <Check className="w-4 h-4" /> : <Copy className="w-4 h-4" />}
     </button>
diff --git a/frontend/src/components/ui/organizations/InvitationHistoryDialog.tsx b/frontend/src/components/ui/organizations/InvitationHistoryDialog.tsx
index 10cd2bc..4bf5af4 100644
--- a/frontend/src/components/ui/organizations/InvitationHistoryDialog.tsx
+++ b/frontend/src/components/ui/organizations/InvitationHistoryDialog.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { DialogCloseButton } from '@/components/ui/shared/DialogCloseButton';
 import { ToastStack, type ToastMessages } from '@/components/ui/shared/Toast';
 import type { OrganizationInvitationHistoryItemDto } from '@/lib/api/organization';
@@ -7,14 +8,6 @@ import { Badge, organizationConnectionStatusVariant } from '@/components/ui/shar
 import { Table } from '@/components/ui/shared/Table';
 import { CopyInvitationLinkButton } from '@/components/ui/organizations/CopyInvitationLinkButton';
 
-function formatInvitationStatusLabel(status: OrganizationInvitationHistoryItemDto['status']): string {
-  if (status === 'PENDING') return 'Invitation pending';
-  if (status === 'ACTIVE') return 'Invitation accepted';
-  if (status === 'REJECTED') return 'Invitation rejected';
-  if (status === 'EXPIRED') return 'Invitation expired';
-  return status;
-}
-
 function formatTableDate(value: string): string {
   const d = new Date(value);
   if (Number.isNaN(d.getTime())) return '—';
@@ -43,6 +36,18 @@ export function InvitationHistoryDialog({
   onCopy,
   toastMessages,
 }: InvitationHistoryDialogProps) {
+  const t = useTranslations('organizations');
+
+  function formatInvitationStatusLabel(
+    status: OrganizationInvitationHistoryItemDto['status'],
+  ): string {
+    if (status === 'PENDING') return t('statusPending');
+    if (status === 'ACTIVE') return t('statusAccepted');
+    if (status === 'REJECTED') return t('statusRejected');
+    if (status === 'EXPIRED') return t('statusExpired');
+    return status;
+  }
+
   if (!open) return null;
 
   return (
@@ -55,7 +60,7 @@ export function InvitationHistoryDialog({
       >
         <div className="flex items-start justify-between gap-3">
           <h2 id="invitation-history-title" className="text-lg font-semibold text-text-primary pr-2">
-            Invitation History
+            {t('historyTitle')}
           </h2>
           <DialogCloseButton onClick={onClose} />
         </div>
@@ -63,27 +68,27 @@ export function InvitationHistoryDialog({
         {toastMessages && <ToastStack {...toastMessages} />}
 
         {loading ? (
-          <p className="text-sm text-text-secondary">Loading invitation history...</p>
+          <p className="text-sm text-text-secondary">{t('loadingHistory')}</p>
         ) : items.length === 0 ? (
-          <p className="text-sm text-text-secondary">No invitations yet.</p>
+          <p className="text-sm text-text-secondary">{t('historyEmpty')}</p>
         ) : (
           <Table
             headers={
               <tr>
                 <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
-                  Organization
+                  {t('tableOrganization')}
                 </th>
                 <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
-                  Owner email
+                  {t('tableOwnerEmail')}
                 </th>
                 <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
-                  Date
+                  {t('tableDate')}
                 </th>
                 <th className="px-6 py-3 text-center text-xs font-medium text-text-muted uppercase tracking-wider">
-                  Status
+                  {t('tableStatus')}
                 </th>
                 <th className="px-6 py-3 text-right text-xs font-medium text-text-muted uppercase tracking-wider">
-                  Invitation link
+                  {t('tableInvitationLink')}
                 </th>
               </tr>
             }
diff --git a/frontend/src/components/ui/organizations/OrganizationSelectorContent.tsx b/frontend/src/components/ui/organizations/OrganizationSelectorContent.tsx
index bfe1140..4d1f225 100644
--- a/frontend/src/components/ui/organizations/OrganizationSelectorContent.tsx
+++ b/frontend/src/components/ui/organizations/OrganizationSelectorContent.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useMemo, useState } from 'react';
+import { useTranslations } from 'next-intl';
 import { useAuth } from '@/lib/hooks/useAuth';
 import { canCreateOrganizationFromCurrentOrg } from '@/components/shared/permissions';
 import { Building2, Beaker, Mail } from 'lucide-react';
@@ -8,6 +9,9 @@ import { Input } from '@/components/ui/shared/Input';
 import { Button } from '@/components/ui/shared/Button';
 
 export function OrganizationSelectorContent() {
+  const t = useTranslations('organizations');
+  const tAuth = useTranslations('auth');
+  const tCommon = useTranslations('common');
   const {
     organizations,
     currentOrganization,
@@ -29,6 +33,9 @@ export function OrganizationSelectorContent() {
   const getIcon = (type: string) =>
     type === 'CLINIC' ? <Building2 className="h-8 w-8 icon-flat" /> : <Beaker className="h-8 w-8 icon-flat" />;
 
+  const getTypeLabel = (type: string) =>
+    type === 'CLINIC' ? tAuth('dentalClinic') : tAuth('dentalLab');
+
   const handleCreateOrganization = async () => {
     try {
       clearError();
@@ -48,18 +55,16 @@ export function OrganizationSelectorContent() {
   };
 
   if (isLoading) {
-    return <p className="text-text-secondary">Loading...</p>;
+    return <p className="text-text-secondary">{tCommon('loadingEllipsis')}</p>;
   }
 
   return (
     <div className="space-y-6">
       <div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4">
         <div>
-          <h1 className="text-3xl font-semibold text-text-primary">Organizations</h1>
+          <h1 className="text-3xl font-semibold text-text-primary">{t('selectorTitle')}</h1>
           <p className="text-text-secondary mt-2">
-            {canCreateOrganization
-              ? 'Select an organization to continue, or create a new one.'
-              : 'Select an organization to continue.'}
+            {canCreateOrganization ? t('selectorSubtitleWithCreate') : t('selectorSubtitleSelectOnly')}
           </p>
         </div>
         {canCreateOrganization && (
@@ -71,7 +76,7 @@ export function OrganizationSelectorContent() {
               setIsCreateOpen((prev) => !prev);
             }}
           >
-            {isCreateOpen ? 'Cancel' : 'Create Organization'}
+            {isCreateOpen ? tCommon('cancel') : t('createOrganization')}
           </Button>
         )}
       </div>
@@ -79,23 +84,23 @@ export function OrganizationSelectorContent() {
       {canCreateOrganization && isCreateOpen && (
         <div className="surface-card p-6 space-y-4">
           <Input
-            label="Organization name"
+            label={tAuth('organizationName')}
             value={organizationName}
             onChange={(event) => setOrganizationName(event.target.value)}
-            placeholder="Sunshine Dental Clinic"
+            placeholder={tAuth('organizationNamePlaceholder')}
             icon={<Building2 className="h-5 w-5 icon-flat" />}
           />
           <Input
-            label="Organization email"
+            label={tAuth('organizationEmail')}
             value={organizationEmail}
             onChange={(event) => setOrganizationEmail(event.target.value)}
-            placeholder="contact@sunshineclinic.com"
+            placeholder={tAuth('organizationEmailPlaceholder')}
             type="email"
             icon={<Mail className="h-5 w-5 icon-flat" />}
           />
           <div>
             <label className="block text-sm font-medium text-text-secondary mb-2">
-              Organization type
+              {tAuth('organizationType')}
             </label>
             <div className="grid grid-cols-2 gap-3">
               <button
@@ -107,7 +112,7 @@ export function OrganizationSelectorContent() {
                     : 'border-border text-text-secondary hover:border-border-strong'
                 }`}
               >
-                Dental Clinic
+                {tAuth('dentalClinic')}
               </button>
               <button
                 type="button"
@@ -118,7 +123,7 @@ export function OrganizationSelectorContent() {
                     : 'border-border text-text-secondary hover:border-border-strong'
                 }`}
               >
-                Dental Lab
+                {tAuth('dentalLab')}
               </button>
             </div>
           </div>
@@ -135,7 +140,7 @@ export function OrganizationSelectorContent() {
               isLoading={isLoading}
               disabled={!organizationName.trim() || !organizationEmail.trim()}
             >
-              Create and Continue
+              {t('createAndContinue')}
             </Button>
           </div>
         </div>
@@ -144,9 +149,7 @@ export function OrganizationSelectorContent() {
       {!organizations.length ? (
         <div className="surface-card p-8 text-center">
           <p className="text-text-secondary">
-            {canCreateOrganization
-              ? 'No organizations found. Create your first one to continue.'
-              : 'No organizations found. Ask an organization owner to invite you.'}
+            {canCreateOrganization ? t('emptyCanCreate') : t('emptyAskOwner')}
           </p>
         </div>
       ) : (
@@ -166,12 +169,12 @@ export function OrganizationSelectorContent() {
                   {org.name}
                 </h3>
                 <p className="text-sm text-text-secondary">
-                  {org.type === 'CLINIC' ? 'Dental Clinic' : 'Dental Lab'}
+                  {getTypeLabel(org.type)}
                 </p>
               </div>
 
               <div className="text-primary text-sm">
-                Continue →
+                {t('continueArrow')}
               </div>
             </button>
           ))}
diff --git a/frontend/src/components/ui/patient/CreatePatientModal.tsx b/frontend/src/components/ui/patient/CreatePatientModal.tsx
index 2a52439..e6f3e33 100644
--- a/frontend/src/components/ui/patient/CreatePatientModal.tsx
+++ b/frontend/src/components/ui/patient/CreatePatientModal.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { Button } from '@/components/ui/shared/Button';
 import { DialogCloseButton } from '@/components/ui/shared/DialogCloseButton';
 import { Input } from '@/components/ui/shared/Input';
@@ -31,26 +32,29 @@ function CreatePatientFormFields({
   loading: boolean;
   showCancel: boolean;
 }) {
+  const t = useTranslations('patients');
+  const tCommon = useTranslations('common');
+
   return (
     <>
       <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
         <Input
-          label="First name"
+          label={t('firstName')}
           value={formData.firstName || ''}
           onChange={(e) => onChange({ firstName: e.target.value })}
         />
         <Input
-          label="Last name"
+          label={t('lastName')}
           value={formData.lastName || ''}
           onChange={(e) => onChange({ lastName: e.target.value })}
         />
         <Input
-          label="Phone"
+          label={t('phone')}
           value={formData.phone || ''}
           onChange={(e) => onChange({ phone: e.target.value })}
         />
         <Input
-          label="Email"
+          label={tCommon('email')}
           type="email"
           value={formData.email || ''}
           onChange={(e) => onChange({ email: e.target.value })}
@@ -64,11 +68,11 @@ function CreatePatientFormFields({
           isLoading={loading}
           disabled={!formData.firstName || !formData.lastName}
         >
-          Save Patient
+          {t('savePatient')}
         </Button>
         {showCancel && (
           <Button variant="ghost" onClick={onClose}>
-            Cancel
+            {tCommon('cancel')}
           </Button>
         )}
       </div>
@@ -85,6 +89,8 @@ export function CreatePatientModal({
   loading = false,
   variant = 'inline',
 }: CreatePatientModalProps) {
+  const t = useTranslations('patients');
+
   if (!isOpen) {
     return null;
   }
@@ -112,7 +118,7 @@ export function CreatePatientModal({
               id="create-patient-dialog-title"
               className="text-lg font-semibold text-text-primary pr-2"
             >
-              New patient
+              {t('dialogTitle')}
             </h2>
             <DialogCloseButton onClick={onClose} />
           </div>
diff --git a/frontend/src/components/ui/patient/PatientSearchSelect.tsx b/frontend/src/components/ui/patient/PatientSearchSelect.tsx
index 1041080..4f4d707 100644
--- a/frontend/src/components/ui/patient/PatientSearchSelect.tsx
+++ b/frontend/src/components/ui/patient/PatientSearchSelect.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { Search } from 'lucide-react';
 import { Input } from '@/components/ui/shared/Input';
 import { Patient } from '@/types/patient';
@@ -21,20 +22,22 @@ export function PatientSearchSelect({
   onSelectPatient,
   loading = false,
 }: PatientSearchSelectProps) {
+  const t = useTranslations('patients');
+
   return (
     <div className="surface-card p-4 space-y-4">
       <Input
-        placeholder="Search patients by name, phone, email"
+        placeholder={t('searchPlaceholder')}
         value={search}
         onChange={(e) => onSearchChange(e.target.value)}
         icon={<Search className="h-4 w-4 icon-flat" />}
       />
 
       <div className="space-y-2 max-h-80 overflow-y-auto">
-        {loading && <p className="text-sm text-text-muted">Loading patients...</p>}
+        {loading && <p className="text-sm text-text-muted">{t('loadingPatients')}</p>}
 
         {!loading && patients.length === 0 && (
-          <p className="text-sm text-text-muted">No patients found for this search.</p>
+          <p className="text-sm text-text-muted">{t('noResults')}</p>
         )}
 
         {patients.map((patient) => {
@@ -53,7 +56,7 @@ export function PatientSearchSelect({
               <p className="text-sm font-medium text-text-primary">
                 {patient.firstName} {patient.lastName}
               </p>
-              <p className="text-xs text-text-muted">{patient.phone || patient.email || 'No contact'}</p>
+              <p className="text-xs text-text-muted">{patient.phone || patient.email || t('noContact')}</p>
             </button>
           );
         })}
diff --git a/frontend/src/components/ui/patient/PatientSummaryCard.tsx b/frontend/src/components/ui/patient/PatientSummaryCard.tsx
index 1e0d844..fb2e1aa 100644
--- a/frontend/src/components/ui/patient/PatientSummaryCard.tsx
+++ b/frontend/src/components/ui/patient/PatientSummaryCard.tsx
@@ -1,3 +1,6 @@
+'use client';
+
+import { useTranslations } from 'next-intl';
 import { Patient } from '@/types/patient';
 
 interface PatientSummaryCardProps {
@@ -5,10 +8,12 @@ interface PatientSummaryCardProps {
 }
 
 export function PatientSummaryCard({ patient }: PatientSummaryCardProps) {
+  const t = useTranslations('patients');
+
   if (!patient) {
     return (
       <div className="surface-card p-4">
-        <p className="text-sm text-text-muted">Select a patient to view details.</p>
+        <p className="text-sm text-text-muted">{t('selectPatient')}</p>
       </div>
     );
   }
@@ -18,10 +23,15 @@ export function PatientSummaryCard({ patient }: PatientSummaryCardProps) {
       <h2 className="text-lg font-semibold text-text-primary">
         {patient.firstName} {patient.lastName}
       </h2>
-      <p className="text-sm text-text-secondary">Phone: {patient.phone || '-'}</p>
-      <p className="text-sm text-text-secondary">Email: {patient.email || '-'}</p>
       <p className="text-sm text-text-secondary">
-        Status: {patient.isActive ? 'Active' : 'Inactive'}
+        {t('phoneLabel')} {patient.phone || t('emptyValue')}
+      </p>
+      <p className="text-sm text-text-secondary">
+        {t('emailLabel')} {patient.email || t('emptyValue')}
+      </p>
+      <p className="text-sm text-text-secondary">
+        {t('statusLabel')}{' '}
+        {patient.isActive ? t('statusActive') : t('statusInactive')}
       </p>
     </div>
   );
diff --git a/frontend/src/components/ui/shared/DialogCloseButton.tsx b/frontend/src/components/ui/shared/DialogCloseButton.tsx
index 07631d9..cac7e94 100644
--- a/frontend/src/components/ui/shared/DialogCloseButton.tsx
+++ b/frontend/src/components/ui/shared/DialogCloseButton.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { X } from 'lucide-react';
 
 type DialogCloseButtonProps = {
@@ -8,12 +9,14 @@ type DialogCloseButtonProps = {
 };
 
 export function DialogCloseButton({ onClick, className = '' }: DialogCloseButtonProps) {
+  const t = useTranslations('common');
+
   return (
     <button
       type="button"
       onClick={onClick}
       className={`shrink-0 rounded-[var(--radius-sm)] p-1.5 text-text-muted hover:text-text-primary hover:bg-background-secondary/80 focus:outline-none focus:ring-2 focus:ring-primary/35 ${className}`}
-      aria-label="Close"
+      aria-label={t('close')}
     >
       <X className="h-5 w-5 icon-flat" />
     </button>
diff --git a/frontend/src/components/ui/shared/LanguageToggle.tsx b/frontend/src/components/ui/shared/LanguageToggle.tsx
new file mode 100644
index 0000000..db8a1a8
--- /dev/null
+++ b/frontend/src/components/ui/shared/LanguageToggle.tsx
@@ -0,0 +1,94 @@
+'use client';
+
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { Globe, Check } from 'lucide-react';
+import { useLocale, useTranslations } from 'next-intl';
+import { usePathname, useRouter } from '@/i18n/navigation';
+import { useAuth } from '@/lib/hooks/useAuth';
+import { authApi } from '@/lib/api/auth';
+import { locales, type AppLocale } from '@/i18n/routing';
+
+const LOCALE_OPTIONS: AppLocale[] = [...locales];
+
+export function LanguageToggle() {
+  const t = useTranslations('language');
+  const locale = useLocale() as AppLocale;
+  const router = useRouter();
+  const pathname = usePathname();
+  const { user, setUserLanguage } = useAuth();
+  const [open, setOpen] = useState(false);
+  const menuRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const onDocClick = (e: MouseEvent) => {
+      if (menuRef.current && !menuRef.current.contains(e.target as Node)) {
+        setOpen(false);
+      }
+    };
+    document.addEventListener('mousedown', onDocClick);
+    return () => document.removeEventListener('mousedown', onDocClick);
+  }, []);
+
+  const switchLocale = useCallback(
+    async (next: AppLocale) => {
+      if (next === locale) {
+        setOpen(false);
+        return;
+      }
+
+      if (user) {
+        setUserLanguage(next);
+        try {
+          await authApi.updateLanguage(next);
+        } catch {
+          /* keep optimistic locale in client state */
+        }
+      }
+
+      router.replace(pathname, { locale: next });
+      setOpen(false);
+    },
+    [locale, pathname, router, setUserLanguage, user],
+  );
+
+  return (
+    <div className="relative" ref={menuRef}>
+      <button
+        type="button"
+        onClick={() => setOpen((value) => !value)}
+        className="inline-flex h-9 shrink-0 items-center justify-center gap-1.5 rounded-[var(--radius-md)] border border-border/60 bg-background-secondary/80 px-2.5 text-text-primary hover:border-border-strong hover:bg-background-card/80 transition-colors"
+        aria-label={t('selectLanguage')}
+        aria-expanded={open}
+        aria-haspopup="listbox"
+        title={t('label')}
+      >
+        <Globe className="h-[18px] w-[18px] icon-flat" />
+        <span className="text-xs font-medium uppercase">{locale}</span>
+      </button>
+
+      {open && (
+        <ul
+          role="listbox"
+          aria-label={t('selectLanguage')}
+          className="absolute right-0 z-[200] mt-2 min-w-[10rem] rounded-[var(--radius-md)] border border-border bg-background-secondary/95 py-1 shadow-lg backdrop-blur-sm"
+        >
+          {LOCALE_OPTIONS.map((option) => {
+            const selected = option === locale;
+            return (
+              <li key={option} role="option" aria-selected={selected}>
+                <button
+                  type="button"
+                  className="flex w-full items-center justify-between gap-3 px-3 py-2 text-sm text-text-primary hover:bg-background-card/70"
+                  onClick={() => void switchLocale(option)}
+                >
+                  <span>{t(option)}</span>
+                  {selected && <Check className="h-4 w-4 text-primary shrink-0" />}
+                </button>
+              </li>
+            );
+          })}
+        </ul>
+      )}
+    </div>
+  );
+}
diff --git a/frontend/src/components/ui/shared/OrganizationCard.tsx b/frontend/src/components/ui/shared/OrganizationCard.tsx
index 2d785f1..68e3e41 100644
--- a/frontend/src/components/ui/shared/OrganizationCard.tsx
+++ b/frontend/src/components/ui/shared/OrganizationCard.tsx
@@ -1,5 +1,7 @@
-// src/components/ui/OrganizationCard.tsx
+'use client';
+
 import React from 'react';
+import { useTranslations } from 'next-intl';
 import { ChevronRight } from 'lucide-react';
 import type { Organization } from '@/types/organization';
 import { organizationTypeIcon } from '@/components/shared/organizationTypeIcon';
@@ -13,8 +15,11 @@ export const OrganizationCard: React.FC<OrganizationCardProps> = ({
   organization,
   onSelect,
 }) => {
+  const t = useTranslations('organizations');
+  const tAuth = useTranslations('auth');
   const Icon = organizationTypeIcon(organization.type);
-  const typeText = organization.type === 'CLINIC' ? 'Dental Clinic' : 'Dental Lab';
+  const typeText =
+    organization.type === 'CLINIC' ? tAuth('dentalClinic') : tAuth('dentalLab');
 
   return (
     <button
@@ -29,11 +34,14 @@ export const OrganizationCard: React.FC<OrganizationCardProps> = ({
         <p className="text-sm text-text-secondary">{typeText}</p>
         {organization.plan && (
           <p className="text-xs text-text-muted mt-1">
-            Plan: {organization.plan.name} • {organization.plan.maxUsers} users
+            {t('planLabel', {
+              name: organization.plan.name,
+              maxUsers: organization.plan.maxUsers,
+            })}
           </p>
         )}
       </div>
       <ChevronRight className="h-5 w-5 icon-flat text-text-muted group-hover:text-primary transition-colors" />
     </button>
   );
-};
\ No newline at end of file
+};
diff --git a/frontend/src/components/ui/shared/ScheduleDayPicker.tsx b/frontend/src/components/ui/shared/ScheduleDayPicker.tsx
index e91d297..2316703 100644
--- a/frontend/src/components/ui/shared/ScheduleDayPicker.tsx
+++ b/frontend/src/components/ui/shared/ScheduleDayPicker.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useEffect, useId, useRef, useState } from 'react';
+import { useTranslations } from 'next-intl';
 import { ChevronDown, ChevronLeft, ChevronRight } from 'lucide-react';
 import { addCalendarDays, startOfLocalDay } from '@/components/appointments/appointmentTime';
 
@@ -10,19 +11,19 @@ interface ScheduleDayPickerProps {
   label?: string;
 }
 
-const MONTH_LABELS = [
-  'January',
-  'February',
-  'March',
-  'April',
-  'May',
-  'June',
-  'July',
-  'August',
-  'September',
-  'October',
-  'November',
-  'December',
+const MONTH_KEYS = [
+  'monthJanuary',
+  'monthFebruary',
+  'monthMarch',
+  'monthApril',
+  'monthMay',
+  'monthJune',
+  'monthJuly',
+  'monthAugust',
+  'monthSeptember',
+  'monthOctober',
+  'monthNovember',
+  'monthDecember',
 ] as const;
 
 function daysInMonth(year: number, month: number): number {
@@ -55,12 +56,14 @@ const selectClassName = `
  * Calendar day navigator (arrows + year/month/day panel).
  * Does not restrict past dates — parent pages enforce read-only vs editable for schedule grids/forms.
  */
-export function ScheduleDayPicker({ value, onChange, label = 'Schedule date' }: ScheduleDayPickerProps) {
+export function ScheduleDayPicker({ value, onChange, label }: ScheduleDayPickerProps) {
+  const t = useTranslations('schedule');
   const panelId = useId();
   const rootRef = useRef<HTMLDivElement>(null);
   const [panelOpen, setPanelOpen] = useState(false);
 
   const normalizedValue = startOfLocalDay(value);
+  const resolvedLabel = label ?? t('defaultLabel');
 
   const labelText = normalizedValue.toLocaleDateString(undefined, {
     weekday: 'short',
@@ -108,13 +111,13 @@ export function ScheduleDayPicker({ value, onChange, label = 'Schedule date' }:
 
   return (
     <div ref={rootRef} className="relative w-full max-w-md">
-      <p className="text-sm font-medium text-text-secondary mb-2">{label}</p>
+      <p className="text-sm font-medium text-text-secondary mb-2">{resolvedLabel}</p>
       <div className="flex items-center gap-1 rounded-[var(--radius-md)] border border-border bg-background-secondary/90 px-1 py-1 shadow-[inset_0_1px_0_rgba(255,255,255,0.02)]">
         <button
           type="button"
           onClick={() => onChange(addCalendarDays(normalizedValue, -1))}
           className="shrink-0 rounded-[var(--radius-sm)] p-2 text-text-muted hover:text-text-primary hover:bg-background-card/80 focus:outline-none focus:ring-2 focus:ring-primary/35"
-          aria-label="Previous day"
+          aria-label={t('previousDay')}
         >
           <ChevronLeft className="h-4 w-4 icon-flat" />
         </button>
@@ -138,7 +141,7 @@ export function ScheduleDayPicker({ value, onChange, label = 'Schedule date' }:
           type="button"
           onClick={() => onChange(addCalendarDays(normalizedValue, 1))}
           className="shrink-0 rounded-[var(--radius-sm)] p-2 text-text-muted hover:text-text-primary hover:bg-background-card/80 focus:outline-none focus:ring-2 focus:ring-primary/35"
-          aria-label="Next day"
+          aria-label={t('nextDay')}
         >
           <ChevronRight className="h-4 w-4 icon-flat" />
         </button>
@@ -148,7 +151,7 @@ export function ScheduleDayPicker({ value, onChange, label = 'Schedule date' }:
         <div
           id={panelId}
           role="dialog"
-          aria-label="Choose schedule date"
+          aria-label={t('chooseDate')}
           className="absolute left-0 right-0 top-full z-50 mt-2 rounded-[var(--radius-md)] border border-border bg-background-secondary p-3 shadow-lg"
         >
           <div className="grid grid-cols-3 gap-2">
@@ -157,7 +160,7 @@ export function ScheduleDayPicker({ value, onChange, label = 'Schedule date' }:
                 htmlFor={`${panelId}-year`}
                 className="mb-1 block text-xs font-medium text-text-muted"
               >
-                Year
+                {t('year')}
               </label>
               <div className="relative">
                 <select
@@ -186,7 +189,7 @@ export function ScheduleDayPicker({ value, onChange, label = 'Schedule date' }:
                 htmlFor={`${panelId}-month`}
                 className="mb-1 block text-xs font-medium text-text-muted"
               >
-                Month
+                {t('month')}
               </label>
               <div className="relative">
                 <select
@@ -197,9 +200,9 @@ export function ScheduleDayPicker({ value, onChange, label = 'Schedule date' }:
                   }
                   className={selectClassName}
                 >
-                  {MONTH_LABELS.map((name, index) => (
-                    <option key={name} value={index}>
-                      {name}
+                  {MONTH_KEYS.map((key, index) => (
+                    <option key={key} value={index}>
+                      {t(key)}
                     </option>
                   ))}
                 </select>
@@ -215,7 +218,7 @@ export function ScheduleDayPicker({ value, onChange, label = 'Schedule date' }:
                 htmlFor={`${panelId}-day`}
                 className="mb-1 block text-xs font-medium text-text-muted"
               >
-                Day
+                {t('day')}
               </label>
               <div className="relative">
                 <select
diff --git a/frontend/src/components/ui/shared/Sidebar.tsx b/frontend/src/components/ui/shared/Sidebar.tsx
index 7738326..6e55a0c 100644
--- a/frontend/src/components/ui/shared/Sidebar.tsx
+++ b/frontend/src/components/ui/shared/Sidebar.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import Link from 'next/link';
 import { memo, useMemo } from 'react';
-import { usePathname } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+import { Link, usePathname } from '@/i18n/navigation';
 import {
   LayoutDashboard,
   Users,
@@ -20,56 +20,48 @@ import {
   organizationTypeIcon,
 } from '@/components/shared/organizationTypeIcon';
 
-const menu = [
-  { name: 'Dashboard', path: '/today', icon: LayoutDashboard, read: 'TAB_TODAY_READ' as const },
-  { name: 'Staff', path: '/staff', icon: UserCog, read: 'TAB_STAFF_READ' as const },
-  { name: 'Patients', path: '/patients', icon: Users, read: 'TAB_PATIENTS_READ' as const },
-  { name: 'Appointment', path: '/appointments', icon: Calendar, read: 'TAB_APPOINTMENTS_READ' as const },
-  { name: 'Treatment', path: '/treatment', icon: FlaskConical, read: 'TAB_TREATMENT_READ' as const },
-  { name: 'Billing', path: '/billing', icon: CreditCard, read: 'TAB_BILLING_READ' as const },
-  { name: 'Reports', path: '/reports', icon: FileText, read: 'TAB_REPORTS_READ' as const },
-];
-
 function Sidebar() {
+  const t = useTranslations('nav');
+  const tCommon = useTranslations('common');
   const pathname = usePathname();
   const { currentOrganization } = useAuth();
   const pendingConnectionsCount = usePendingConnectionsCount();
-  const counterpartLabel = currentOrganization?.type === 'LAB' ? 'Clinics' : 'Labs';
-  const organizationsTabIcon = organizationTypeIcon(
-    counterpartOrganizationType(currentOrganization?.type),
+
+
+  const menu = useMemo(
+    () => [
+      { name: t('dashboard'), path: '/today', icon: LayoutDashboard, read: 'TAB_TODAY_READ' as const },
+      { name: t('staff'), path: '/staff', icon: UserCog, read: 'TAB_STAFF_READ' as const },
+      {
+        name: currentOrganization?.type === 'LAB' ? t('clinics') : t('labs'),
+        path: '/organizations',
+        icon: organizationTypeIcon(counterpartOrganizationType(currentOrganization?.type)),
+        read: 'TAB_ORGANIZATIONS_READ' as const,
+      },
+      { name: t('patients'), path: '/patients', icon: Users, read: 'TAB_PATIENTS_READ' as const },
+      { name: t('appointment'), path: '/appointments', icon: Calendar, read: 'TAB_APPOINTMENTS_READ' as const },
+      { name: t('treatment'), path: '/treatment', icon: FlaskConical, read: 'TAB_TREATMENT_READ' as const },
+      { name: t('billing'), path: '/billing', icon: CreditCard, read: 'TAB_BILLING_READ' as const },
+      { name: t('reports'), path: '/reports', icon: FileText, read: 'TAB_REPORTS_READ' as const },
+    ],
+    [currentOrganization?.type, t],
   );
 
   const visibleMenu = useMemo(
-    () => {
-      const withCounterpartTab = [
-        menu[0],
-        menu[1],
-        {
-          name: counterpartLabel,
-          path: '/organizations',
-          icon: organizationsTabIcon,
-          read: 'TAB_ORGANIZATIONS_READ' as const,
-        },
-        menu[2],
-        menu[3],
-        menu[4],
-        menu[5],
-        menu[6],
-      ];
-      return withCounterpartTab.filter((item) => {
+    () =>
+      menu.filter((item) => {
         if (item.path === '/appointments') {
           return canAccessAppointmentsSection(currentOrganization);
         }
         return canViewTab(currentOrganization, item.read);
-      });
-    },
-    [counterpartLabel, organizationsTabIcon, currentOrganization],
+      }),
+    [currentOrganization, menu],
   );
 
   return (
     <aside className="w-64 bg-background-secondary/90 border-r border-border text-text-primary flex flex-col">
       <div className="h-[71px] px-4 flex items-center">
-        <h1 className="text-lg font-medium tracking-tight">DyoLink</h1>
+        <h1 className="text-lg font-medium tracking-tight">{tCommon('appName')}</h1>
       </div>
       <div className="mx-4 border-b border-border/70" />
 
@@ -82,7 +74,7 @@ function Sidebar() {
 
           return (
             <Link
-              key={item.name}
+              key={item.path}
               href={item.path}
               prefetch
               className={`flex items-center gap-3 px-3 py-2.5 rounded-[var(--radius-sm)] border transition-colors ${
@@ -109,4 +101,4 @@ function Sidebar() {
   );
 }
 
-export default memo(Sidebar);
\ No newline at end of file
+export default memo(Sidebar);
diff --git a/frontend/src/components/ui/shared/ThemeToggle.tsx b/frontend/src/components/ui/shared/ThemeToggle.tsx
index dc812ea..9034c1d 100644
--- a/frontend/src/components/ui/shared/ThemeToggle.tsx
+++ b/frontend/src/components/ui/shared/ThemeToggle.tsx
@@ -2,9 +2,11 @@
 
 import { useEffect, useState } from 'react';
 import { Moon, Sun } from 'lucide-react';
+import { useTranslations } from 'next-intl';
 import { applyTheme, getStoredTheme, type ThemeMode } from '@/lib/theme';
 
 export function ThemeToggle() {
+  const t = useTranslations('theme');
   const [mode, setMode] = useState<ThemeMode | null>(null);
 
   useEffect(() => {
@@ -34,8 +36,8 @@ export function ThemeToggle() {
       type="button"
       onClick={handleClick}
       className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-[var(--radius-md)] border border-border/60 bg-background-secondary/80 text-text-primary hover:border-border-strong hover:bg-background-card/80 transition-colors"
-      aria-label={isDark ? 'Switch to light mode' : 'Switch to dark mode'}
-      title={isDark ? 'Light mode' : 'Dark mode'}
+      aria-label={isDark ? t('switchToLight') : t('switchToDark')}
+      title={isDark ? t('lightMode') : t('darkMode')}
     >
       {isDark ? (
         <Sun className="h-[18px] w-[18px] icon-flat" />
diff --git a/frontend/src/components/ui/shared/TopBarControls.tsx b/frontend/src/components/ui/shared/TopBarControls.tsx
new file mode 100644
index 0000000..2ad8d1d
--- /dev/null
+++ b/frontend/src/components/ui/shared/TopBarControls.tsx
@@ -0,0 +1,13 @@
+'use client';
+
+import { LanguageToggle } from '@/components/ui/shared/LanguageToggle';
+import { ThemeToggle } from '@/components/ui/shared/ThemeToggle';
+
+export function TopBarControls({ className = '' }: { className?: string }) {
+  return (
+    <div className={`flex items-center gap-3 shrink-0 ${className}`.trim()}>
+      <LanguageToggle />
+      <ThemeToggle />
+    </div>
+  );
+}
diff --git a/frontend/src/components/ui/treatment/AppointmentsStrip.tsx b/frontend/src/components/ui/treatment/AppointmentsStrip.tsx
index 0a5cfb6..20f4f29 100644
--- a/frontend/src/components/ui/treatment/AppointmentsStrip.tsx
+++ b/frontend/src/components/ui/treatment/AppointmentsStrip.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { CalendarDays } from 'lucide-react';
 import { purposeStyle } from '@/components/ui/appointments/appointmentPurposeStyles';
 import { Card } from '@/components/ui/shared/Card';
@@ -7,6 +8,14 @@ import { ScheduleDayPicker } from '@/components/ui/shared/ScheduleDayPicker';
 import { startOfLocalDay } from '@/components/appointments/appointmentTime';
 import type { TreatmentAppointment } from '@/types/treatment';
 
+const TREATMENT_TYPE_KEYS = {
+  consultation: 'typeConsultation',
+  filling: 'typeFilling',
+  endo: 'typeEndo',
+  visit: 'typeVisit',
+  hygiene: 'typeHygiene',
+} as const;
+
 interface AppointmentsStripProps {
   stripHidden: boolean;
   onToggleStripHidden: () => void;
@@ -28,16 +37,18 @@ export function AppointmentsStrip({
   onSelectAppointment,
   loading = false,
 }: AppointmentsStripProps) {
+  const t = useTranslations('treatment');
+
   if (stripHidden) {
     return (
       <Card className="flex items-center justify-between gap-3 flex-wrap" padding="sm">
-        <p className="text-sm text-text-secondary">Appointments are hidden.</p>
+        <p className="text-sm text-text-secondary">{t('hiddenMessage')}</p>
         <button
           type="button"
           onClick={onToggleStripHidden}
           className="text-sm font-medium text-primary hover:underline focus:outline-none focus-visible:ring-2 focus-visible:ring-primary/40 rounded-[var(--radius-sm)]"
         >
-          Show appointments
+          {t('showAppointments')}
         </button>
       </Card>
     );
@@ -48,14 +59,14 @@ export function AppointmentsStrip({
       <div className="flex items-center justify-between gap-3 flex-wrap">
         <div className="flex items-center gap-2 min-w-0">
           <CalendarDays className="w-5 h-5 text-text-muted shrink-0 icon-flat" aria-hidden />
-          <h2 className="text-sm font-semibold text-text-primary truncate">My appointments</h2>
+          <h2 className="text-sm font-semibold text-text-primary truncate">{t('appointmentsTitle')}</h2>
         </div>
         <button
           type="button"
           onClick={onToggleStripHidden}
           className="text-sm font-medium text-primary hover:underline focus:outline-none focus-visible:ring-2 focus-visible:ring-primary/40 rounded-[var(--radius-sm)]"
         >
-          Hide appointments
+          {t('hideAppointments')}
         </button>
       </div>
 
@@ -65,13 +76,13 @@ export function AppointmentsStrip({
           onChange={(d) => onSelectDay(startOfLocalDay(d))}
         />
         {loading && (
-          <p className="text-sm text-text-muted pb-2">Loading appointments…</p>
+          <p className="text-sm text-text-muted pb-2">{t('loadingAppointments')}</p>
         )}
       </div>
 
       <div className="flex flex-wrap gap-2">
         {appointments.length === 0 && (
-          <p className="text-sm text-text-muted">No appointments assigned to you on this day.</p>
+          <p className="text-sm text-text-muted">{t('emptyDay')}</p>
         )}
         {appointments.map((a) => {
           const sel = a.id === selectedAppointmentId;
@@ -85,6 +96,7 @@ export function AppointmentsStrip({
             minute: '2-digit',
           })}`;
           const palette = purposeStyle(a.purpose);
+          const purposeKey = TREATMENT_TYPE_KEYS[a.purpose as keyof typeof TREATMENT_TYPE_KEYS];
           return (
             <Card
               as="button"
@@ -103,7 +115,9 @@ export function AppointmentsStrip({
               <p className="text-sm font-medium leading-tight truncate mt-0.5">
                 {a.patientFirstName} {a.patientLastName}
               </p>
-              <p className="text-[11px] opacity-90 capitalize mt-0.5">{a.purpose}</p>
+              <p className="text-[11px] opacity-90 capitalize mt-0.5">
+                {purposeKey ? t(purposeKey) : a.purpose}
+              </p>
             </Card>
           );
         })}
diff --git a/frontend/src/components/ui/treatment/CaseSentLabel.tsx b/frontend/src/components/ui/treatment/CaseSentLabel.tsx
index ef9460c..281cbe6 100644
--- a/frontend/src/components/ui/treatment/CaseSentLabel.tsx
+++ b/frontend/src/components/ui/treatment/CaseSentLabel.tsx
@@ -1,3 +1,6 @@
+'use client';
+
+import { useTranslations } from 'next-intl';
 import { formatCaseSentLines } from '@/components/treatment/caseSendLabel';
 import type { LinkedOrganizationOption, PastTreatmentCase, TreatmentCaseDraft } from '@/types/treatment';
 
@@ -11,11 +14,12 @@ interface CaseSentLabelProps {
 }
 
 export function CaseSentLabel({ treatmentCase, orgs, className = 'text-xs text-text-muted' }: CaseSentLabelProps) {
+  const t = useTranslations('treatment');
   const lines = formatCaseSentLines(treatmentCase.sends, {
     organizationIds: treatmentCase.sendToOrganizationIds ?? [],
     sentAt: treatmentCase.sentAt ?? null,
     orgs,
-  });
+  }, t);
 
   if (lines.length === 0) return null;
 
diff --git a/frontend/src/components/ui/treatment/FdiToothChart.tsx b/frontend/src/components/ui/treatment/FdiToothChart.tsx
index 49099e5..ce89280 100644
--- a/frontend/src/components/ui/treatment/FdiToothChart.tsx
+++ b/frontend/src/components/ui/treatment/FdiToothChart.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useId } from 'react';
+import { useTranslations } from 'next-intl';
 import { FDI_LOWER_LEFT_TO_RIGHT, FDI_UPPER_LEFT_TO_RIGHT, getToothShapeKind } from '@/components/treatment/fdiToothMeta';
 import { ToothGlyph } from '@/components/ui/treatment/ToothGlyph';
 import type { FdiToothId } from '@/types/treatment';
@@ -25,6 +26,7 @@ interface FdiToothChartProps {
 }
 
 export function FdiToothChart({ selected, onToggle, disabled }: FdiToothChartProps) {
+  const t = useTranslations('treatment');
   const uid = useId().replace(/:/g, '');
   const archPeak = 10;
 
@@ -127,7 +129,11 @@ export function FdiToothChart({ selected, onToggle, disabled }: FdiToothChartPro
                   ${disabled ? 'opacity-50 cursor-not-allowed' : 'hover:scale-105 active:scale-95'}
                 `}
                 aria-pressed={isSel}
-                aria-label={`FDI tooth ${fdi}${isSel ? ', selected' : ''}`}
+                aria-label={
+                  isSel
+                    ? `${t('toothAria', { fdi })}${t('toothSelectedSuffix')}`
+                    : t('toothAria', { fdi })
+                }
               >
                 <ToothGlyph
                   fdi={fdi}
@@ -151,17 +157,17 @@ export function FdiToothChart({ selected, onToggle, disabled }: FdiToothChartPro
     <div className="surface-card p-3 space-y-3">
       <div className="flex flex-col gap-1.5 sm:flex-row sm:items-center sm:justify-between">
         <div>
-          <h3 className="text-sm font-semibold text-text-primary">FDI tooth chart</h3>
+          <h3 className="text-sm font-semibold text-text-primary">{t('toothChartTitle')}</h3>
           <p className="text-[11px] text-text-muted mt-0.5">
-            Tap teeth to multi-select. Applies to the active case.
+            {t('toothChartHint')}
           </p>
         </div>
         <p className="text-[11px] text-text-secondary tabular-nums sm:text-right">
-          Selected: {selected.size === 0 ? '—' : [...selected].sort().join(', ')}
+          {t('selectedLabel')} {selected.size === 0 ? t('selectedEmpty') : [...selected].sort().join(', ')}
         </p>
       </div>
 
-      <p className="text-[11px] uppercase tracking-wide text-text-muted mb-1 text-center">Upper arch</p>
+      <p className="text-[11px] uppercase tracking-wide text-text-muted mb-1 text-center">{t('upperArch')}</p>
 
       <div className="overflow-x-auto py-1 -mx-1 px-1">
         <div className="relative isolate min-w-max mx-auto w-fit">
@@ -215,7 +221,7 @@ export function FdiToothChart({ selected, onToggle, disabled }: FdiToothChartPro
         </div>
       </div>
 
-      <p className="text-[11px] uppercase tracking-wide text-text-muted mt-1 text-center">Lower arch</p>
+      <p className="text-[11px] uppercase tracking-wide text-text-muted mt-1 text-center">{t('lowerArch')}</p>
     </div>
   );
 }
diff --git a/frontend/src/components/ui/treatment/PastTreatmentsPanel.tsx b/frontend/src/components/ui/treatment/PastTreatmentsPanel.tsx
index fe0fd4c..68031bf 100644
--- a/frontend/src/components/ui/treatment/PastTreatmentsPanel.tsx
+++ b/frontend/src/components/ui/treatment/PastTreatmentsPanel.tsx
@@ -1,9 +1,18 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { FileText } from 'lucide-react';
 import type { PastTreatment } from '@/types/treatment';
 import { CaseSentLabel } from '@/components/ui/treatment/CaseSentLabel';
 
+const TREATMENT_TYPE_KEYS = {
+  consultation: 'typeConsultation',
+  filling: 'typeFilling',
+  endo: 'typeEndo',
+  visit: 'typeVisit',
+  hygiene: 'typeHygiene',
+} as const;
+
 interface PastTreatmentsPanelProps {
   items: PastTreatment[];
   loading?: boolean;
@@ -15,43 +24,50 @@ export function PastTreatmentsPanel({
   loading,
   onReviewTreatment,
 }: PastTreatmentsPanelProps) {
+  const t = useTranslations('treatment');
+  const tCommon = useTranslations('common');
+
   return (
     <div className="surface-card p-4 space-y-3">
       <div>
-        <h3 className="text-sm font-semibold text-text-primary">Previous treatments</h3>
+        <h3 className="text-sm font-semibold text-text-primary">{t('historyTitle')}</h3>
         <p className="text-[11px] text-text-muted mt-0.5">
-          Completed treatments for this patient. Each case is listed separately.
+          {t('historySubtitle')}
         </p>
       </div>
 
-      {loading && <p className="text-sm text-text-muted">Loading history…</p>}
+      {loading && <p className="text-sm text-text-muted">{t('loadingHistory')}</p>}
 
       {!loading && items.length === 0 && (
-        <p className="text-sm text-text-muted">No prior treatments for this patient.</p>
+        <p className="text-sm text-text-muted">{t('historyEmpty')}</p>
       )}
 
       <div className="space-y-3 max-h-[min(420px,50vh)] overflow-y-auto pr-1">
-        {items.map((t) => (
+        {items.map((treatment) => (
           <article
-            key={t.id}
+            key={treatment.id}
             className="border border-border/70 rounded-[var(--radius-md)] p-2.5 bg-background-secondary/40 space-y-2"
           >
             <div className="flex items-start justify-between gap-2">
               <div className="min-w-0">
-                <p className="text-sm font-medium text-text-primary truncate">{t.title}</p>
-                <p className="text-[11px] text-text-secondary capitalize mt-0.5">Status: {t.status}</p>
+                <p className="text-sm font-medium text-text-primary truncate">{treatment.title}</p>
+                <p className="text-[11px] text-text-secondary capitalize mt-0.5">
+                  {t('statusLabel')} {treatment.status}
+                </p>
               </div>
               <time
                 className="text-[11px] text-text-muted tabular-nums shrink-0"
-                dateTime={t.treatmentAt}
+                dateTime={treatment.treatmentAt}
               >
-                {new Date(t.treatmentAt).toLocaleDateString()}
+                {new Date(treatment.treatmentAt).toLocaleDateString()}
               </time>
             </div>
 
             <div className="space-y-1.5">
-              {t.cases.map((c, idx) => {
+              {treatment.cases.map((c, idx) => {
                 const attachments = c.attachmentMetas ?? [];
+                const typeKey = TREATMENT_TYPE_KEYS[c.treatmentType as keyof typeof TREATMENT_TYPE_KEYS];
+                const typeLabel = typeKey ? t(typeKey) : c.treatmentType;
                 return (
                   <div
                     key={c.id}
@@ -59,7 +75,7 @@ export function PastTreatmentsPanel({
                   >
                     <div className="flex items-center justify-between gap-2">
                       <p className="text-xs font-medium text-text-primary capitalize">
-                        Case {idx + 1} · {c.treatmentType}
+                        {t('historyCaseLabel', { n: idx + 1, type: typeLabel })}
                       </p>
                       {c.sentAt && (
                         <CaseSentLabel
@@ -69,17 +85,17 @@ export function PastTreatmentsPanel({
                       )}
                     </div>
                     <p className="text-[11px] text-text-secondary">
-                      Teeth: {c.teeth.length ? [...c.teeth].sort().join(', ') : 'None selected'}
+                      {t('teethLabel')} {c.teeth.length ? [...c.teeth].sort().join(', ') : t('teethNone')}
                     </p>
                     {c.notes?.trim() && (
                       <p className="text-[11px] text-text-muted line-clamp-2">{c.notes}</p>
                     )}
                     <div>
                       <p className="text-[10px] uppercase tracking-wide text-text-muted mb-1">
-                        Attachments
+                        {t('attachments')}
                       </p>
                       {attachments.length === 0 ? (
-                        <p className="text-[11px] text-text-muted">None</p>
+                        <p className="text-[11px] text-text-muted">{tCommon('none')}</p>
                       ) : (
                         <ul className="space-y-0.5">
                           {attachments.map((doc) => (
@@ -106,10 +122,10 @@ export function PastTreatmentsPanel({
               <div className="pt-1 flex justify-end">
                 <button
                   type="button"
-                  onClick={() => onReviewTreatment(t)}
+                  onClick={() => onReviewTreatment(treatment)}
                   className="text-xs text-primary hover:underline focus:outline-none focus-visible:ring-2 focus-visible:ring-primary/35 rounded-[var(--radius-sm)] px-1"
                 >
-                  Review details
+                  {t('reviewDetails')}
                 </button>
               </div>
             )}
diff --git a/frontend/src/components/ui/treatment/TreatmentCasesEditor.tsx b/frontend/src/components/ui/treatment/TreatmentCasesEditor.tsx
index 1ce2135..0d24eae 100644
--- a/frontend/src/components/ui/treatment/TreatmentCasesEditor.tsx
+++ b/frontend/src/components/ui/treatment/TreatmentCasesEditor.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useRef } from 'react';
+import { useTranslations } from 'next-intl';
 import { Button } from '@/components/ui/shared/Button';
 import { Checkbox } from '@/components/ui/shared/Checkbox';
 import { Dropdown } from '@/components/ui/shared/Dropdown';
@@ -54,6 +55,8 @@ export function TreatmentCasesEditor({
   onSendCase,
   onUploadFiles,
 }: TreatmentCasesEditorProps) {
+  const t = useTranslations('treatment');
+  const tCommon = useTranslations('common');
   const attachmentInputRef = useRef<HTMLInputElement>(null);
   const activeCase = cases.find((c) => c.clientId === activeCaseId) ?? cases[0];
   const activeLinkedOrganizations = orgs.filter((o) => o.active);
@@ -84,17 +87,17 @@ export function TreatmentCasesEditor({
     <div className="surface-card p-4 space-y-4">
       <div className="flex flex-wrap items-center justify-between gap-3">
         <div>
-          <h3 className="text-sm font-semibold text-text-primary">Treatment cases</h3>
+          <h3 className="text-sm font-semibold text-text-primary">{t('casesTitle')}</h3>
           <p className="text-xs text-text-muted mt-0.5">
-            Each case has its own teeth, notes, attachments, and destinations for send.
+            {t('casesSubtitle')}
           </p>
         </div>
         <div className="flex flex-wrap items-center gap-2">
           <Button type="button" variant="secondary" disabled={!canEdit || disabled} onClick={onPreview}>
-            Preview
+            {tCommon('preview')}
           </Button>
           <Button type="button" variant="primary" disabled={!canEdit || disabled} onClick={onAddCase}>
-            Add case
+            {t('addCase')}
           </Button>
         </div>
       </div>
@@ -105,7 +108,7 @@ export function TreatmentCasesEditor({
             organizationIds: c.sendToOrganizationIds ?? [],
             sentAt: c.sentAt ?? null,
             orgs,
-          });
+          }, t);
           return (
           <button
             key={c.clientId}
@@ -121,7 +124,7 @@ export function TreatmentCasesEditor({
               }
             `}
           >
-            Case {idx + 1}
+            {t('caseLabel', { n: idx + 1 })}
             {sentSummary ? ` · ${sentSummary}` : ''}
           </button>
           );
@@ -130,7 +133,7 @@ export function TreatmentCasesEditor({
 
       <div className="space-y-4 border border-border/60 rounded-[var(--radius-md)] p-4 bg-background-secondary/30">
         <label className="block text-xs font-medium text-text-secondary">
-          Comments
+          {t('comments')}
           <textarea
             value={activeCase.comment}
             onChange={(e) => {
@@ -139,7 +142,7 @@ export function TreatmentCasesEditor({
                 cases.map((c) => (c.clientId === activeCaseId ? { ...c, comment: v } : c)),
               );
             }}
-            placeholder="Write clinical notes for this case…"
+            placeholder={t('commentsPlaceholder')}
             rows={5}
             disabled={disabled || Boolean(activeCase.sentAt)}
             className="mt-1.5 w-full rounded-[var(--radius-md)] border border-border bg-background-secondary/90 text-text-primary text-sm px-3 py-2 placeholder:text-text-muted focus:outline-none focus:ring-2 focus:ring-primary/35 resize-y min-h-[120px]"
@@ -148,7 +151,7 @@ export function TreatmentCasesEditor({
 
         <div>
           <Dropdown
-            label="Treatment type"
+            label={t('treatmentType')}
             value={activeCase.treatmentType}
             onChange={(e) => {
               const nextType = e.target.value as TreatmentCaseDraft['treatmentType'];
@@ -162,16 +165,16 @@ export function TreatmentCasesEditor({
             className="capitalize"
             style={{ color: treatmentTypeTextColor }}
           >
-            <option value="consultation" style={{ color: '#ddd6fe', backgroundColor: '#14253d' }} className="capitalize">consultation</option>
-            <option value="filling" style={{ color: '#fed7aa', backgroundColor: '#14253d' }} className="capitalize">filling</option>
-            <option value="endo" style={{ color: '#fecaca', backgroundColor: '#14253d' }} className="capitalize">endo</option>
-            <option value="visit" style={{ color: '#bae6fd', backgroundColor: '#14253d' }} className="capitalize">visit</option>
-            <option value="hygiene" style={{ color: '#d9f99d', backgroundColor: '#14253d' }} className="capitalize">hygiene</option>
+            <option value="consultation" style={{ color: '#ddd6fe', backgroundColor: '#14253d' }} className="capitalize">{t('typeConsultation')}</option>
+            <option value="filling" style={{ color: '#fed7aa', backgroundColor: '#14253d' }} className="capitalize">{t('typeFilling')}</option>
+            <option value="endo" style={{ color: '#fecaca', backgroundColor: '#14253d' }} className="capitalize">{t('typeEndo')}</option>
+            <option value="visit" style={{ color: '#bae6fd', backgroundColor: '#14253d' }} className="capitalize">{t('typeVisit')}</option>
+            <option value="hygiene" style={{ color: '#d9f99d', backgroundColor: '#14253d' }} className="capitalize">{t('typeHygiene')}</option>
           </Dropdown>
         </div>
 
         <div>
-          <p className="text-xs font-medium text-text-secondary mb-2">Attachments</p>
+          <p className="text-xs font-medium text-text-secondary mb-2">{t('attachments')}</p>
           <input
             ref={attachmentInputRef}
             id="treatment-case-attachments"
@@ -183,7 +186,7 @@ export function TreatmentCasesEditor({
               e.target.value = '';
             }}
             className="sr-only"
-            aria-label="Attach files for this treatment case"
+            aria-label={t('attachFiles')}
           />
           <Button
             type="button"
@@ -193,7 +196,7 @@ export function TreatmentCasesEditor({
             onClick={() => attachmentInputRef.current?.click()}
             aria-controls="treatment-case-attachments"
           >
-            Choose files
+            {t('chooseFiles')}
           </Button>
           {activeCase.attachmentMetas.length > 0 && (
             <ul className="mt-2 space-y-1 text-xs text-text-muted">
@@ -208,17 +211,17 @@ export function TreatmentCasesEditor({
 
         <div>
           <p className="text-xs font-medium text-text-secondary mb-2">
-            Send this case to linked organizations
+            {t('sendToOrgs')}
           </p>
           <div className="space-y-2 mb-2">
             <SearchBar
               value={organizationSearch}
               onChange={onOrganizationSearchChange}
-              placeholder="Search active organizations..."
+              placeholder={t('searchOrgsPlaceholder')}
             />
             {recentOrganizations.length > 0 && (
               <div className="flex flex-wrap items-center gap-2">
-                <span className="text-xs text-text-muted">Recent:</span>
+                <span className="text-xs text-text-muted">{t('recent')}</span>
                 {recentOrganizations.map((o) => (
                   <button
                     key={o.id}
@@ -254,7 +257,7 @@ export function TreatmentCasesEditor({
               />
             ))}
             {filteredOrganizations.length === 0 && (
-              <p className="text-xs text-text-muted">No active organization matches your search.</p>
+              <p className="text-xs text-text-muted">{t('noOrgMatch')}</p>
             )}
           </div>
         </div>
@@ -267,7 +270,7 @@ export function TreatmentCasesEditor({
             isLoading={sendBusyId === activeCase.clientId}
             onClick={() => onSendCase(activeCase)}
           >
-            Send this case
+            {t('sendThisCase')}
           </Button>
           {activeCase.sentAt && (
             <CaseSentLabel treatmentCase={activeCase} orgs={orgs} />
@@ -284,10 +287,10 @@ export function TreatmentCasesEditor({
             isLoading={saveBusy}
             onClick={onSave}
           >
-            Save treatment draft
+            {t('saveDraft')}
           </Button>
           <p className="text-xs text-text-muted self-center">
-            {isDirty ? 'Unsaved changes' : 'Draft saved'}. Sending is per case and saves first automatically.
+            {isDirty ? t('unsavedChanges') : t('draftSaved')}. {t('sendSavesFirst')}
           </p>
         </div>
       )}
diff --git a/frontend/src/components/ui/treatment/TreatmentLatestAttachmentPreview.tsx b/frontend/src/components/ui/treatment/TreatmentLatestAttachmentPreview.tsx
index bb010fb..64dcbb9 100644
--- a/frontend/src/components/ui/treatment/TreatmentLatestAttachmentPreview.tsx
+++ b/frontend/src/components/ui/treatment/TreatmentLatestAttachmentPreview.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useEffect, useState } from 'react';
+import { useTranslations } from 'next-intl';
 import { FileText } from 'lucide-react';
 import { treatmentsApi } from '@/lib/api/treatments';
 import type { TreatmentAttachmentMeta } from '@/types/treatment';
@@ -22,6 +23,7 @@ export function TreatmentLatestAttachmentPreview({
   attachment,
   className = '',
 }: TreatmentLatestAttachmentPreviewProps) {
+  const tCommon = useTranslations('common');
   const [previewUrl, setPreviewUrl] = useState<string | null>(null);
   const [loadFailed, setLoadFailed] = useState(false);
   const [loading, setLoading] = useState(false);
@@ -72,11 +74,11 @@ export function TreatmentLatestAttachmentPreview({
     >
       {!attachment ? (
         <div className="flex h-full w-full items-center justify-center text-[10px] text-text-muted">
-          None
+          {tCommon('none')}
         </div>
       ) : loading ? (
         <div className="flex h-full w-full items-center justify-center text-[10px] text-text-muted">
-          …
+          {tCommon('loadingEllipsis')}
         </div>
       ) : loadFailed || !canRenderPreview || !previewUrl ? (
         <div className="flex h-full w-full flex-col items-center justify-center gap-1 p-1.5 text-center">
diff --git a/frontend/src/components/ui/treatment/TreatmentPreviewCard.tsx b/frontend/src/components/ui/treatment/TreatmentPreviewCard.tsx
index 5142767..27c51a9 100644
--- a/frontend/src/components/ui/treatment/TreatmentPreviewCard.tsx
+++ b/frontend/src/components/ui/treatment/TreatmentPreviewCard.tsx
@@ -1,8 +1,17 @@
 'use client';
 
+import { useTranslations } from 'next-intl';
 import { Button } from '@/components/ui/shared/Button';
 import type { PastTreatment } from '@/types/treatment';
 
+const TREATMENT_TYPE_KEYS = {
+  consultation: 'typeConsultation',
+  filling: 'typeFilling',
+  endo: 'typeEndo',
+  visit: 'typeVisit',
+  hygiene: 'typeHygiene',
+} as const;
+
 interface TreatmentPreviewCardProps {
   draft: PastTreatment | null;
   disabled?: boolean;
@@ -10,16 +19,22 @@ interface TreatmentPreviewCardProps {
 }
 
 export function TreatmentPreviewCard({ draft, disabled, onPreview }: TreatmentPreviewCardProps) {
+  const t = useTranslations('treatment');
+
+  const attachmentCount = draft
+    ? draft.cases.reduce((n, c) => n + (c.attachmentMetas?.length ?? 0), 0)
+    : 0;
+
   return (
     <div className="surface-card p-4 space-y-3">
       <div className="flex items-center justify-between gap-2">
-        <h3 className="text-sm font-semibold text-text-primary">Treatment preview</h3>
+        <h3 className="text-sm font-semibold text-text-primary">{t('previewTitle')}</h3>
         <Button type="button" variant="primary" disabled={disabled || !draft} onClick={onPreview}>
-          Preview current draft
+          {t('previewDraft')}
         </Button>
       </div>
       {!draft ? (
-        <p className="text-sm text-text-muted">Select an appointment to preview its draft.</p>
+        <p className="text-sm text-text-muted">{t('selectAppointment')}</p>
       ) : (
         <div className="border border-border/70 rounded-[var(--radius-md)] p-3 bg-background-secondary/40 space-y-2">
           <div className="flex items-start justify-between gap-2">
@@ -27,26 +42,31 @@ export function TreatmentPreviewCard({ draft, disabled, onPreview }: TreatmentPr
             <span className="text-xs text-text-muted tabular-nums shrink-0 capitalize">{draft.status}</span>
           </div>
           <p className="text-xs text-text-secondary">
-            {draft.cases.length} case{draft.cases.length === 1 ? '' : 's'} ·{' '}
-            {draft.cases.reduce((n, c) => n + (c.attachmentMetas?.length ?? 0), 0)} attachment
-            {draft.cases.reduce((n, c) => n + (c.attachmentMetas?.length ?? 0), 0) === 1 ? '' : 's'}
+            {t('caseCount', { n: draft.cases.length })} ·{' '}
+            {t('attachmentCount', { n: attachmentCount })}
           </p>
           <div className="space-y-2">
-            {draft.cases.slice(0, 2).map((c, idx) => (
+            {draft.cases.slice(0, 2).map((c, idx) => {
+              const typeKey = TREATMENT_TYPE_KEYS[c.treatmentType as keyof typeof TREATMENT_TYPE_KEYS];
+              const typeLabel = typeKey ? t(typeKey) : c.treatmentType;
+              return (
               <div
                 key={c.id}
                 className="rounded-[var(--radius-sm)] border border-border/60 px-2.5 py-2 text-xs text-text-secondary"
               >
                 <span className="text-text-primary font-medium capitalize">
-                  Case {idx + 1}: {c.treatmentType}
+                  {t('caseSummary', { n: idx + 1, type: typeLabel })}
                 </span>
                 {c.teeth.length > 0 && (
-                  <span className="ml-1 tabular-nums">· Teeth {[...c.teeth].sort().join(', ')}</span>
+                  <span className="ml-1 tabular-nums">
+                    {t('teethPrefix')} {[...c.teeth].sort().join(', ')}
+                  </span>
                 )}
               </div>
-            ))}
+              );
+            })}
             {draft.cases.length > 2 && (
-              <p className="text-xs text-text-muted">+ {draft.cases.length - 2} more case(s)</p>
+              <p className="text-xs text-text-muted">{t('moreCases', { n: draft.cases.length - 2 })}</p>
             )}
           </div>
         </div>
diff --git a/frontend/src/components/ui/treatment/TreatmentPreviewDialog.tsx b/frontend/src/components/ui/treatment/TreatmentPreviewDialog.tsx
index 55e841b..05aec9f 100644
--- a/frontend/src/components/ui/treatment/TreatmentPreviewDialog.tsx
+++ b/frontend/src/components/ui/treatment/TreatmentPreviewDialog.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useRef, useState } from 'react';
+import { useTranslations } from 'next-intl';
 import { Loader2, Paperclip, Send } from 'lucide-react';
 import { DialogCloseButton } from '@/components/ui/shared/DialogCloseButton';
 import { Button } from '@/components/ui/shared/Button';
@@ -32,6 +33,14 @@ function caseKey(c: PastTreatmentCase): string {
 const caseActionIconClass =
   'inline-flex items-center justify-center rounded-[var(--radius-sm)] p-1.5 text-text-secondary transition-colors hover:bg-background-card/80 hover:text-text-primary disabled:cursor-not-allowed disabled:opacity-40';
 
+const TREATMENT_TYPE_KEYS = {
+  consultation: 'typeConsultation',
+  filling: 'typeFilling',
+  endo: 'typeEndo',
+  visit: 'typeVisit',
+  hygiene: 'typeHygiene',
+} as const;
+
 export function TreatmentPreviewDialog({
   open,
   onClose,
@@ -45,6 +54,7 @@ export function TreatmentPreviewDialog({
   getCaseOrgIds,
   onToggleCaseOrg,
 }: TreatmentPreviewDialogProps) {
+  const t = useTranslations('treatment');
   const [expandedSendCaseId, setExpandedSendCaseId] = useState<string | null>(null);
   const fileInputsRef = useRef<Record<string, HTMLInputElement | null>>({});
 
@@ -64,10 +74,10 @@ export function TreatmentPreviewDialog({
         <div className="flex items-start justify-between gap-3">
           <div className="min-w-0">
             <h2 id="treatment-preview-title" className="text-lg font-semibold text-text-primary pr-2">
-              Treatment preview
+              {t('previewDialogTitle')}
             </h2>
             <p className="text-xs text-text-muted mt-0.5">
-              Review cases, attachments, and send destinations.
+              {t('previewDialogSubtitle')}
             </p>
           </div>
           <DialogCloseButton onClick={onClose} />
@@ -80,10 +90,12 @@ export function TreatmentPreviewDialog({
               {new Date(treatment.treatmentAt).toLocaleDateString()}
             </span>
           </div>
-          <p className="text-xs text-text-secondary capitalize">Status: {treatment.status}</p>
+          <p className="text-xs text-text-secondary capitalize">
+            {t('statusLabel')} {treatment.status}
+          </p>
 
           {treatment.cases.length === 0 ? (
-            <p className="text-sm text-text-muted">No cases in this treatment.</p>
+            <p className="text-sm text-text-muted">{t('noCases')}</p>
           ) : (
             <div className="space-y-2">
               {treatment.cases.map((c, idx) => {
@@ -98,6 +110,8 @@ export function TreatmentPreviewDialog({
                 const comment = c.notes?.trim() ?? '';
                 const attachBusy = uploadBusyCaseId === key;
                 const sendBusy = sendBusyCaseId === key;
+                const typeKey = TREATMENT_TYPE_KEYS[c.treatmentType as keyof typeof TREATMENT_TYPE_KEYS];
+                const typeLabel = typeKey ? t(typeKey) : c.treatmentType;
 
                 return (
                   <div
@@ -107,7 +121,9 @@ export function TreatmentPreviewDialog({
                     <div className="grid grid-cols-[minmax(0,1fr)_auto] gap-x-4 gap-y-1">
                       <div className="min-w-0 space-y-0.5">
                         <div className="flex items-center gap-2">
-                          <p className="text-xs font-medium text-text-primary">Case {idx + 1}</p>
+                          <p className="text-xs font-medium text-text-primary">
+                            {t('caseLabel', { n: idx + 1 })}
+                          </p>
                           {actionsEnabled && (
                             <div className="flex items-center gap-0.5">
                               <input
@@ -129,8 +145,8 @@ export function TreatmentPreviewDialog({
                                 type="button"
                                 className={caseActionIconClass}
                                 disabled={attachBusy}
-                                aria-label="Attach files"
-                                title="Attach files"
+                                aria-label={t('attachFilesShort')}
+                                title={t('attachFilesShort')}
                                 onClick={() => fileInputsRef.current[key]?.click()}
                               >
                                 {attachBusy ? (
@@ -145,8 +161,8 @@ export function TreatmentPreviewDialog({
                                   sendExpanded ? 'bg-primary-soft text-primary' : ''
                                 }`}
                                 disabled={sendBusy}
-                                aria-label="Send this case"
-                                title="Send this case"
+                                aria-label={t('sendCase')}
+                                title={t('sendCase')}
                                 aria-expanded={sendExpanded}
                                 onClick={() =>
                                   setExpandedSendCaseId((prev) => (prev === key ? null : key))
@@ -162,18 +178,18 @@ export function TreatmentPreviewDialog({
                           )}
                         </div>
                         <p className="text-[11px] text-text-secondary capitalize">
-                          Type: {c.treatmentType}
+                          {t('typeLabel')} {typeLabel}
                         </p>
                         <p className="text-[11px] text-text-secondary">
-                          Teeth:{' '}
-                          {c.teeth.length ? [...c.teeth].sort().join(', ') : 'None selected'}
+                          {t('teethLabel')}{' '}
+                          {c.teeth.length ? [...c.teeth].sort().join(', ') : t('teethNone')}
                         </p>
                         {comment ? (
                           <p className="text-[11px] text-text-muted line-clamp-2" title={comment}>
-                            Comments: {comment}
+                            {t('commentsLabel')} {comment}
                           </p>
                         ) : (
-                          <p className="text-[11px] text-text-muted">Comments: —</p>
+                          <p className="text-[11px] text-text-muted">{t('commentsEmpty')}</p>
                         )}
                       </div>
 
@@ -186,7 +202,7 @@ export function TreatmentPreviewDialog({
                           />
                         )}
                         <p className="text-[10px] uppercase tracking-wide text-text-muted">
-                          Attachments
+                          {t('attachments')}
                         </p>
                         <TreatmentLatestAttachmentPreview attachment={latestAttachment} />
                       </div>
@@ -195,10 +211,10 @@ export function TreatmentPreviewDialog({
                     {sendExpanded && editable && !sent && (
                       <div className="mt-2 space-y-2 border-t border-border/40 pt-2">
                         <p className="text-xs font-medium text-text-secondary">
-                          Send to linked organizations
+                          {t('sendToLinkedOrgs')}
                         </p>
                         {activeOrgs.length === 0 ? (
-                          <p className="text-xs text-text-muted">No active linked organizations.</p>
+                          <p className="text-xs text-text-muted">{t('noActiveOrgs')}</p>
                         ) : (
                           <div className="flex flex-col gap-1.5">
                             {activeOrgs.map((o) => (
@@ -219,7 +235,7 @@ export function TreatmentPreviewDialog({
                           isLoading={sendBusy}
                           onClick={() => void onSend?.(key, selectedOrgIds)}
                         >
-                          Confirm send
+                          {t('confirmSend')}
                         </Button>
                       </div>
                     )}
diff --git a/frontend/src/components/ui/treatment/TreatmentWorkspace.tsx b/frontend/src/components/ui/treatment/TreatmentWorkspace.tsx
index e9b05d1..1fc9e66 100644
--- a/frontend/src/components/ui/treatment/TreatmentWorkspace.tsx
+++ b/frontend/src/components/ui/treatment/TreatmentWorkspace.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useTranslations } from 'next-intl';
 import { AppointmentsStrip } from '@/components/ui/treatment/AppointmentsStrip';
 import { FdiToothChart } from '@/components/ui/treatment/FdiToothChart';
 import { PastTreatmentsPanel } from '@/components/ui/treatment/PastTreatmentsPanel';
@@ -34,6 +35,14 @@ import type {
   TreatmentCaseDraft,
 } from '@/types/treatment';
 
+const TREATMENT_TYPE_KEYS = {
+  consultation: 'typeConsultation',
+  filling: 'typeFilling',
+  endo: 'typeEndo',
+  visit: 'typeVisit',
+  hygiene: 'typeHygiene',
+} as const;
+
 function newCase(): TreatmentCaseDraft {
   return {
     clientId:
@@ -121,6 +130,7 @@ interface TreatmentWorkspaceProps {
 }
 
 export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWorkspaceProps) {
+  const t = useTranslations('treatment');
   const { showError, showSuccess, messages: toastMessages } = useToast();
   const canView = canViewTreatment(currentOrganization);
   const canEdit = canEditTreatment(currentOrganization);
@@ -185,12 +195,14 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
   const currentDraftPreview = useMemo<PastTreatment | null>(() => {
     if (!selectedAppointment) return null;
     return casesToPreviewTreatment(cases, {
-      title: `Draft · ${selectedAppointment.patientFirstName} ${selectedAppointment.patientLastName}`,
+      title: t('draftTitle', {
+        patientName: `${selectedAppointment.patientFirstName} ${selectedAppointment.patientLastName}`,
+      }),
       patientId: selectedAppointment.patientId,
       treatmentAt: new Date().toISOString(),
       status: 'draft',
     });
-  }, [cases, selectedAppointment]);
+  }, [cases, selectedAppointment, t]);
 
   useEffect(() => {
     setSelectionLocked(false);
@@ -217,7 +229,7 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
         }
       } catch (error: unknown) {
         if (!cancelled) {
-          showError(formatApiErrorMessage(error, 'Failed to load appointments.'));
+          showError(formatApiErrorMessage(error, t('errorLoadAppointments')));
         }
       } finally {
         if (!cancelled) setApptsLoading(false);
@@ -226,7 +238,7 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
     return () => {
       cancelled = true;
     };
-  }, [userId, selectedDay, showError]);
+  }, [userId, selectedDay, showError, t]);
 
   useEffect(() => {
     const today = startOfLocalDay(new Date());
@@ -250,14 +262,14 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
         if (!cancelled) setOrgs(list.data);
       } catch (error: unknown) {
         if (!cancelled) {
-          showError(formatApiErrorMessage(error, 'Failed to load linked organizations.'));
+          showError(formatApiErrorMessage(error, t('errorLoadOrgs')));
         }
       }
     })();
     return () => {
       cancelled = true;
     };
-  }, [showError]);
+  }, [showError, t]);
 
   useEffect(() => {
     if (!selectedAppointment) {
@@ -272,7 +284,7 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
         if (!cancelled) setHistory(response.data);
       } catch (error: unknown) {
         if (!cancelled) {
-          showError(formatApiErrorMessage(error, 'Failed to load treatment history.'));
+          showError(formatApiErrorMessage(error, t('errorLoadHistory')));
         }
       } finally {
         if (!cancelled) setHistoryLoading(false);
@@ -281,7 +293,7 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
     return () => {
       cancelled = true;
     };
-  }, [selectedAppointment?.patientId, showError]);
+  }, [selectedAppointment?.patientId, showError, t]);
 
   useEffect(() => {
     const appointmentId = selectedAppointment?.id;
@@ -310,19 +322,19 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
         setOrganizationSearch('');
       } catch (error: unknown) {
         if (!cancelled) {
-          showError(formatApiErrorMessage(error, 'Failed to load treatment draft.'));
+          showError(formatApiErrorMessage(error, t('errorLoadDraft')));
         }
       }
     })();
     return () => {
       cancelled = true;
     };
-  }, [selectedAppointment?.id, showError]);
+  }, [selectedAppointment?.id, showError, t]);
 
   const confirmDiscardIfDirty = useCallback(() => {
     if (!isDirty) return true;
-    return window.confirm('You have unsaved changes. Discard them and continue?');
-  }, [isDirty]);
+    return window.confirm(t('confirmDiscard'));
+  }, [isDirty, t]);
 
   const onPickAppointment = useCallback(
     (id: string) => {
@@ -361,16 +373,14 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
               : c,
           ),
         );
-        showSuccess(
-          `${uploaded.data.length} file${uploaded.data.length === 1 ? '' : 's'} uploaded successfully.`,
-        );
+        showSuccess(t('successFilesUploaded', { count: uploaded.data.length }));
       } catch (error: unknown) {
-        showError(formatApiErrorMessage(error, 'Failed to upload attachments.'));
+        showError(formatApiErrorMessage(error, t('errorUpload')));
       } finally {
         setUploadBusyCaseId(null);
       }
     },
-    [canEditTreatmentForDay, selectedAppointment, showSuccess, showError],
+    [canEditTreatmentForDay, selectedAppointment, showSuccess, showError, t],
   );
 
   const persistDraft = useCallback(async () => {
@@ -401,13 +411,13 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
     setSaveBusy(true);
     try {
       await persistDraft();
-      showSuccess('Treatment draft saved.');
+      showSuccess(t('successDraftSaved'));
     } catch (error: unknown) {
-      showError(formatApiErrorMessage(error, 'Failed to save treatment draft.'));
+      showError(formatApiErrorMessage(error, t('errorSaveDraft')));
     } finally {
       setSaveBusy(false);
     }
-  }, [canEditTreatmentForDay, selectedAppointment, persistDraft, showSuccess, showError]);
+  }, [canEditTreatmentForDay, selectedAppointment, persistDraft, showSuccess, showError, t]);
 
   const handleSendCase = useCallback(
     async (treatmentCase: TreatmentCaseDraft) => {
@@ -416,14 +426,14 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
         orgs.some((o) => o.id === id && o.active),
       );
       if (targets.length === 0) {
-        showError('Choose at least one active organization to send this case.');
+        showError(t('errorChooseOrg'));
         return;
       }
       setSendBusyId(treatmentCase.clientId);
       try {
         const saved = await persistDraft();
         const serverCase = saved.cases.find((c) => c.clientId === treatmentCase.clientId);
-        if (!serverCase?.id) throw new Error('Case must be saved before sending.');
+        if (!serverCase?.id) throw new Error(t('errorCaseMustSave'));
 
         const response = await treatmentsApi.sendCase(serverCase.id, { organizationIds: targets });
         setCases((prev) => {
@@ -445,14 +455,14 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
           const next = [...targets.filter((id) => !prev.includes(id)), ...prev];
           return next.slice(0, 10);
         });
-        showSuccess('Case sent to selected organizations.');
+        showSuccess(t('successCaseSent'));
       } catch (error: unknown) {
-        showError(formatApiErrorMessage(error, 'Failed to send case.'));
+        showError(formatApiErrorMessage(error, t('errorSendCase')));
       } finally {
         setSendBusyId(null);
       }
     },
-    [canEditTreatmentForDay, selectedAppointment, orgs, persistDraft, showSuccess, showError],
+    [canEditTreatmentForDay, selectedAppointment, orgs, persistDraft, showSuccess, showError, t],
   );
 
   const openPreview = useCallback(
@@ -489,9 +499,9 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
   if (!canView) {
     return (
       <div className="surface-card p-6 max-w-xl">
-        <h2 className="text-lg font-semibold text-text-primary">Treatment workspace</h2>
+        <h2 className="text-lg font-semibold text-text-primary">{t('noPermissionTitle')}</h2>
         <p className="text-sm text-text-secondary mt-2">
-          You do not have permission to view the Treatment tab for this organization.
+          {t('noPermissionBody')}
         </p>
       </div>
     );
@@ -500,11 +510,9 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
   return (
     <div className="space-y-4">
       <header className="space-y-1">
-        <h1 className="text-2xl font-semibold text-text-primary">Treatment</h1>
+        <h1 className="text-2xl font-semibold text-text-primary">{t('title')}</h1>
         <p className="text-sm text-text-secondary">
-          {canEdit
-            ? 'Document cases for your appointments, save drafts, and send work to linked organizations.'
-            : 'View-only access — you can review appointments and treatment history but cannot edit.'}
+          {canEdit ? t('subtitleEdit') : t('subtitleReadOnly')}
         </p>
       </header>
 
@@ -523,8 +531,7 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
 
       {isViewingPastDay && (
         <p className="text-sm text-text-secondary rounded-[var(--radius-md)] border border-border/60 bg-background-secondary/50 px-3 py-2">
-          Past days are view-only. You can review appointments and history, but treatment cases
-          cannot be added or changed.
+          {t('pastDayNotice')}
         </p>
       )}
 
@@ -532,18 +539,20 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
         <div className="space-y-3 min-w-0 xl:max-w-[380px]">
           {selectedAppointment ? (
             <div className="surface-card p-3 space-y-0.5">
-              <p className="text-[10px] uppercase tracking-wide text-text-muted">Selected patient</p>
+              <p className="text-[10px] uppercase tracking-wide text-text-muted">{t('selectedPatient')}</p>
               <p className="text-base font-semibold text-text-primary">
                 {selectedAppointment.patientFirstName} {selectedAppointment.patientLastName}
               </p>
               <p className="text-[11px] text-text-secondary">
-                Purpose:{' '}
-                <span className="capitalize text-text-primary">{selectedAppointment.purpose}</span>
+                {t('purposeLabel')}{' '}
+                <span className="capitalize text-text-primary">
+                  {t(TREATMENT_TYPE_KEYS[selectedAppointment.purpose as keyof typeof TREATMENT_TYPE_KEYS] ?? selectedAppointment.purpose)}
+                </span>
               </p>
             </div>
           ) : (
             <div className="surface-card p-3 text-sm text-text-muted">
-              {apptsLoading ? 'Loading appointments…' : 'Select a day with at least one appointment.'}
+              {apptsLoading ? t('loadingAppointments') : t('selectDayWithAppointment')}
             </div>
           )}
 
diff --git a/frontend/src/i18n/navigation.ts b/frontend/src/i18n/navigation.ts
new file mode 100644
index 0000000..90e0654
--- /dev/null
+++ b/frontend/src/i18n/navigation.ts
@@ -0,0 +1,5 @@
+import { createNavigation } from 'next-intl/navigation';
+import { routing } from './routing';
+
+export const { Link, redirect, usePathname, useRouter, getPathname } =
+  createNavigation(routing);
diff --git a/frontend/src/i18n/request.ts b/frontend/src/i18n/request.ts
new file mode 100644
index 0000000..380268d
--- /dev/null
+++ b/frontend/src/i18n/request.ts
@@ -0,0 +1,15 @@
+import { getRequestConfig } from 'next-intl/server';
+import { hasLocale } from 'next-intl';
+import { routing } from './routing';
+
+export default getRequestConfig(async ({ requestLocale }) => {
+  const requested = await requestLocale;
+  const locale = hasLocale(routing.locales, requested)
+    ? requested
+    : routing.defaultLocale;
+
+  return {
+    locale,
+    messages: (await import(`../../messages/${locale}.json`)).default,
+  };
+});
diff --git a/frontend/src/i18n/routing.ts b/frontend/src/i18n/routing.ts
new file mode 100644
index 0000000..9df3ce2
--- /dev/null
+++ b/frontend/src/i18n/routing.ts
@@ -0,0 +1,36 @@
+import { defineRouting } from 'next-intl/routing';
+
+export const locales = ['en', 'fa', 'nl'] as const;
+export type AppLocale = (typeof locales)[number];
+
+export const defaultLocale: AppLocale = 'en';
+
+export const routing = defineRouting({
+  locales,
+  defaultLocale,
+  localePrefix: 'always',
+});
+
+export function localeHtmlLang(locale: string): string {
+  if (locale === 'fa') return 'fa-IR';
+  if (locale === 'nl') return 'nl';
+  return 'en';
+}
+
+export function isAppLocale(value: string): value is AppLocale {
+  return locales.includes(value as AppLocale);
+}
+
+export function stripLocaleFromPathname(pathname: string): string {
+  const segments = pathname.split('/').filter(Boolean);
+  if (segments.length > 0 && isAppLocale(segments[0])) {
+    const rest = segments.slice(1).join('/');
+    return rest ? `/${rest}` : '/';
+  }
+  return pathname || '/';
+}
+
+export function getLocaleFromPathname(pathname: string): AppLocale {
+  const segment = pathname.split('/').filter(Boolean)[0];
+  return isAppLocale(segment) ? segment : defaultLocale;
+}
diff --git a/frontend/src/lib/api/appointments.ts b/frontend/src/lib/api/appointments.ts
index 9ba35dc..d727b2e 100644
--- a/frontend/src/lib/api/appointments.ts
+++ b/frontend/src/lib/api/appointments.ts
@@ -1,5 +1,6 @@
 import { apiClient } from './client';
 import type { AppointmentColumnProvider, AppointmentRecord } from '@/types/appointment';
+import { toDateInputValue } from '@/components/appointments/appointmentTime';
 
 export interface CreateAppointmentBody {
   patientId: string;
@@ -12,8 +13,11 @@ export interface CreateAppointmentBody {
 export type UpdateAppointmentBody = Partial<CreateAppointmentBody>;
 
 export const appointmentsApi = {
-  columnProviders: async (): Promise<{ success: boolean; data: AppointmentColumnProvider[] }> => {
-    const response = await apiClient.get('/appointments/column-providers');
+  columnProviders: async (
+    scheduleDate?: Date,
+  ): Promise<{ success: boolean; data: AppointmentColumnProvider[] }> => {
+    const params = scheduleDate ? { date: toDateInputValue(scheduleDate) } : undefined;
+    const response = await apiClient.get('/appointments/column-providers', { params });
     return response.data;
   },
 
diff --git a/frontend/src/lib/api/auth.ts b/frontend/src/lib/api/auth.ts
index 446d1be..fa15c5e 100644
--- a/frontend/src/lib/api/auth.ts
+++ b/frontend/src/lib/api/auth.ts
@@ -53,6 +53,13 @@ export const authApi = {
     await apiClient.post('/auth/logout');
   },
 
+  updateLanguage: async (
+    language: string,
+  ): Promise<{ success: boolean; data: { user: { language: string } } }> => {
+    const response = await apiClient.patch('/auth/profile/language', { language });
+    return response.data;
+  },
+
   // Refresh token
   refreshToken: async (refreshToken: string): Promise<{ accessToken: string }> => {
     const response = await apiClient.post('/auth/refresh', { refreshToken });
diff --git a/frontend/src/lib/api/staff.ts b/frontend/src/lib/api/staff.ts
index 1b03460..68772b2 100644
--- a/frontend/src/lib/api/staff.ts
+++ b/frontend/src/lib/api/staff.ts
@@ -120,4 +120,29 @@ export const staffApi = {
     const response = await apiClient.delete(`/staff/members/${membershipId}`);
     return response.data;
   },
+
+  getWorkingHours: async (
+    membershipId: string,
+  ): Promise<{
+    success: boolean;
+    data: {
+      autoRepeatWeekly: boolean;
+      blocks: { dayOfWeek: number; startMinute: number; endMinute: number; sortOrder?: number }[];
+      hasWorkingHours: boolean;
+    };
+  }> => {
+    const response = await apiClient.get(`/staff/members/${membershipId}/working-hours`);
+    return response.data;
+  },
+
+  upsertWorkingHours: async (
+    membershipId: string,
+    body: {
+      autoRepeatWeekly: boolean;
+      blocks: { dayOfWeek: number; startMinute: number; endMinute: number; sortOrder?: number }[];
+    },
+  ): Promise<{ success: boolean; message: string }> => {
+    const response = await apiClient.put(`/staff/members/${membershipId}/working-hours`, body);
+    return response.data;
+  },
 };
diff --git a/frontend/src/lib/hooks/useAuth.tsx b/frontend/src/lib/hooks/useAuth.tsx
index 6e9e7ff..021c7c0 100644
--- a/frontend/src/lib/hooks/useAuth.tsx
+++ b/frontend/src/lib/hooks/useAuth.tsx
@@ -1,16 +1,18 @@
 'use client';
 
 import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { useRouter } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+import { useRouter } from '@/i18n/navigation';
 import { authApi } from '@/lib/api/auth';
 import { User, Organization } from '@/types/organization';
+import { isAppLocale, getLocaleFromPathname } from '@/i18n/routing';
 
 interface AuthContextType {
   user: User | null;
   organizations: Organization[];
   currentOrganization: Organization | null;
   isLoading: boolean;
-  isAuthReady: boolean; // ✅ NEW
+  isAuthReady: boolean;
   error: string | null;
   registerTrial: (
     email: string,
@@ -29,12 +31,14 @@ interface AuthContextType {
     organizationType: 'CLINIC' | 'LAB',
     planName?: string,
   ) => Promise<string>;
+  setUserLanguage: (language: string) => void;
   clearError: () => void;
 }
 
 const AuthContext = createContext<AuthContextType | undefined>(undefined);
 
 export function AuthProvider({ children }: { children: React.ReactNode }) {
+  const t = useTranslations('auth');
   const [user, setUser] = useState<User | null>(null);
   const [organizations, setOrganizations] = useState<Organization[]>([]);
   const [currentOrganization, setCurrentOrganization] = useState<Organization | null>(null);
@@ -48,7 +52,13 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     const organizations = payload?.organizations || [];
 
     if (payload?.user) {
-      return { user: payload.user as User, organizations };
+      return {
+        user: {
+          ...(payload.user as User),
+          language: (payload.user as User).language ?? 'en',
+        },
+        organizations,
+      };
     }
 
     if (payload?.id && payload?.email && payload?.name) {
@@ -57,6 +67,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
           id: payload.id,
           email: payload.email,
           name: payload.name,
+          language: payload.language ?? 'en',
         },
         organizations,
       };
@@ -112,6 +123,23 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     void checkAuth();
   }, [checkAuth]);
 
+  const applyUrlLocaleToUser = useCallback(async (user: User): Promise<User> => {
+    if (typeof window === 'undefined') return user;
+
+    const urlLocale = getLocaleFromPathname(window.location.pathname);
+    if (!isAppLocale(urlLocale) || user.language === urlLocale) {
+      return user;
+    }
+
+    try {
+      await authApi.updateLanguage(urlLocale);
+    } catch {
+      /* keep URL locale in client state even if persistence fails */
+    }
+
+    return { ...user, language: urlLocale };
+  }, []);
+
   // ✅ REGISTER
   const registerTrial = useCallback(async (
     email: string,
@@ -134,7 +162,8 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
         organizationType,
       });
 
-      setUser(response.data.user);
+      const userData = await applyUrlLocaleToUser(response.data.user);
+      setUser(userData);
       setOrganizations(response.data.organizations);
 
       const orgs = response.data.organizations;
@@ -151,12 +180,12 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       }
 
     } catch (err: any) {
-      setError(err.message || 'Registration failed');
+      setError(err.message || t('errorRegistrationFailed'));
       throw err;
     } finally {
       setIsLoading(false);
     }
-  }, [router]);
+  }, [applyUrlLocaleToUser, router, t]);
 
   // ✅ LOGIN
   const login = useCallback(async (email: string, password: string) => {
@@ -166,7 +195,8 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
 
       const response = await authApi.login({ email, password });
 
-      setUser(response.data.user);
+      const userData = await applyUrlLocaleToUser(response.data.user);
+      setUser(userData);
       setOrganizations(response.data.organizations);
 
       const orgs = response.data.organizations;
@@ -182,17 +212,17 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       }
 
     } catch (err: any) {
-      setError(err.message || 'Login failed');
+      setError(err.message || t('errorLoginFailed'));
       throw err;
     } finally {
       setIsLoading(false);
     }
-  }, [router]);
+  }, [applyUrlLocaleToUser, router, t]);
 
   const logout = useCallback(async () => {
     try {
       // Important: clear auth cookies/session on the server first,
-      // otherwise middleware may still treat the user as authenticated.
+      // otherwise proxy may still treat the user as authenticated.
       await authApi.logout();
     } catch (err) {
       console.error('Logout API failed:', err);
@@ -263,15 +293,20 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
 
       return createResponse.data.organization.id as string;
     } catch (err: any) {
-      setError(err.message || 'Failed to create organization');
+      setError(err.message || t('errorCreateOrganization'));
       throw err;
     } finally {
       setIsLoading(false);
     }
-  }, [normalizeProfilePayload]);
+  }, [normalizeProfilePayload, t]);
 
   const clearError = useCallback(() => setError(null), []);
 
+  const setUserLanguage = useCallback((language: string) => {
+    const normalized = isAppLocale(language) ? language : 'en';
+    setUser((current) => (current ? { ...current, language: normalized } : current));
+  }, []);
+
   const contextValue = useMemo(
     () => ({
       user,
@@ -285,6 +320,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       logout,
       selectOrganization,
       createOrganization,
+      setUserLanguage,
       clearError,
     }),
     [
@@ -299,6 +335,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       logout,
       selectOrganization,
       createOrganization,
+      setUserLanguage,
       clearError,
     ],
   );
diff --git a/frontend/src/proxy.ts b/frontend/src/proxy.ts
index e70bcd9..18fc536 100644
--- a/frontend/src/proxy.ts
+++ b/frontend/src/proxy.ts
@@ -1,5 +1,13 @@
+import createMiddleware from 'next-intl/middleware';
 import { NextResponse } from 'next/server';
 import type { NextRequest } from 'next/server';
+import {
+  getLocaleFromPathname,
+  routing,
+  stripLocaleFromPathname,
+} from './i18n/routing';
+
+const handleI18nRouting = createMiddleware(routing);
 
 /** Routes that must work without an existing session (first-time invitees). */
 const publicRoutes = [
@@ -13,30 +21,42 @@ const publicRoutes = [
   '/accept-organization-invite',
 ];
 
+function isRedirectResponse(response: Response): boolean {
+  return response.status >= 300 && response.status < 400;
+}
+
 export function proxy(request: NextRequest) {
+  const intlResponse = handleI18nRouting(request);
+
+  if (isRedirectResponse(intlResponse)) {
+    return intlResponse;
+  }
+
   const { pathname } = request.nextUrl;
+  const pathWithoutLocale = stripLocaleFromPathname(pathname);
+  const locale = getLocaleFromPathname(pathname);
   const token = request.cookies.get('accessToken')?.value;
   const isAuthenticated = !!token;
 
-  if (isAuthenticated && pathname === '/') {
-    return NextResponse.redirect(new URL('/today', request.url));
+  if (isAuthenticated && pathWithoutLocale === '/') {
+    return NextResponse.redirect(new URL(`/${locale}/today`, request.url));
   }
 
-  if (publicRoutes.includes(pathname)) {
-    return NextResponse.next();
+  if (publicRoutes.includes(pathWithoutLocale)) {
+    return intlResponse;
   }
 
   if (!isAuthenticated) {
-    if (pathname === '/login') {
-      return NextResponse.next();
+    if (pathWithoutLocale === '/login') {
+      return intlResponse;
     }
 
-    const loginUrl = new URL('/login', request.url);
+    const loginUrl = new URL(`/${locale}/login`, request.url);
     loginUrl.searchParams.set('from', pathname);
     return NextResponse.redirect(loginUrl);
   }
 
-  return NextResponse.next();
+  return intlResponse;
 }
 
 export const config = {
diff --git a/frontend/src/types/appointment.ts b/frontend/src/types/appointment.ts
index 421f276..3614dd6 100644
--- a/frontend/src/types/appointment.ts
+++ b/frontend/src/types/appointment.ts
@@ -13,6 +13,8 @@ export type AppointmentPurpose = (typeof APPOINTMENT_PURPOSES)[number];
 export interface AppointmentColumnProvider {
   userId: string;
   name: string;
+  hasWorkingHours: boolean;
+  dayBlocks: { startMinute: number; endMinute: number }[];
 }
 
 export interface AppointmentRecord {
diff --git a/frontend/src/types/organization.ts b/frontend/src/types/organization.ts
index 1e19d36..1a6a1e9 100644
--- a/frontend/src/types/organization.ts
+++ b/frontend/src/types/organization.ts
@@ -2,6 +2,7 @@ export interface User {
   id: string;
   email: string;
   name: string;
+  language?: string;
 }
 
 export interface OrganizationPlan {