diff --git a/ClientApp/src/app/app.component.scss b/ClientApp/src/app/app.component.scss
index a4add75..bade6fd 100644
--- a/ClientApp/src/app/app.component.scss
+++ b/ClientApp/src/app/app.component.scss
@@ -20,24 +20,11 @@
   }
 }
 
-// RTL & Font setup
+// Application font
 * {
-  font-family: Vazir, system-ui, -apple-system, BlinkMacSystemFont, sans-serif;
+  font-family: Roboto, system-ui, -apple-system, BlinkMacSystemFont, sans-serif;
 }
 
-// Material theme setup
 .mat-typography {
-  font-family: Vazir, system-ui, -apple-system, BlinkMacSystemFont, sans-serif;
+  font-family: Roboto, system-ui, -apple-system, BlinkMacSystemFont, sans-serif;
 }
-
-// Material Components RTL setup
-[dir='rtl'] {
-  .mat-form-field-appearance-outline {
-    .mat-form-field-outline-start {
-      border-radius: 0 4px 4px 0;
-    }
-    .mat-form-field-outline-end {
-      border-radius: 4px 0 0 4px;
-    }
-  }
-}
\ No newline at end of file
diff --git a/ClientApp/src/app/app.component.spec.ts b/ClientApp/src/app/app.component.spec.ts
index 520887f..93cbb8a 100644
--- a/ClientApp/src/app/app.component.spec.ts
+++ b/ClientApp/src/app/app.component.spec.ts
@@ -1,7 +1,44 @@
 import { ApiBaseSettings } from './environmets/ApiSettings';
+import { AuthenticationModel } from './environmets/AuthenticationModel';
 
 describe('API configuration', () => {
   it('uses a same-origin API URL', () => {
     expect(new ApiBaseSettings().baseUrl).toBe('/api');
   });
 });
