diff --git a/assets/i18n/en-US.json b/assets/i18n/en-US.json
index c2c6097a..0ddf5667 100644
--- a/assets/i18n/en-US.json
+++ b/assets/i18n/en-US.json
@@ -944,5 +944,21 @@
   "unpinPostHint": "Are you sure you want to unpin this post?",
   "all": "All",
   "statusPresent": "Present",
-  "accountAutomated": "Automated"
-}
+  "accountAutomated": "Automated",
+  "chatBreakClearButton": "Clear",
+  "chatBreak5m": "5m",
+  "chatBreak10m": "10m",
+  "chatBreak15m": "15m",
+  "chatBreak30m": "30m",
+  "chatBreakCustomMinutes": "Custom (minutes)",
+  "chatBreakEnterMinutes": "Enter minutes",
+  "errorGeneric": "Error: {}",
+  "searchMessages": "Search Messages",
+  "messagesCount": "{} messages",
+  "dotSeparator": "·",
+  "roleValidationHint": "Role must be between 0 and 100",
+  "searchMessagesHint": "Search messages...",
+  "searchLinks": "Links",
+  "searchAttachments": "Attachments",
+  "noMessagesFound": "No messages found"
+}
\ No newline at end of file
diff --git a/lib/screens/chat/room_detail.dart b/lib/screens/chat/room_detail.dart
index 8d3d7947..d5347fa6 100644
--- a/lib/screens/chat/room_detail.dart
+++ b/lib/screens/chat/room_detail.dart
@@ -140,7 +140,7 @@ class ChatDetailScreen extends HookConsumerWidget {
                   const Text('chatBreakDescription').tr(),
                   const Gap(16),
                   ListTile(
-                    title: const Text('Clear').tr(),
+                    title: const Text('chatBreakClearButton').tr(),
                     subtitle: const Text('chatBreakClear').tr(),
                     leading: const Icon(Icons.notifications_active),
                     onTap: () {
@@ -152,8 +152,8 @@ class ChatDetailScreen extends HookConsumerWidget {
                     },
                   ),
                   ListTile(
-                    title: const Text('5m'),
-                    subtitle: const Text('chatBreakHour').tr(args: ['5m']),
+                    title: const Text('chatBreak5m').tr(),
+                    subtitle: const Text('chatBreakHour').tr(args: ['chatBreak5m'.tr()]),
                     leading: const Icon(Symbols.circle),
                     onTap: () {
                       setChatBreak(now.add(const Duration(minutes: 5)));
@@ -164,8 +164,8 @@ class ChatDetailScreen extends HookConsumerWidget {
                     },
                   ),
                   ListTile(
-                    title: const Text('10m'),
-                    subtitle: const Text('chatBreakHour').tr(args: ['10m']),
+                    title: const Text('chatBreak10m').tr(),
+                    subtitle: const Text('chatBreakHour').tr(args: ['chatBreak10m'.tr()]),
                     leading: const Icon(Symbols.circle),
                     onTap: () {
                       setChatBreak(now.add(const Duration(minutes: 10)));
@@ -176,8 +176,8 @@ class ChatDetailScreen extends HookConsumerWidget {
                     },
                   ),
                   ListTile(
-                    title: const Text('15m'),
-                    subtitle: const Text('chatBreakHour').tr(args: ['15m']),
+                    title: const Text('chatBreak15m').tr(),
+                    subtitle: const Text('chatBreakHour').tr(args: ['chatBreak15m'.tr()]),
                     leading: const Icon(Symbols.timer_3),
                     onTap: () {
                       setChatBreak(now.add(const Duration(minutes: 15)));
@@ -188,8 +188,8 @@ class ChatDetailScreen extends HookConsumerWidget {
                     },
                   ),
                   ListTile(
-                    title: const Text('30m'),
-                    subtitle: const Text('chatBreakHour').tr(args: ['30m']),
+                    title: const Text('chatBreak30m').tr(),
+                    subtitle: const Text('chatBreakHour').tr(args: ['chatBreak30m'.tr()]),
                     leading: const Icon(Symbols.timer),
                     onTap: () {
                       setChatBreak(now.add(const Duration(minutes: 30)));
@@ -203,8 +203,8 @@ class ChatDetailScreen extends HookConsumerWidget {
                   TextField(
                     controller: durationController,
                     decoration: InputDecoration(
-                      labelText: 'Custom (minutes)'.tr(),
-                      hintText: 'Enter minutes'.tr(),
+                      labelText: 'chatBreakCustomMinutes'.tr(),
+                      hintText: 'chatBreakEnterMinutes'.tr(),
                       border: const OutlineInputBorder(),
                       suffixIcon: IconButton(
                         icon: const Icon(Icons.check),
@@ -247,7 +247,7 @@ class ChatDetailScreen extends HookConsumerWidget {
     return AppScaffold(
       body: roomState.when(
         loading: () => const Center(child: CircularProgressIndicator()),
-        error: (error, _) => Center(child: Text('Error: $error')),
+        error: (error, _) => Center(child: Text('errorGeneric'.tr(args: [error.toString()]))),
         data:
             (currentRoom) => CustomScrollView(
               slivers: [
@@ -373,11 +373,11 @@ class ChatDetailScreen extends HookConsumerWidget {
                                   ),
                                   leading: const Icon(Icons.search),
                                   trailing: const Icon(Symbols.chevron_right),
-                                  title: const Text('Search Messages').tr(),
+                                  title: const Text('searchMessages').tr(),
                                   subtitle: totalMessages.when(
-                                    data: (count) => Text('$count messages').tr(),
+                                    data: (count) => Text('messagesCount'.tr(args: [count.toString()])),
                                     loading: () => const CircularProgressIndicator(),
-                                    error: (err, stack) => Text('Error: $err'),
+                                    error: (err, stack) => Text('errorGeneric'.tr(args: [err.toString()])),
                                   ),
                                   onTap: () {
                                     context.pushNamed('searchMessages', pathParameters: {'id': id});
@@ -716,7 +716,7 @@ class _ChatMemberListSheet extends HookConsumerWidget {
                                 ? 'permissionModerator'
                                 : 'permissionMember',
                           ).tr(),
-                          Text('·').bold().padding(horizontal: 6),
+                          Text('dotSeparator').bold().padding(horizontal: 6),
                           Expanded(child: Text("@${member.account.name}")),
                         ],
                       ),
@@ -876,7 +876,7 @@ class _ChatMemberRoleSheet extends HookConsumerWidget {
                     try {
                       final newRole = int.parse(roleController.text);
                       if (newRole < 0 || newRole > 100) {
-                        throw 'Role must be between 0 and 100';
+                        throw 'roleValidationHint'.tr();
                       }
 
                       final apiClient = ref.read(apiClientProvider);
diff --git a/lib/screens/chat/search_messages_screen.dart b/lib/screens/chat/search_messages_screen.dart
index 1d3d440c..d0609b7a 100644
--- a/lib/screens/chat/search_messages_screen.dart
+++ b/lib/screens/chat/search_messages_screen.dart
@@ -32,7 +32,7 @@ class SearchMessagesScreen extends HookConsumerWidget {
     }, []);
 
     return AppScaffold(
-      appBar: AppBar(title: const Text('Search Messages')),
+      appBar: AppBar(title: const Text('searchMessages').tr()),
       body: Column(
         children: [
           Column(
@@ -40,7 +40,7 @@ class SearchMessagesScreen extends HookConsumerWidget {
               TextField(
                 controller: searchController,
                 decoration: InputDecoration(
-                  hintText: 'Search messages...',
+                  hintText: 'searchMessagesHint'.tr(),
                   border: InputBorder.none,
                   isDense: true,
                   contentPadding: EdgeInsets.only(
@@ -72,7 +72,7 @@ class SearchMessagesScreen extends HookConsumerWidget {
                   Expanded(
                     child: CheckboxListTile(
                       secondary: const Icon(Symbols.link),
-                      title: const Text('Links'),
+                      title: const Text('searchLinks').tr(),
                       value: withLinks.value,
                       onChanged: (bool? value) {
                         withLinks.value = value!;
@@ -87,7 +87,7 @@ class SearchMessagesScreen extends HookConsumerWidget {
                   Expanded(
                     child: CheckboxListTile(
                       secondary: const Icon(Symbols.file_copy),
-                      title: const Text('Attachments'),
+                      title: const Text('searchAttachments').tr(),
                       value: withAttachments.value,
                       onChanged: (bool? value) {
                         withAttachments.value = value!;
@@ -109,7 +109,7 @@ class SearchMessagesScreen extends HookConsumerWidget {
               data:
                   (messageList) =>
                       messageList.isEmpty
-                          ? Center(child: Text('No messages found'.tr()))
+                          ? Center(child: Text('noMessagesFound'.tr()))
                           : SuperListView.builder(
                             padding: const EdgeInsets.symmetric(vertical: 16),
                             reverse: true, // Show newest messages at the bottom
@@ -129,7 +129,7 @@ class SearchMessagesScreen extends HookConsumerWidget {
                             },
                           ),
               loading: () => const Center(child: CircularProgressIndicator()),
-              error: (error, _) => Center(child: Text('Error: $error')),
+              error: (error, _) => Center(child: Text('errorGeneric'.tr(args: [error.toString()]))),
             ),
           ),
         ],