diff --git a/application/src/translations/de/index.ts b/application/src/translations/de/index.ts
index a1794be..e282607 100644
--- a/application/src/translations/de/index.ts
+++ b/application/src/translations/de/index.ts
@@ -8,6 +8,7 @@ import { servicesTranslations } from './services';
 import { maintenanceTranslations } from './maintenance';
 import { incidentTranslations } from './incident';
 import { sslTranslations } from './ssl';
+import { settingsTranslations } from './settings';
 
 const enTranslations: Translations = {
   common: commonTranslations,
@@ -17,7 +18,8 @@ const enTranslations: Translations = {
   services: servicesTranslations,
   maintenance: maintenanceTranslations,
   incident: incidentTranslations,
-  ssl: sslTranslations
+  ssl: sslTranslations,
+  settings: settingsTranslations
 };
 
-export default enTranslations;
+export default enTranslations;
\ No newline at end of file
diff --git a/application/src/translations/de/settings.ts b/application/src/translations/de/settings.ts
new file mode 100644
index 0000000..a25746e
--- /dev/null
+++ b/application/src/translations/de/settings.ts
@@ -0,0 +1,35 @@
+
+import { SettingsTranslations } from '../types/settings';
+
+export const settingsTranslations: SettingsTranslations = {
+  // Tabs
+  systemSettings: "System Settings",
+  mailSettings: "Mail Settings",
+  
+  // System Settings
+  appName: "Application Name",
+  appURL: "Application URL",
+  senderName: "Sender Name",
+  senderEmail: "Sender Email Address",
+  hideControls: "Hide Controls",
+  
+  // Mail Settings
+  smtpSettings: "SMTP Configuration",
+  smtpEnabled: "Enable SMTP",
+  smtpHost: "SMTP Host",
+  smtpPort: "SMTP Port",
+  smtpUsername: "SMTP Username",
+  smtpAuthMethod: "Authentication Method",
+  enableTLS: "Enable TLS",
+  localName: "Local Name",
+  
+  // Actions and status
+  save: "Save Changes",
+  saving: "Saving...",
+  settingsUpdated: "Settings updated successfully",
+  errorSavingSettings: "Error saving settings",
+  testConnection: "Test Connection",
+  testingConnection: "Testing Connection...",
+  connectionSuccess: "Connection successful",
+  connectionFailed: "Connection failed"
+};
\ No newline at end of file
diff --git a/application/src/translations/en/index.ts b/application/src/translations/en/index.ts
index a1794be..e282607 100644
--- a/application/src/translations/en/index.ts
+++ b/application/src/translations/en/index.ts
@@ -8,6 +8,7 @@ import { servicesTranslations } from './services';
 import { maintenanceTranslations } from './maintenance';
 import { incidentTranslations } from './incident';
 import { sslTranslations } from './ssl';
+import { settingsTranslations } from './settings';
 
 const enTranslations: Translations = {
   common: commonTranslations,
@@ -17,7 +18,8 @@ const enTranslations: Translations = {
   services: servicesTranslations,
   maintenance: maintenanceTranslations,
   incident: incidentTranslations,
-  ssl: sslTranslations
+  ssl: sslTranslations,
+  settings: settingsTranslations
 };
 
-export default enTranslations;
+export default enTranslations;
\ No newline at end of file
diff --git a/application/src/translations/en/settings.ts b/application/src/translations/en/settings.ts
new file mode 100644
index 0000000..a25746e
--- /dev/null
+++ b/application/src/translations/en/settings.ts
@@ -0,0 +1,35 @@
+
+import { SettingsTranslations } from '../types/settings';
+
+export const settingsTranslations: SettingsTranslations = {
+  // Tabs
+  systemSettings: "System Settings",
+  mailSettings: "Mail Settings",
+  
+  // System Settings
+  appName: "Application Name",
+  appURL: "Application URL",
+  senderName: "Sender Name",
+  senderEmail: "Sender Email Address",
+  hideControls: "Hide Controls",
+  
+  // Mail Settings
+  smtpSettings: "SMTP Configuration",
+  smtpEnabled: "Enable SMTP",
+  smtpHost: "SMTP Host",
+  smtpPort: "SMTP Port",
+  smtpUsername: "SMTP Username",
+  smtpAuthMethod: "Authentication Method",
+  enableTLS: "Enable TLS",
+  localName: "Local Name",
+  
+  // Actions and status
+  save: "Save Changes",
+  saving: "Saving...",
+  settingsUpdated: "Settings updated successfully",
+  errorSavingSettings: "Error saving settings",
+  testConnection: "Test Connection",
+  testingConnection: "Testing Connection...",
+  connectionSuccess: "Connection successful",
+  connectionFailed: "Connection failed"
+};
\ No newline at end of file
diff --git a/application/src/translations/km/index.ts b/application/src/translations/km/index.ts
index f1ac6a7..e282607 100644
--- a/application/src/translations/km/index.ts
+++ b/application/src/translations/km/index.ts
@@ -8,8 +8,9 @@ import { servicesTranslations } from './services';
 import { maintenanceTranslations } from './maintenance';
 import { incidentTranslations } from './incident';
 import { sslTranslations } from './ssl';
+import { settingsTranslations } from './settings';
 
-const kmTranslations: Translations = {
+const enTranslations: Translations = {
   common: commonTranslations,
   menu: menuTranslations,
   login: loginTranslations,
@@ -17,7 +18,8 @@ const kmTranslations: Translations = {
   services: servicesTranslations,
   maintenance: maintenanceTranslations,
   incident: incidentTranslations,
-  ssl: sslTranslations
+  ssl: sslTranslations,
+  settings: settingsTranslations
 };
 
-export default kmTranslations;
+export default enTranslations;
\ No newline at end of file
diff --git a/application/src/translations/km/settings.ts b/application/src/translations/km/settings.ts
new file mode 100644
index 0000000..a25746e
--- /dev/null
+++ b/application/src/translations/km/settings.ts
@@ -0,0 +1,35 @@
+
+import { SettingsTranslations } from '../types/settings';
+
+export const settingsTranslations: SettingsTranslations = {
+  // Tabs
+  systemSettings: "System Settings",
+  mailSettings: "Mail Settings",
+  
+  // System Settings
+  appName: "Application Name",
+  appURL: "Application URL",
+  senderName: "Sender Name",
+  senderEmail: "Sender Email Address",
+  hideControls: "Hide Controls",
+  
+  // Mail Settings
+  smtpSettings: "SMTP Configuration",
+  smtpEnabled: "Enable SMTP",
+  smtpHost: "SMTP Host",
+  smtpPort: "SMTP Port",
+  smtpUsername: "SMTP Username",
+  smtpAuthMethod: "Authentication Method",
+  enableTLS: "Enable TLS",
+  localName: "Local Name",
+  
+  // Actions and status
+  save: "Save Changes",
+  saving: "Saving...",
+  settingsUpdated: "Settings updated successfully",
+  errorSavingSettings: "Error saving settings",
+  testConnection: "Test Connection",
+  testingConnection: "Testing Connection...",
+  connectionSuccess: "Connection successful",
+  connectionFailed: "Connection failed"
+};
\ No newline at end of file
diff --git a/application/src/translations/types/index.ts b/application/src/translations/types/index.ts
index f14aa50..fa52967 100644
--- a/application/src/translations/types/index.ts
+++ b/application/src/translations/types/index.ts
@@ -7,6 +7,7 @@ import { ServicesTranslations } from './services';
 import { MaintenanceTranslations } from './maintenance';
 import { IncidentTranslations } from './incident';
 import { SSLTranslations } from './ssl';
+import { SettingsTranslations } from './settings';
 
 export interface Translations {
   common: CommonTranslations;
@@ -17,4 +18,5 @@ export interface Translations {
   maintenance: MaintenanceTranslations;
   incident: IncidentTranslations;
   ssl: SSLTranslations;
-}
+  settings: SettingsTranslations;
+}
\ No newline at end of file
diff --git a/application/src/translations/types/settings.ts b/application/src/translations/types/settings.ts
new file mode 100644
index 0000000..7ad60d6
--- /dev/null
+++ b/application/src/translations/types/settings.ts
@@ -0,0 +1,33 @@
+
+export interface SettingsTranslations {
+  // Tabs
+  systemSettings: string;
+  mailSettings: string;
+  
+  // System Settings
+  appName: string;
+  appURL: string;
+  senderName: string;
+  senderEmail: string;
+  hideControls: string;
+  
+  // Mail Settings
+  smtpSettings: string;
+  smtpEnabled: string;
+  smtpHost: string;
+  smtpPort: string;
+  smtpUsername: string;
+  smtpAuthMethod: string;
+  enableTLS: string;
+  localName: string;
+  
+  // Actions and status
+  save: string;
+  saving: string;
+  settingsUpdated: string;
+  errorSavingSettings: string;
+  testConnection: string;
+  testingConnection: string;
+  connectionSuccess: string;
+  connectionFailed: string;
+}
\ No newline at end of file