+
+describe('AuthenticationModel', () => {
+  const authentication = new AuthenticationModel();
+
+  afterEach(() => localStorage.clear());
+
+  it('accepts a token that has not expired', () => {
+    authentication.Set(createToken(Math.floor(Date.now() / 1000) + 60), 'test-user');
+
+    expect(authentication.IsUserLogin()).toBeTrue();
+    expect(authentication.GetUserName()).toBe('test-user');
+  });
+
+  it('clears an expired token instead of keeping the user in a login loop', () => {
+    authentication.Set(createToken(Math.floor(Date.now() / 1000) - 60), 'test-user');
+
+    expect(authentication.IsUserLogin()).toBeFalse();
+    expect(authentication.GetToken()).toBeNull();
+    expect(authentication.GetUserName()).toBeNull();
+  });
+
+  it('clears malformed tokens', () => {
+    authentication.Set('not-a-jwt', 'test-user');
+
+    expect(authentication.IsUserLogin()).toBeFalse();
+    expect(authentication.GetToken()).toBeNull();
+  });
+});
+
+function createToken(exp: number): string {
+  const payload = btoa(JSON.stringify({ exp }))
+    .replace(/\+/g, '-')
+    .replace(/\//g, '_')
+    .replace(/=+$/, '');
+  return `header.${payload}.signature`;
+}
diff --git a/ClientApp/src/app/authentication/login/login.component.html b/ClientApp/src/app/authentication/login/login.component.html
index 370f475..59cc56f 100644
--- a/ClientApp/src/app/authentication/login/login.component.html
+++ b/ClientApp/src/app/authentication/login/login.component.html
@@ -1,23 +1,24 @@
 <!-- filepath: /d:/Projects/Private/NoteBookKeeper/Client/NoteKeeper/src/app/authentication/login/login.component.html -->
-<div class="login-container" dir="rtl">
+<div class="login-container">
     <mat-card class="login-card">
         <mat-card-header>
-            <mat-card-title>ورود به سایت</mat-card-title> <mat-card-title>اکانت ندارید؟ <a href="/sign-up"> ثبت نام کنید</a></mat-card-title>
+            <mat-card-title>Sign in</mat-card-title>
+            <mat-card-subtitle>Don't have an account? <a href="/sign-up">Create one</a></mat-card-subtitle>
         </mat-card-header>
         <mat-card-content>
             <form class="login-form" (ngSubmit)="login()" style="margin-top: 2rem;">
                 <mat-form-field appearance="fill">
-                    <mat-label>نام کاربری</mat-label>
+                    <mat-label>Username</mat-label>
                     <input matInput [(ngModel)]="userName" name="username" required>
                 </mat-form-field>
                 <mat-form-field appearance="fill">
-                    <mat-label>رمز عبور</mat-label>
+                    <mat-label>Password</mat-label>
                     <input matInput [(ngModel)]="password" name="password" type="password" required>
                 </mat-form-field>
                 <button mat-raised-button color="primary" type="submit">
-                    ثبت نام
+                    Sign in
                 </button>
             </form>
         </mat-card-content>
     </mat-card>
-</div>
\ No newline at end of file
+</div>
diff --git a/ClientApp/src/app/authentication/register/register.component.html b/ClientApp/src/app/authentication/register/register.component.html
index 0f69e74..fe89b0a 100644
--- a/ClientApp/src/app/authentication/register/register.component.html
+++ b/ClientApp/src/app/authentication/register/register.component.html
@@ -1,31 +1,31 @@
 <!-- filepath: /d:/Projects/Private/NoteBookKeeper/Client/NoteKeeper/src/app/authentication/register/register.component.html -->
-<div class="register-container" dir="rtl">
+<div class="register-container">
     <mat-card class="register-card">
         <mat-card-header>
-            <mat-card-title>ثبت نام</mat-card-title>
+            <mat-card-title>Create an account</mat-card-title>
         </mat-card-header>
         <mat-card-content>
             <form class="register-form" (ngSubmit)="register()">
                 <mat-form-field appearance="fill">
-                    <mat-label>نام کاربری</mat-label>
+                    <mat-label>Username</mat-label>
                     <input matInput type="text" [(ngModel)]="userName" name="username" required>
                 </mat-form-field>
                 <mat-form-field appearance="fill">
-                    <mat-label>ایمیل</mat-label>
+                    <mat-label>Email</mat-label>
                     <input matInput type="email"[(ngModel)]="email"  name="email" required>
                 </mat-form-field>
                 <mat-form-field appearance="fill">
-                    <mat-label>رمز عبور</mat-label>
+                    <mat-label>Password</mat-label>
                     <input matInput type="password" [(ngModel)]="password" name="password" required>
                 </mat-form-field>
                 <mat-form-field appearance="fill">
-                    <mat-label>تکرار رمز عبور</mat-label>
-                    <input matInput type="repassword" [(ngModel)]="repassword" name="repassword" required>
+                    <mat-label>Confirm password</mat-label>
+                    <input matInput type="password" [(ngModel)]="repassword" name="repassword" required>
                 </mat-form-field>
                 <button mat-raised-button color="primary" type="submit">
-                    ثبت نام
+                    Sign up
                 </button>
             </form>
         </mat-card-content>
     </mat-card>
-</div>
\ No newline at end of file
+</div>
diff --git a/ClientApp/src/app/components/add-note/add-note.component.html b/ClientApp/src/app/components/add-note/add-note.component.html
index cd2dc6d..97deca5 100644
--- a/ClientApp/src/app/components/add-note/add-note.component.html
+++ b/ClientApp/src/app/components/add-note/add-note.component.html
@@ -2,25 +2,25 @@
 <div class="container">
     <mat-card>
       <mat-card-header>
-        <mat-card-title>افزودن جزوه جدید</mat-card-title>
+        <mat-card-title>Create a note</mat-card-title>
       </mat-card-header>
   
       <mat-card-content>
         <form [formGroup]="noteForm" (ngSubmit)="onSubmit()" class="note-form">
           <!-- Rich Text Editor -->
           <div class="editor-container">
-            <label class="form-label">توضیحات یا جزوه</label>
+            <label class="form-label">Note content</label>
             <mat-card class="editor-card">
               <mat-card-content>
                 <div class="editor-toolbar">
                   <div class="toolbar-group">
-                    <button mat-icon-button type="button" (click)="formatDoc('bold')" matTooltip="پررنگ">
+                    <button mat-icon-button type="button" (click)="formatDoc('bold')" matTooltip="Bold">
                       <mat-icon>format_bold</mat-icon>
                     </button>
-                    <button mat-icon-button type="button" (click)="formatDoc('italic')" matTooltip="مورب">
+                    <button mat-icon-button type="button" (click)="formatDoc('italic')" matTooltip="Italic">
                       <mat-icon>format_italic</mat-icon>
                     </button>
-                    <button mat-icon-button type="button" (click)="formatDoc('underline')" matTooltip="زیرخط">
+                    <button mat-icon-button type="button" (click)="formatDoc('underline')" matTooltip="Underline">
                       <mat-icon>format_underline</mat-icon>
                     </button>
                   </div>
@@ -28,13 +28,13 @@
                   <div class="toolbar-divider"></div>
   
                   <div class="toolbar-group">
-                    <button mat-icon-button type="button" (click)="formatDoc('justifyRight')" matTooltip="راست چین">
+                    <button mat-icon-button type="button" (click)="formatDoc('justifyRight')" matTooltip="Align right">
                       <mat-icon>format_align_right</mat-icon>
                     </button>
-                    <button mat-icon-button type="button" (click)="formatDoc('justifyCenter')" matTooltip="وسط چین">
+                    <button mat-icon-button type="button" (click)="formatDoc('justifyCenter')" matTooltip="Align center">
                       <mat-icon>format_align_center</mat-icon>
                     </button>
-                    <button mat-icon-button type="button" (click)="formatDoc('justifyLeft')" matTooltip="چپ چین">
+                    <button mat-icon-button type="button" (click)="formatDoc('justifyLeft')" matTooltip="Align left">
                       <mat-icon>format_align_left</mat-icon>
                     </button>
                   </div>
@@ -42,10 +42,10 @@
                   <div class="toolbar-divider"></div>
   
                   <div class="toolbar-group">
-                    <button mat-icon-button type="button" (click)="formatDoc('insertUnorderedList')" matTooltip="لیست">
+                    <button mat-icon-button type="button" (click)="formatDoc('insertUnorderedList')" matTooltip="Bulleted list">
                       <mat-icon>format_list_bulleted</mat-icon>
                     </button>
-                    <button mat-icon-button type="button" (click)="formatDoc('insertOrderedList')" matTooltip="لیست شماره‌دار">
+                    <button mat-icon-button type="button" (click)="formatDoc('insertOrderedList')" matTooltip="Numbered list">
                       <mat-icon>format_list_numbered</mat-icon>
                     </button>
                   </div>
@@ -53,7 +53,7 @@
                   <div class="toolbar-divider"></div>
   
                   <div class="toolbar-group">
-                    <button mat-icon-button type="button" (click)="formatDoc('createLink')" matTooltip="افزودن لینک">
+                    <button mat-icon-button type="button" (click)="formatDoc('createLink')" matTooltip="Add link">
                       <mat-icon>link</mat-icon>
                     </button>
                   </div>
@@ -64,7 +64,6 @@
                   class="editor-content" 
                   contenteditable="true"
                   (input)="onEditorInput($event)"
-                  dir="rtl"
                 ></div>
               </mat-card-content>
             </mat-card>
@@ -72,13 +71,13 @@
   
           <!-- Redirect Link -->
           <mat-form-field appearance="outline" class="full-width">
-            <mat-label>لینک مرتبط</mat-label>
-            <input matInput formControlName="redirectLink" placeholder="لینک مرتبط را وارد کنید">
+            <mat-label>Related link</mat-label>
+            <input matInput formControlName="redirectLink" placeholder="Enter a related link">
           </mat-form-field>
   
           <!-- Search Words -->
           <mat-form-field appearance="outline" class="full-width">
-            <mat-label>کلمات کلیدی</mat-label>
+            <mat-label>Keywords</mat-label>
             <mat-chip-grid #chipGrid>
               <mat-chip-row
                 *ngFor="let word of searchWords"
@@ -90,7 +89,7 @@
               </mat-chip-row>
             </mat-chip-grid>
             <input
-              placeholder="کلمه کلیدی جدید..."
+              placeholder="Add a keyword..."
               [matChipInputFor]="chipGrid"
               [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
               (matChipInputTokenEnd)="addSearchWord($event)">
@@ -98,7 +97,7 @@
   
           <!-- File Upload -->
           <div class="file-upload">
-            <label class="form-label">فایل‌ها</label>
+            <label class="form-label">Files</label>
             <div class="upload-zone" (click)="fileInput.click()">
               <input
                 #fileInput
@@ -107,7 +106,7 @@
                 (change)="onFileSelected($event)"
                 style="display: none">
               <mat-icon>cloud_upload</mat-icon>
-              <span>برای آپلود فایل کلیک کنید یا فایل را اینجا رها کنید</span>
+              <span>Click to upload files or drop them here</span>
             </div>
   
             <!-- File List -->
@@ -124,8 +123,8 @@
           <!-- Submit Buttons -->
           <div class="actions">
             <button mat-stroked-button type="button" (click)="goBack()">
-              <mat-icon>arrow_forward</mat-icon>
-              برگشت
+              <mat-icon>arrow_back</mat-icon>
+              Back
             </button>
             <button
               mat-flat-button
@@ -133,10 +132,10 @@
               type="submit"
               [disabled]="!noteForm.valid || loading">
               <mat-icon>save</mat-icon>
-              {{ loading ? 'در حال ثبت...' : 'ثبت جزوه' }}
+              {{ loading ? 'Saving...' : 'Save note' }}
             </button>
           </div>
         </form>
       </mat-card-content>
     </mat-card>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/ClientApp/src/app/components/add-note/add-note.component.ts b/ClientApp/src/app/components/add-note/add-note.component.ts
index 700ece6..f6fad0f 100644
--- a/ClientApp/src/app/components/add-note/add-note.component.ts
+++ b/ClientApp/src/app/components/add-note/add-note.component.ts
@@ -76,7 +76,7 @@ export class AddNoteComponent implements OnInit {
 
   formatDoc(command: string) {
     if (command === 'createLink') {
-      const url = prompt('لطفاً URL را وارد کنید:');
+      const url = prompt('Enter a URL:');
       if (url) {
         document.execCommand(command, false, url);
       }
@@ -125,7 +125,7 @@ export class AddNoteComponent implements OnInit {
     if (this.noteForm.valid) {
       if(this.searchWords.length == 0)
       {
-        this.showErrorMessage('کلمات کلیدی نمیتواند خالی باشد');
+        this.showErrorMessage('Add at least one keyword.');
         return;
       }
       this.loading = true;
@@ -142,7 +142,6 @@ export class AddNoteComponent implements OnInit {
         formData.append('files', file);
       });
 
-      // contentType parameter رو حذف کنید
       this.apiService.post(this.baseUrls.createNoteSettingItem, formData)
         .subscribe({
           next: () => {
@@ -159,20 +158,18 @@ export class AddNoteComponent implements OnInit {
 }
 
   private showSuccessMessage(): void {
-    this.snackBar.open('نوت با موفقیت ذخیره شد', 'باشه', {
+    this.snackBar.open('Note saved successfully.', 'OK', {
       duration: 3000,
       horizontalPosition: 'start',
-      direction: 'rtl',
       panelClass: 'success-snackbar'
     });
     this.router.navigate(['note-list'])
   }
 
-  private showErrorMessage(errMsg:string='خطا در ذخیره نوت'): void {
-    this.snackBar.open(errMsg, 'تلاش مجدد', {
+  private showErrorMessage(errMsg:string='Could not save the note.'): void {
+    this.snackBar.open(errMsg, 'Try again', {
       duration: 5000,
       horizontalPosition: 'start',
-      direction: 'rtl',
       panelClass: 'error-snackbar'
     });
   }
diff --git a/ClientApp/src/app/components/home/home.component.html b/ClientApp/src/app/components/home/home.component.html
index 8525fcd..5335aa0 100644
--- a/ClientApp/src/app/components/home/home.component.html
+++ b/ClientApp/src/app/components/home/home.component.html
@@ -7,24 +7,23 @@
     <div class="content-container" [@fadeIn]>
       <!-- Header Section -->
       <div class="header-section">
-        <h1 class="main-title">نوت هاتو بزار جا ما</h1>
-        <p class="subtitle">با قابلیت جست و جو توی جزوت میتونی</p>
-        <p class="extra-text">دنیارو بدست بیاری</p>
+        <h1 class="main-title">Keep every idea within reach</h1>
+        <p class="subtitle">Organize your notes and find anything in seconds.</p>
+        <p class="extra-text">Your knowledge, always ready when you need it.</p>
       </div>
   
       <!-- Welcome Section -->
       <div class="welcome-section">
-        <h2 class="welcome-title">به نوت کیپر خوش اومدی</h2>
+        <h2 class="welcome-title">Welcome to NoteKeeper</h2>
         <p class="welcome-description">
-          در اینجا میتونی نوت هاتو نگه داری و توشون جست و جو کنی، فقط کافیه
-          از منو نوت جدید رو انتخاب کنی
+          Create categories, save detailed notes, attach files, and search your content whenever you need it.
         </p>
         
         <!-- Action Button -->
         <button class="new-note-btn" (click)="navigateToNewNote()">
-          <span class="btn-text">شروع نوت جدید</span>
-          <span class="btn-icon">←</span>
+          <span class="btn-text">Create a category</span>
+          <span class="btn-icon">→</span>
         </button>
       </div>
     </div>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/ClientApp/src/app/components/home/home.component.scss b/ClientApp/src/app/components/home/home.component.scss
index 72dd2e4..44181f6 100644
--- a/ClientApp/src/app/components/home/home.component.scss
+++ b/ClientApp/src/app/components/home/home.component.scss
@@ -4,7 +4,6 @@
     position: relative;
     overflow: hidden;
     background: #f8f9fa;
-    direction: rtl;
   }
   
   .background-pattern {
@@ -140,12 +139,6 @@
     }
   }
   
-  // Add Persian/Arabic font support
-  @font-face {
-    font-family: 'Vazir';
-    src: url('../../../assets/Vazir.woff2') format('woff2');
-  }
-  
   :host {
-    font-family: 'Vazir', system-ui, -apple-system, sans-serif;
-  }
\ No newline at end of file
+    font-family: Roboto, system-ui, -apple-system, sans-serif;
+  }
diff --git a/ClientApp/src/app/components/newnote/newnote.component.html b/ClientApp/src/app/components/newnote/newnote.component.html
index bfe3199..a6e5e37 100644
--- a/ClientApp/src/app/components/newnote/newnote.component.html
+++ b/ClientApp/src/app/components/newnote/newnote.component.html
@@ -2,8 +2,8 @@
 <div class="create-note-container">
     <mat-card class="note-card">
       <mat-card-header>
-        <mat-card-title>افزودن موضوع نوت</mat-card-title>
-        <mat-card-subtitle>لطفاً اطلاعات نوت خود را وارد کنید</mat-card-subtitle>
+        <mat-card-title>Create a category</mat-card-title>
+        <mat-card-subtitle>Enter a name and an optional description.</mat-card-subtitle>
       </mat-card-header>
   
       <mat-card-content>
@@ -13,23 +13,23 @@
               autocomplete="off">
           
           <mat-form-field appearance="outline" class="w-full">
-            <mat-label>موضوع</mat-label>
+            <mat-label>Category name</mat-label>
             <input matInput
                    formControlName="subject"
-                   placeholder="موضوع را وارد کنید">
+                   placeholder="Enter a category name">
             <mat-error *ngIf="noteForm.get('subject')?.hasError('required')">
-              موضوع اجباری است
+              A category name is required
             </mat-error>
             <mat-error *ngIf="noteForm.get('subject')?.hasError('minlength')">
-              موضوع باید حداقل ۳ حرف باشد
+              The category name must contain at least 3 characters
             </mat-error>
           </mat-form-field>
   
           <mat-form-field appearance="outline" class="w-full">
-            <mat-label>توضیحات</mat-label>
+            <mat-label>Description</mat-label>
             <textarea matInput
                       formControlName="description"
-                      placeholder="توضیحات خود را بنویسید"
+                      placeholder="Add an optional description"
                       rows="8"
                       cdkTextareaAutosize
                       cdkAutosizeMinRows="8"
@@ -43,7 +43,7 @@
                     type="submit"
                     [disabled]="!noteForm.valid || isLoading">
               <mat-icon>save</mat-icon>
-              <span>ثبت نوت</span>
+              <span>Create category</span>
             </button>
             
             <button mat-stroked-button
@@ -51,7 +51,7 @@
                     (click)="noteForm.reset()"
                     [disabled]="isLoading">
               <mat-icon>refresh</mat-icon>
-              <span>پاک کردن</span>
+              <span>Clear</span>
             </button>
           </div>
         </form>
@@ -60,6 +60,6 @@
   
     <app-loading-overlay 
       *ngIf="isLoading"
-      message="در حال ذخیره نوت...">
+      message="Creating category...">
     </app-loading-overlay>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/ClientApp/src/app/components/newnote/newnote.component.scss b/ClientApp/src/app/components/newnote/newnote.component.scss
index ae4e1a9..21b860f 100644
--- a/ClientApp/src/app/components/newnote/newnote.component.scss
+++ b/ClientApp/src/app/components/newnote/newnote.component.scss
@@ -63,11 +63,6 @@
     }
   }
   
-  // RTL Support
-  :host {
-    direction: rtl;
-  }
-  
   // Responsive Design
   @media (max-width: 768px) {
     .create-note-container {
@@ -99,4 +94,4 @@
         justify-content: center;
       }
     }
-  }
\ No newline at end of file
+  }
diff --git a/ClientApp/src/app/components/newnote/newnote.component.ts b/ClientApp/src/app/components/newnote/newnote.component.ts
index 1cfda46..3cfd216 100644
--- a/ClientApp/src/app/components/newnote/newnote.component.ts
+++ b/ClientApp/src/app/components/newnote/newnote.component.ts
@@ -94,9 +94,10 @@ export class NewNoteComponent implements OnInit {
             }
           },
           error:(err)=>{
-            if(err.status == 401)
+            this.isLoading = false;
+            if(err.status !== 401)
             {
-              this.router.navigate(['sign-in'])
+              this.showErrorMessage();
             }
             console.log(err);
           }
@@ -110,20 +111,19 @@ export class NewNoteComponent implements OnInit {
   }
 
   private showSuccessMessage(): void {
-    this.snackBar.open('نوت با موفقیت ذخیره شد', 'باشه', {
+    this.isLoading = false;
+    this.snackBar.open('Category created successfully.', 'OK', {
       duration: 3000,
       horizontalPosition: 'start',
-      direction: 'rtl',
       panelClass: 'success-snackbar'
     });
     this.router.navigate(['note-list'])
   }
 
   private showErrorMessage(): void {
-    this.snackBar.open('خطا در ذخیره نوت', 'تلاش مجدد', {
+    this.snackBar.open('Could not create the category.', 'Try again', {
       duration: 5000,
       horizontalPosition: 'start',
-      direction: 'rtl',
       panelClass: 'error-snackbar'
     });
   }
@@ -133,4 +133,4 @@ export class NewNoteComponent implements OnInit {
 class CreateNoteSettingDto {
   topic='';
   description ='';
-}
\ No newline at end of file
+}
diff --git a/ClientApp/src/app/components/note-detail/note-detail.component.html b/ClientApp/src/app/components/note-detail/note-detail.component.html
index 4a5cd95..f2e8377 100644
--- a/ClientApp/src/app/components/note-detail/note-detail.component.html
+++ b/ClientApp/src/app/components/note-detail/note-detail.component.html
@@ -20,8 +20,8 @@
                     <div class="date-content">
                         <i class="fas fa-calendar"></i>
                         <div class="date-text">
-                            <p class="label">تاریخ ایجاد</p>
-                            <p class="value">{{ getPersianDate() }}</p>
+                            <p class="label">Created</p>
+                            <p class="value">{{ getFormattedDate() }}</p>
                         </div>
                     </div>
                 </div>
@@ -32,7 +32,7 @@
                     <div *ngIf="noteItem.redirectLink" class="link-section">
                         <i class="fas fa-link"></i>
                         <a [href]="noteItem.redirectLink" target="_blank" rel="noopener noreferrer">
-                            لینک مرتبط
+                            Related link
                         </a>
                     </div>
                 </div>
@@ -40,19 +40,19 @@
 
             <!-- files grid -->
             <div class="files-section">
-                <h3 class="section-title">فایل‌های پیوست شده</h3>
+                <h3 class="section-title">Attachments</h3>
                 <div class="files-grid">
                     <div *ngFor="let fileUrl of noteItem.filePaths; let i = index"
                          class="file-item">
                         
                         <ng-container>
-                            <img [src]="fileUrl" [alt]="'فایل ' + (i + 1)">
+                            <img [src]="fileUrl" [alt]="'Attachment ' + (i + 1)">
                         </ng-container>
 
                         <ng-template #fileDownload>
                             <div class="download-button">
                                 <a [href]="fileUrl" target="_blank" rel="noopener noreferrer">
-                                    دانلود فایل
+                                    Download file
                                 </a>
                             </div>
                         </ng-template>
diff --git a/ClientApp/src/app/components/note-detail/note-detail.component.scss b/ClientApp/src/app/components/note-detail/note-detail.component.scss
index 5cf567d..b67cff6 100644
--- a/ClientApp/src/app/components/note-detail/note-detail.component.scss
+++ b/ClientApp/src/app/components/note-detail/note-detail.component.scss
@@ -229,21 +229,6 @@ $error-text: #dc2626;    // red-600
   }
 }
 
-// RTL Support
-[dir="rtl"] {
-  .content-grid {
-    .date-card {
-      .date-content {
-        flex-direction: row-reverse;
-      }
-    }
-  }
-
-  .link-section {
-    flex-direction: row-reverse;
-  }
-}
-
 // Print Styles
 @media print {
   .note-container {
@@ -279,4 +264,4 @@ $error-text: #dc2626;    // red-600
   .card {
     border: 1px solid currentColor;
   }
-}
\ No newline at end of file
+}
diff --git a/ClientApp/src/app/components/note-detail/note-detail.component.ts b/ClientApp/src/app/components/note-detail/note-detail.component.ts
index ab51974..5364d42 100644
--- a/ClientApp/src/app/components/note-detail/note-detail.component.ts
+++ b/ClientApp/src/app/components/note-detail/note-detail.component.ts
@@ -37,8 +37,12 @@ export class NoteDetailComponent implements OnInit, OnDestroy {
     return this.noteItem.searchWords?.split(',').filter(Boolean) || [];
   }
 
-  public getPersianDate(): string {
-    return new Date(this.noteItem.creationDate).toLocaleDateString('fa-IR');
+  public getFormattedDate(): string {
+    return new Date(this.noteItem.creationDate).toLocaleDateString('en-US', {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric'
+    });
   }
 
   private loadNoteItem(noteId: string): void {
@@ -46,7 +50,7 @@ export class NoteDetailComponent implements OnInit, OnDestroy {
       .subscribe({
         next: note => this.loadFiles(note),
         error: () => {
-          this.error = 'خطا در دریافت اطلاعات جزوه';
+          this.error = 'Could not load the note.';
           this.loading = false;
         }
       });
@@ -70,7 +74,7 @@ export class NoteDetailComponent implements OnInit, OnDestroy {
         this.loading = false;
       },
       error: () => {
-        this.error = 'خطا در دریافت فایل‌های پیوست';
+        this.error = 'Could not load the attached files.';
         this.loading = false;
       }
     });
diff --git a/ClientApp/src/app/components/note-list-component/note-list.component.html b/ClientApp/src/app/components/note-list-component/note-list.component.html
index 46fd5fb..4eb74f7 100644
--- a/ClientApp/src/app/components/note-list-component/note-list.component.html
+++ b/ClientApp/src/app/components/note-list-component/note-list.component.html
@@ -3,10 +3,10 @@
     <!-- Header Section -->
     <div class="header">
       
-      <h1><mat-icon>note</mat-icon>موضوعات</h1>
+      <h1><mat-icon>note</mat-icon>Categories</h1>
       <button mat-flat-button color="primary" routerLink="/new-note">
         <mat-icon>note_add</mat-icon>
-        موضوع جدید
+        New category
       </button>
     </div>
   
@@ -14,16 +14,16 @@ <h1><mat-icon>note</mat-icon>موضوعات</h1>
     <mat-card class="search-card">
       <mat-card-content class="search-content">
         <mat-form-field appearance="outline" class="search-input">
-          <mat-label>جستجو</mat-label>
+          <mat-label>Search</mat-label>
           <input matInput
                  [(ngModel)]="searchTerm"
                  (input)="onSearch($event)"
-                 placeholder="جستجو در موضوعات...">
+                 placeholder="Search categories...">
           <mat-icon matPrefix>search</mat-icon>
         </mat-form-field>
   
         <mat-form-field appearance="outline" class="page-size-select">
-          <mat-label>تعداد نمایش در هر صفحه</mat-label>
+          <mat-label>Items per page</mat-label>
           <mat-select [(ngModel)]="pageSize" (selectionChange)="onPageSizeChange()">
             <mat-option *ngFor="let size of pageSizeOptions" [value]="size">
               {{ size }}
@@ -43,7 +43,7 @@ <h3 class="note-subject">{{ note.topic }}</h3>
             <span class="note-date">{{ note.creationDate | date:'medium' }}</span>
             <button mat-flat-button color="warn" [routerLink]="['/note-list/', note.uuid]" style="margin: 10px;">
               <mat-icon> format_indent_decrease</mat-icon>
-              جزئیات
+              Details
             </button>
           </div>
   
@@ -52,7 +52,7 @@ <h3 class="note-subject">{{ note.topic }}</h3>
           </div>
   
           <div *ngIf="!loading && notes.length === 0" class="empty-state">
-            موردی یافت نشد
+            No categories found
           </div>
         </div>
       </mat-card-content>
@@ -65,6 +65,6 @@ <h3 class="note-subject">{{ note.topic }}</h3>
       [pageSizeOptions]="pageSizeOptions"
       [pageIndex]="currentPage"
       (page)="onPageChange($event)"
-      aria-label="انتخاب صفحه">
+      aria-label="Select page">
     </mat-paginator>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/ClientApp/src/app/components/topic-notes/topic-notes.component.html b/ClientApp/src/app/components/topic-notes/topic-notes.component.html
index 127338d..2e38ac1 100644
--- a/ClientApp/src/app/components/topic-notes/topic-notes.component.html
+++ b/ClientApp/src/app/components/topic-notes/topic-notes.component.html
@@ -3,11 +3,11 @@
     <!-- Header -->
     <div class="header">
       <button mat-icon-button routerLink="/note-list">
-        <mat-icon>arrow_forward</mat-icon>
+        <mat-icon>arrow_back</mat-icon>
       </button>
       <button mat-flat-button color="primary" [routerLink]="['/new-note-item/',topicId]">
         <mat-icon>add</mat-icon>
-        جزوه جدید
+        New note
       </button>
       <h1>{{ topicName }}</h1>
     </div>
@@ -32,8 +32,8 @@ <h1>{{ topicName }}</h1>
         
         <mat-card-actions align="end">
           <button mat-button color="primary" [routerLink]="['/app-note-detail/',note.uuid]">
-            جزئیات
-            <mat-icon>chevron_left</mat-icon>
+            Details
+            <mat-icon>chevron_right</mat-icon>
           </button>
         </mat-card-actions>
       </mat-card>
@@ -45,7 +45,7 @@ <h1>{{ topicName }}</h1>
   
       <!-- Empty State -->
       <div *ngIf="!loading && notes.length === 0" class="empty-state">
-        <p>هیچ نوتی برای این موضوع یافت نشد</p>
+        <p>No notes were found in this category.</p>
       </div>
     </div>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/ClientApp/src/app/coreComponents/loading/loadingoverlay.component .ts b/ClientApp/src/app/coreComponents/loading/loadingoverlay.component .ts
index d795b81..534316c 100644
--- a/ClientApp/src/app/coreComponents/loading/loadingoverlay.component .ts	
+++ b/ClientApp/src/app/coreComponents/loading/loadingoverlay.component .ts	
@@ -83,5 +83,5 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
   ]
 })
 export class LoadingOverlayComponent {
-  @Input() message = 'در حال پردازش...';
-}
\ No newline at end of file
+  @Input() message = 'Processing...';
+}
diff --git a/ClientApp/src/app/coreComponents/navigation/navigation.component.scss b/ClientApp/src/app/coreComponents/navigation/navigation.component.scss
index b64eaae..74dfade 100644
--- a/ClientApp/src/app/coreComponents/navigation/navigation.component.scss
+++ b/ClientApp/src/app/coreComponents/navigation/navigation.component.scss
@@ -84,7 +84,6 @@
       justify-content: center;
       color: white;
       font-size: 20px;
-      direction: rtl;
       transition: all 0.3s ease;
   
       &:hover {
diff --git a/ClientApp/src/app/coreComponents/navigation/navigation.component.ts b/ClientApp/src/app/coreComponents/navigation/navigation.component.ts
index 11be454..ee66749 100644
--- a/ClientApp/src/app/coreComponents/navigation/navigation.component.ts
+++ b/ClientApp/src/app/coreComponents/navigation/navigation.component.ts
@@ -36,11 +36,11 @@ export class NavigationComponent {
   isMenuVisible = false;
   currentRotation = 0;
   menuItems = [
-    { label: 'خانه', route: '/home' },
-    { label: 'نوت‌ها', route: '/note-list' },
-    { label: 'نوت جدید', route: '/new-note' },
-    { label: 'لاگین', route: '/sign-in' },
-    { label: 'ثبت نام', route: '/sign-up' }
+    { label: 'Home', route: '/home' },
+    { label: 'Notes', route: '/note-list' },
+    { label: 'New category', route: '/new-note' },
+    { label: 'Sign in', route: '/sign-in' },
+    { label: 'Sign up', route: '/sign-up' }
   ];
 
   constructor(
diff --git a/ClientApp/src/app/environmets/AuthenticationModel.ts b/ClientApp/src/app/environmets/AuthenticationModel.ts
index 8be9c76..a50a986 100644
--- a/ClientApp/src/app/environmets/AuthenticationModel.ts
+++ b/ClientApp/src/app/environmets/AuthenticationModel.ts
@@ -34,12 +34,35 @@ export class AuthenticationModel{
     }
     IsUserLogin()
     {
-        var token = localStorage.getItem("TokenAuth");
-        if(token !== '' && token !== null)
-        {
+        const token = this.GetToken();
+        if (!token) {
+            return false;
+        }
+
+        try {
+            const payloadPart = token.split('.')[1];
+            if (!payloadPart) {
+                this.LogOut();
+                return false;
+            }
+
+            const normalizedPayload = payloadPart
+                .replace(/-/g, '+')
+                .replace(/_/g, '/')
+                .padEnd(Math.ceil(payloadPart.length / 4) * 4, '=');
+            const payload = JSON.parse(atob(normalizedPayload));
+            const expiresAt = Number(payload.exp) * 1000;
+
+            if (!Number.isFinite(expiresAt) || expiresAt <= Date.now()) {
+                this.LogOut();
+                return false;
+            }
+
             return true;
+        } catch {
+            this.LogOut();
+            return false;
         }
-        return false;
     }
     LogOut()
     {
diff --git a/ClientApp/src/app/services/base.api.ts b/ClientApp/src/app/services/base.api.ts
index 6e14feb..f9d300a 100644
--- a/ClientApp/src/app/services/base.api.ts
+++ b/ClientApp/src/app/services/base.api.ts
@@ -1,5 +1,7 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpClient, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { catchError, throwError } from 'rxjs';
 import { ApiBaseSettings } from '../environmets/ApiSettings';
 import { AuthenticationModel } from '../environmets/AuthenticationModel';
 
@@ -11,7 +13,11 @@ export class ApiService {
   apiSetting = new ApiBaseSettings();
   baseUrl = this.apiSetting.baseUrl;
 
-  constructor(private http: HttpClient, private authentication:AuthenticationModel) { }
+  constructor(
+    private http: HttpClient,
+    private authentication: AuthenticationModel,
+    private router: Router
+  ) { }
 
   get<T>(url: string, params?: any) {
     let headers = new HttpHeaders({ 'Content-Type': 'application/json' });
@@ -27,7 +33,8 @@ export class ApiService {
       params,
       headers: headers
     };
-    return this.http.get<T>(this.getUrl(url), httpOptions);
+    return this.http.get<T>(this.getUrl(url), httpOptions)
+      .pipe(catchError(error => this.handleError(error)));
   }
 
   post<T>(url: string, params: any, contentType='application/json') {
@@ -43,7 +50,8 @@ export class ApiService {
         'Bearer ' + this.authentication.GetToken()
       );
     }
-    return this.http.post<T>(this.getUrl(url), params, {headers:headers});
+    return this.http.post<T>(this.getUrl(url), params, {headers:headers})
+      .pipe(catchError(error => this.handleError(error)));
   }
 
   put<T>(url: string, params: any) {
@@ -55,7 +63,8 @@ export class ApiService {
         'Bearer ' + this.authentication.GetToken()
       );
     }
-    return this.http.put<T>(this.getUrl(url), params, {headers:headers});
+    return this.http.put<T>(this.getUrl(url), params, {headers:headers})
+      .pipe(catchError(error => this.handleError(error)));
   }
 
   delete<T>(url: string) {
@@ -67,7 +76,8 @@ export class ApiService {
         'Bearer ' + this.authentication.GetToken()
       );
     }
-    return this.http.delete<T>(this.getUrl(url), {headers:headers});
+    return this.http.delete<T>(this.getUrl(url), {headers:headers})
+      .pipe(catchError(error => this.handleError(error)));
   }
 
   getBlob(url: string) {
@@ -76,10 +86,20 @@ export class ApiService {
       headers = headers.set('Authorization', 'Bearer ' + this.authentication.GetToken());
     }
 
-    return this.http.get(this.getUrl(url), { headers, responseType: 'blob' });
+    return this.http.get(this.getUrl(url), { headers, responseType: 'blob' })
+      .pipe(catchError(error => this.handleError(error)));
   }
 
   private getUrl(url: string): string {
     return url.startsWith('/api/') ? url : `${this.baseUrl}${url}`;
   }
+
+  private handleError(error: HttpErrorResponse) {
+    if (error.status === 401) {
+      this.authentication.LogOut();
+      void this.router.navigate(['/sign-in']);
+    }
+
+    return throwError(() => error);
+  }
 }
diff --git a/ClientApp/src/index.html b/ClientApp/src/index.html
index 078363b..0d50024 100644
--- a/ClientApp/src/index.html
+++ b/ClientApp/src/index.html
@@ -10,9 +10,9 @@
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 </head>
-<body class="mat-typography" dir="rtl">
+<body class="mat-typography">
     <div class="container">
       <app-root></app-root>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/NoteBookKeeper.Api/Controllers/AddNoteController.cs b/NoteBookKeeper.Api/Controllers/AddNoteController.cs
index efd9a14..5cc8162 100644
--- a/NoteBookKeeper.Api/Controllers/AddNoteController.cs
+++ b/NoteBookKeeper.Api/Controllers/AddNoteController.cs
@@ -20,11 +20,22 @@ public class AddNoteController(NoteKeeperContext context) : ControllerBase
     [HttpPost("[action]")]
     public async Task<IActionResult> CreateNoteSetting(CreateNoteSettingDto request)
     {
+        var userId = GetUserId();
+        var userExists = await context.Users.AnyAsync(user => user.Id == userId);
+        if (!userExists)
+        {
+            return Unauthorized(new ProblemDetails
+            {
+                Title = "Your session is no longer linked to an active user. Please sign in again.",
+                Status = StatusCodes.Status401Unauthorized
+            });
+        }
+
         var noteSetting = new NoteSetting
         {
             Topic = request.Topic.Trim(),
             Description = request.Description?.Trim(),
-            UserId = GetUserId(),
+            UserId = userId,
             Uuid = Guid.NewGuid()
         };
 
@@ -45,14 +56,14 @@ public async Task<IActionResult> CreateNoteItem([FromForm] CreateNoteItemDto req
 
         if (setting is null)
         {
-            return NotFound(new ProblemDetails { Title = "سرفصل یافت نشد." });
+            return NotFound(new ProblemDetails { Title = "Category not found." });
         }
 
         if (request.Files.Count > MaxFileCount || request.Files.Any(file => file.Length > MaxFileSize))
         {
             return BadRequest(new ProblemDetails
             {
-                Title = $"حداکثر {MaxFileCount} فایل و حداکثر ۵ مگابایت برای هر فایل مجاز است."
+                Title = $"A maximum of {MaxFileCount} files and 5 MB per file is allowed."
             });
         }
 
@@ -185,7 +196,7 @@ public async Task<IActionResult> DeleteNote(Guid noteId)
             .SingleOrDefaultAsync(note => note.Uuid == noteId && note.UserId == GetUserId());
         if (noteSetting is null)
         {
-            return NotFound(new ProblemDetails { Title = "نوت موردنظر یافت نشد." });
+            return NotFound(new ProblemDetails { Title = "The requested note was not found." });
         }
 
         noteSetting.IsDeleted = true;
diff --git a/NoteBookKeeper.Api/Controllers/UserController.cs b/NoteBookKeeper.Api/Controllers/UserController.cs
index 0d25159..ba5a97b 100644
--- a/NoteBookKeeper.Api/Controllers/UserController.cs
+++ b/NoteBookKeeper.Api/Controllers/UserController.cs
@@ -31,7 +31,7 @@ public async Task<ActionResult<LoginUserResponseDto>> Login(LoginUserDto request
         {
             return Unauthorized(new ProblemDetails
             {
-                Title = "نام کاربری یا رمز عبور اشتباه است.",
+                Title = "The username or password is incorrect.",
                 Status = StatusCodes.Status401Unauthorized
             });
         }
@@ -82,7 +82,7 @@ public async Task<IActionResult> Register(RegisterUserDto request)
         {
             return Conflict(new ProblemDetails
             {
-                Title = "نام کاربری یا ایمیل قبلاً استفاده شده است.",
+                Title = "The username or email address is already in use.",
                 Status = StatusCodes.Status409Conflict
             });
         }
diff --git a/NoteBookKeeper.Api/Models/RegisterUserDto.cs b/NoteBookKeeper.Api/Models/RegisterUserDto.cs
index 24b00b5..12a5bfe 100644
--- a/NoteBookKeeper.Api/Models/RegisterUserDto.cs
+++ b/NoteBookKeeper.Api/Models/RegisterUserDto.cs
@@ -13,6 +13,6 @@ public record RegisterUserDto
     [Required, StringLength(128, MinimumLength = 8)]
     public string Password { get; set; } = string.Empty;
 
-    [Compare(nameof(Password), ErrorMessage = "رمز عبور یکسان نیست")]
+    [Compare(nameof(Password), ErrorMessage = "The passwords do not match.")]
     public string RePassword { get; set; } = string.Empty;
 }
diff --git a/NoteBookKeeper.Api/NoteBookKeeper.Api.http b/NoteBookKeeper.Api/NoteBookKeeper.Api.http
index edf7541..76e2f26 100644
--- a/NoteBookKeeper.Api/NoteBookKeeper.Api.http
+++ b/NoteBookKeeper.Api/NoteBookKeeper.Api.http
@@ -33,8 +33,8 @@ Content-Type: application/json
 Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6ImEwMjk3NWZlLWM2OGItNDY1MC05OThkLTA4ZGQzZjEyYWI5NCIsImV4cCI6MTczODA2ODY4MiwiaXNzIjoiTm90ZUtlZXBlci5pciIsImF1ZCI6Ik5vdGVLZWVwZXIuaXIifQ.EKwG5bU1sOEV0_jo7sXAgs1JsVticprFQqSKmw9KCjI
 
 {
-  "topic":"تست این ابزار باحال",
-  "description":"این یک رزومه تست میباشد"
+  "topic":"Example category",
+  "description":"An example category created from the HTTP file"
 }
 
 ###
@@ -46,7 +46,7 @@ Content-Type: application/json
 Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6ImEwMjk3NWZlLWM2OGItNDY1MC05OThkLTA4ZGQzZjEyYWI5NCIsImV4cCI6MTczODA2ODY4MiwiaXNzIjoiTm90ZUtlZXBlci5pciIsImF1ZCI6Ik5vdGVLZWVwZXIuaXIifQ.EKwG5bU1sOEV0_jo7sXAgs1JsVticprFQqSKmw9KCjI
 
 {
-  "detail":"این تست آیتم هاست",
+  "detail":"An example note item",
   "searchWords":"",
   "noteSettingId":"3608cb8f-12a6-44d1-8625-43d0c5c4b33c",
   "redirectLink":""
@@ -82,4 +82,4 @@ Accept: application/json
 Content-Type: application/json
 Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6ImEwMjk3NWZlLWM2OGItNDY1MC05OThkLTA4ZGQzZjEyYWI5NCIsImV4cCI6MTczODU1Mjc2OCwiaXNzIjoiTm90ZUtlZXBlci5pciIsImF1ZCI6Ik5vdGVLZWVwZXIuaXIifQ.07jsAnuarVfV6L0P5QCc69Rudex9XTmJwC3pTdl7aT0
 
-###
\ No newline at end of file
+###
diff --git a/README.md b/README.md
index af4ca0e..a2883ea 100644
--- a/README.md
+++ b/README.md
@@ -1,45 +1,45 @@
 # NoteKeeper
 
-یک اپلیکیشن تحت وب برای ساخت، دسته‌بندی و جست‌وجوی یادداشت‌ها. این مخزن نسخه یکپارچه‌ی پروژه‌های `NoteKeeperFront` و `NoteKeeperBack` است و تاریخچه Git هر دو پروژه را حفظ می‌کند.
+A web application for creating, organizing, and searching notes. This repository combines `NoteKeeperFront` and `NoteKeeperBack` while preserving the Git history of both projects.
 
 [![CI](https://github.com/AmirTahan80/NoteKeeperFullStack/actions/workflows/ci.yml/badge.svg)](https://github.com/AmirTahan80/NoteKeeperFullStack/actions/workflows/ci.yml)
 [![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/AmirTahan80/NoteKeeperFullStack)
 
-## امکانات
+## Features
 
-- ثبت‌نام و ورود با JWT و password hashing استاندارد ASP.NET Core
-- ساخت موضوع و یادداشت با جست‌وجو، صفحه‌بندی و فایل پیوست
-- کنترل دسترسی کامل؛ هر کاربر فقط یادداشت‌ها و فایل‌های خودش را می‌بیند
-- Angular 22 و ASP.NET Core روی .NET 10 در یک سرویس وب
-- PostgreSQL و migration خودکار EF Core
-- Docker، Docker Compose، Render Blueprint و GitHub Actions
+- Registration and sign-in with JWT and standard ASP.NET Core password hashing
+- Categories and notes with search, pagination, and file attachments
+- Complete access isolation so users can only view their own notes and files
+- Angular 22 and ASP.NET Core on .NET 10 in a single web service
+- PostgreSQL with automatic EF Core migrations
+- Docker, Docker Compose, Render Blueprint, and GitHub Actions
 
-## اجرای سریع با Docker
+## Quick start with Docker
 
-پیش‌نیاز: Docker Desktop
+Prerequisite: Docker Desktop
 
 ```powershell
 docker compose up --build
 ```
 
-سپس [http://localhost:8080](http://localhost:8080) را باز کنید. برای توقف:
+Then open [http://localhost:8080](http://localhost:8080). To stop the application:
 
 ```powershell
 docker compose down
 ```
 
-داده‌ها در volume محلی `notekeeper-data` باقی می‌مانند. برای حذف داده‌های محلی نیز می‌توانید آگاهانه `docker compose down -v` را اجرا کنید.
+Data persists in the local `notekeeper-data` volume. To intentionally remove the local data, run `docker compose down -v`.
 
-## اجرای توسعه‌ای
+## Development
 
-ابتدا PostgreSQL را بالا بیاورید:
+Start PostgreSQL first:
 
 ```powershell
 docker compose up database -d
 dotnet run --project NoteBookKeeper.Api
 ```
 
-در ترمینال دوم:
+In a second terminal:
 
 ```powershell
 cd ClientApp
@@ -47,9 +47,9 @@ npm ci
 npm start
 ```
 
-Angular در [http://localhost:4200](http://localhost:4200) اجرا می‌شود و درخواست‌های `/api` را به ASP.NET Core می‌فرستد.
+Angular runs at [http://localhost:4200](http://localhost:4200) and proxies `/api` requests to ASP.NET Core.
 
-## تست و بررسی build
+## Build and test
 
 ```powershell
 dotnet build NoteBookKeeper.sln -c Release
@@ -62,15 +62,15 @@ cd ..
 docker build -t notekeeper:local .
 ```
 
-پس از اجرای برنامه، health check در `/api/health` باید `Healthy` برگرداند. یک حساب آزمایشی بسازید، وارد شوید، یک موضوع و یک یادداشت دارای تصویر ایجاد کنید و در مرورگر دیگری مطمئن شوید فایل بدون توکن قابل دریافت نیست.
+After starting the application, `/api/health` should return `Healthy`. Create a test account, sign in, create a category and a note with an image, and verify in another browser that the file cannot be downloaded without a token.
 
-## استقرار روی Render
+## Deploy to Render
 
-فایل `render.yaml` یک web service و PostgreSQL می‌سازد. دکمه **Deploy to Render** را بزنید، وارد Render شوید و Blueprint را تأیید کنید. مقدار JWT به‌صورت خودکار و امن تولید می‌شود.
+The `render.yaml` file provisions a web service and PostgreSQL database. Select **Deploy to Render**, sign in to Render, and confirm the Blueprint. A secure JWT key is generated automatically.
 
-> پلن رایگان Render برای دمو مناسب است، اما دیتابیس رایگان آن دائمی نیست. برای نمونه‌کار بلندمدت، دیتابیس را به پلن پولی ارتقا دهید یا `DATABASE_URL` را به یک PostgreSQL پایدار متصل کنید.
+> Render's free plan is suitable for demos, but its free database is not permanent. For a long-lived portfolio project, upgrade the database or connect `DATABASE_URL` to a persistent PostgreSQL instance.
 
-## ساختار پروژه
+## Project structure
 
 ```text
 ClientApp/             Angular frontend
@@ -80,6 +80,6 @@ docker-compose.yml     Local web app + PostgreSQL
 render.yaml            One-click cloud blueprint
 ```
 
-## نکته امنیتی
+## Security note
 
-در مخازن قدیمی اطلاعات نمونه‌ای داخل history ثبت شده بود. نسخه جدید هیچ secret واقعی را commit نمی‌کند، اما اگر هر کدام از مقادیر قدیمی در محیط واقعی استفاده شده‌اند باید آن‌ها را rotate کنید؛ پاک‌کردن فایل فعلی، history قبلی Git را پاک نمی‌کند.
+The original repositories contained sample configuration values in their history. The current version does not commit real secrets. If any historical value was used in a real environment, rotate it because removing it from the current files does not remove it from Git history.
diff --git a/scripts/e2e.ps1 b/scripts/e2e.ps1
index 3aef2c5..4370bf3 100644
--- a/scripts/e2e.ps1
+++ b/scripts/e2e.ps1
@@ -158,6 +158,29 @@ try {
         if ($_.Exception.Response.StatusCode.value__ -ne 404) { throw }
     }
 
+    $deleteStaleUserSql = "DO `$`$ BEGIN EXECUTE format('DELETE FROM %I WHERE %I = %L', 'Users', 'NormalizedUserName', '$($secondUser.ToUpperInvariant())'); END `$`$;"
+    & (Join-Path $postgresBin 'psql.exe') `
+        -h 127.0.0.1 `
+        -p $PostgresPort `
+        -U notekeeper `
+        -d notekeeper `
+        -c $deleteStaleUserSql | Out-Null
+    if ($LASTEXITCODE -ne 0) { throw 'Could not prepare the stale-session check.' }
+
+    try {
+        Invoke-WebRequest `
+            "$baseUrl/api/AddNote/CreateNoteSetting" `
+            -Method Post `
+            -Headers $otherHeaders `
+            -ContentType 'application/json' `
+            -Body $topicBody `
+            -UseBasicParsing | Out-Null
+        throw 'A token for a missing user was accepted.'
+    }
+    catch {
+        if ($_.Exception.Response.StatusCode.value__ -ne 401) { throw }
+    }
+
     [PSCustomObject]@{
         Health = 'Healthy'
         Angular = 'Served'
@@ -166,6 +189,7 @@ try {
         PublicProfilePrivacy = 'Passed'
         NoteAndAttachment = 'Passed'
         OwnershipIsolation = 'Passed'
+        StaleSessionHandling = 'Passed'
     } | Format-List
 }
 catch {