diff --git a/src/components/MonitorList.vue b/src/components/MonitorList.vue
index d30a54a75..5971c5bfd 100644
--- a/src/components/MonitorList.vue
+++ b/src/components/MonitorList.vue
@@ -9,7 +9,7 @@
                 <a v-if="searchText" class="search-icon" @click="clearSearchText">
                     <font-awesome-icon icon="times" />
                 </a>
-                <input v-model="searchText" class="form-control search-input" :placeholder="$t('Search...')" />
+                <input v-model="searchText" class="form-control search-input" :placeholder="$t('SearchPlaceholder')" />
             </div>
         </div>
         <div class="monitor-list" :class="{ scrollbar: scrollbar }">
diff --git a/src/components/TagsManager.vue b/src/components/TagsManager.vue
index 4af56fc6e..56bc7cc3c 100644
--- a/src/components/TagsManager.vue
+++ b/src/components/TagsManager.vue
@@ -29,7 +29,7 @@
                             :options="tagOptions"
                             :multiple="false"
                             :searchable="true"
-                            :placeholder="$t('Add New below or Select...')"
+                            :placeholder="$t('AddNewBelowOrSelect')"
                             track-by="id"
                             label="name"
                         >
@@ -68,7 +68,7 @@
                                     :options="colorOptions"
                                     :multiple="false"
                                     :searchable="true"
-                                    :placeholder="$t('color')"
+                                    :placeholder="$t('Color')"
                                     track-by="color"
                                     label="name"
                                     select-label=""
@@ -96,7 +96,7 @@
                         <div class="mb-2">
                             <input v-model="newDraftTag.value" class="form-control"
                                    :class="{'is-invalid': validateDraftTag.valueInvalid}"
-                                   :placeholder="$t('valueOptional')"
+                                   :placeholder="$t('ValueOptional')"
                                    @keydown.enter.prevent="onEnter"
                             />
                             <div class="invalid-feedback">
diff --git a/src/languages/bg-BG.js b/src/languages/bg-BG.js
index 9bfc61d49..1481df826 100644
--- a/src/languages/bg-BG.js
+++ b/src/languages/bg-BG.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Етикет с тази стойност вече съществува.",
     Color: "цвят",
     ValueOptional: "стойност (по желание)",
-    Search: "Търси...",
+    SearchPlaceholder: "Търси...",
     AvgPing: "Ср. пинг",
     AvgResponse: "Ср. отговор",
     EntryPage: "Основна страница",
diff --git a/src/languages/da-DK.js b/src/languages/da-DK.js
index d45a077dc..275d1bad7 100644
--- a/src/languages/da-DK.js
+++ b/src/languages/da-DK.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Et Tag med denne værdi findes allerede.",
     Color: "farve",
     ValueOptional: "værdi (valgfri)",
-    Search: "Søg...",
+    SearchPlaceholder: "Søg...",
     AvgPing: "Gns. Ping",
     AvgResponse: "Gns. Respons",
     EntryPage: "Entry Side",
diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js
index 4346317fe..cc9dcc7f1 100644
--- a/src/languages/de-DE.js
+++ b/src/languages/de-DE.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Ein Tag mit dem Wert existiert bereits.",
     Color: "Farbe",
     ValueOptional: "Wert (Optional)",
-    Search: "Suchen...",
+    SearchPlaceholder: "Suchen...",
     AvgPing: "Durchsch. Ping",
     AvgResponse: "Durchsch. Antwort",
     EntryPage: "Einstiegsseite",
diff --git a/src/languages/en.js b/src/languages/en.js
index 673589542..808a829d5 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag with this value already exist.",
     Color: "color",
     ValueOptional: "value (optional)",
-    Search: "Search...",
+    SearchPlaceholder: "Search...",
     AvgPing: "Avg. Ping",
     AvgResponse: "Avg. Response",
     EntryPage: "Entry Page",
@@ -138,4 +138,87 @@ export default {
     StatusPage: "Status Page",
     CreateIncident: "Create Incident",
     NoMonitorsAvailable: "No monitors available.",
+    Valid: "Valid",
+    Invalid: "Invalid",
+    Confirm: "Confirm",
+    Up: "Up",
+    Down: "Down",
+    Unknown: "Unknown",
+    Status: "Status",
+    DateTime: "DateTime",
+    Message: "Message",
+    First: "First",
+    Last: "Last",
+    Keyword: "Keyword",
+    Pause: "Pause",
+    Resume: "Resume",
+    Edit: "Edit",
+    Delete: "Delete",
+    Current: "Current",
+    HoursInADay: "HoursInADay",
+    Uptime: "Uptime",
+    DaysInAMonth: "DaysInAMonth",
+    Events: "Events",
+    Heartbeats: "Heartbeats",
+    Yes: "Yes",
+    No: "No",
+    Response: "Response",
+    Ping: "Ping",
+    General: "General",
+    Hostname: "Hostname",
+    Port: "Port",
+    Retries: "Retries",
+    Advanced: "Advanced",
+    Save: "Save",
+    Notifications: "Notifications",
+    Dashboard: "Dashboard",
+    Settings: "Settings",
+    List: "List",
+    Add: "Add",
+    Username: "Username",
+    Password: "Password",
+    Token: "Token",
+    Login: "Login",
+    Test: "Test",
+    Appearance: "Appearance",
+    Language: "Language",
+    Theme: "Theme",
+    Light: "Light",
+    Dark: "Dark",
+    Auto: "Auto",
+    Normal: "Normal",
+    Bottom: "Bottom",
+    None: "None",
+    Timezone: "Timezone",
+    Export: "Export",
+    Options: "Options",
+    Overwrite: "Overwrite",
+    Import: "Import",
+    Logout: "Logout",
+    Info: "Info",
+    Version: "Version",
+    Leave: "Leave",
+    Create: "Create",
+    Pending: "Pending",
+    Discard: "Discard",
+    Unpublish: "Unpublish",
+    Publish: "Publish",
+    Title: "Title",
+    Content: "Content",
+    Post: "Post",
+    Cancel: "Cancel",
+    Unpin: "Unpin",
+    Description: "Description",
+    Tags: "Tags",
+    Name: "Name",
+    Gray: "Gray",
+    Red: "Red",
+    Orange: "Orange",
+    Green: "Green",
+    Blue: "Blue",
+    Indigo: "Indigo",
+    Purple: "Purple",
+    Pink: "Pink",
+    Active: "Active",
+    Inactive: "Inactive",
 };
diff --git a/src/languages/es-ES.js b/src/languages/es-ES.js
index 185ca41ad..5d15ecec9 100644
--- a/src/languages/es-ES.js
+++ b/src/languages/es-ES.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag with this value already exist.",
     Color: "color",
     ValueOptional: "value (optional)",
-    Search: "Search...",
+    SearchPlaceholder: "Search...",
     AvgPing: "Avg. Ping",
     AvgResponse: "Avg. Response",
     EntryPage: "Entry Page",
diff --git a/src/languages/et-EE.js b/src/languages/et-EE.js
index 4d9ad6968..660c6445c 100644
--- a/src/languages/et-EE.js
+++ b/src/languages/et-EE.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Selle väärtusega silt on juba olemas.",
     Color: "värvus",
     ValueOptional: "väärtus (fakultatiivne)",
-    Search: "Otsi…",
+    SearchPlaceholder: "Otsi…",
     AvgPing: "Keskmine ping",
     AvgResponse: "Keskmine reaktsiooniaeg",
     EntryPage: "Avaleht",
diff --git a/src/languages/fa.js b/src/languages/fa.js
index bb5fca9bb..4a7260fd4 100644
--- a/src/languages/fa.js
+++ b/src/languages/fa.js
@@ -98,7 +98,7 @@ export default {
     TagWithThisValueAlreadyExist: "یک برچسب با این «مقدار» از قبل وجود دارد.",
     Color: "رنگ",
     ValueOptional: "مقدار (اختیاری)",
-    Search: "جستجو...",
+    SearchPlaceholder: "جستجو...",
     AvgPing: "متوسط پینگ",
     AvgResponse: "متوسط زمان پاسخ",
     EntryPage: "صفحه ورودی",
diff --git a/src/languages/fr-FR.js b/src/languages/fr-FR.js
index 2285f6796..be8641cbf 100644
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Une étiquette avec cette valeur existe déjà.",
     Color: "couleur",
     ValueOptional: "valeur (facultatif)",
-    Search: "Rechercher...",
+    SearchPlaceholder: "Rechercher...",
     AvgPing: "Ping moyen",
     AvgResponse: "Réponse moyenne",
     EntryPage: "Page d'accueil",
diff --git a/src/languages/hu.js b/src/languages/hu.js
index 0fea77bd6..503b8169d 100644
--- a/src/languages/hu.js
+++ b/src/languages/hu.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Ilyen értékű cimke már létezik.",
     Color: "szín",
     ValueOptional: "érték (opcionális)",
-    Search: "Keres...",
+    SearchPlaceholder: "Keres...",
     AvgPing: "Átl. ping",
     AvgResponse: "Átl. válasz",
     EntryPage: "Nyitólap",
diff --git a/src/languages/it-IT.js b/src/languages/it-IT.js
index 35d2a7c95..688660061 100644
--- a/src/languages/it-IT.js
+++ b/src/languages/it-IT.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Un'etichetta con questo valore già esiste.",
     Color: "colori",
     ValueOptional: "valore (opzionale)",
-    Search: "Cerca...",
+    SearchPlaceholder: "Cerca...",
     AvgPing: "Ping medio",
     AvgResponse: "Risposta media",
     EntryPage: "Entry Page",
diff --git a/src/languages/ja.js b/src/languages/ja.js
index 345634336..ea8d9900b 100644
--- a/src/languages/ja.js
+++ b/src/languages/ja.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag with this value already exist.",
     Color: "color",
     ValueOptional: "value (optional)",
-    Search: "Search...",
+    SearchPlaceholder: "Search...",
     AvgPing: "Avg. Ping",
     AvgResponse: "Avg. Response",
     EntryPage: "Entry Page",
diff --git a/src/languages/ko-KR.js b/src/languages/ko-KR.js
index 804b4ffb0..4eb9454ae 100644
--- a/src/languages/ko-KR.js
+++ b/src/languages/ko-KR.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag with this value already exist.",
     Color: "color",
     ValueOptional: "value (optional)",
-    Search: "Search...",
+    SearchPlaceholder: "Search...",
     AvgPing: "Avg. Ping",
     AvgResponse: "Avg. Response",
     EntryPage: "Entry Page",
diff --git a/src/languages/nl-NL.js b/src/languages/nl-NL.js
index a5d1c9eb5..83251bb5c 100644
--- a/src/languages/nl-NL.js
+++ b/src/languages/nl-NL.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag with this value already exist.",
     Color: "color",
     ValueOptional: "value (optional)",
-    Search: "Search...",
+    SearchPlaceholder: "Search...",
     AvgPing: "Avg. Ping",
     AvgResponse: "Avg. Response",
     EntryPage: "Entry Page",
diff --git a/src/languages/pl.js b/src/languages/pl.js
index d04038c83..af6303728 100644
--- a/src/languages/pl.js
+++ b/src/languages/pl.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag o tej wartości już istnieje.",
     Color: "kolor",
     ValueOptional: "wartość (opcjonalnie)",
-    Search: "Szukaj...",
+    SearchPlaceholder: "Szukaj...",
     AvgPing: "Średni ping",
     AvgResponse: "Średnia odpowiedź",
     EntryPage: "Wejdź na stronę",
diff --git a/src/languages/pt-BR.js b/src/languages/pt-BR.js
index 3e1d5f5fa..83a0170a3 100644
--- a/src/languages/pt-BR.js
+++ b/src/languages/pt-BR.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Já existe uma etiqueta com este valor.",
     Color: "cor",
     ValueOptional: "valor (opcional)",
-    Search: "Buscar...",
+    SearchPlaceholder: "Buscar...",
     AvgPing: "Ping Médio.",
     AvgResponse: "Resposta Média. ",
     EntryPage: "Página de entrada",
diff --git a/src/languages/ru-RU.js b/src/languages/ru-RU.js
index 94f694f0a..685e7e9be 100644
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@@ -96,7 +96,7 @@ export default {
     TagWithThisValueAlreadyExist: "Тег с таким значением уже существует.",
     Color: "цвет",
     ValueOptional: "значение (опционально)",
-    Search: "Поиск...",
+    SearchPlaceholder: "Поиск...",
     AvgPing: "Средн. пинг",
     AvgResponse: "Средн. ответ",
     EntryPage: "Главная страница",
diff --git a/src/languages/sr-latn.js b/src/languages/sr-latn.js
index 59760af66..11428fd81 100644
--- a/src/languages/sr-latn.js
+++ b/src/languages/sr-latn.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag with this value already exist.",
     Color: "color",
     ValueOptional: "value (optional)",
-    Search: "Search...",
+    SearchPlaceholder: "Search...",
     AvgPing: "Avg. Ping",
     AvgResponse: "Avg. Response",
     EntryPage: "Entry Page",
diff --git a/src/languages/sr.js b/src/languages/sr.js
index af59a156d..db2393586 100644
--- a/src/languages/sr.js
+++ b/src/languages/sr.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag with this value already exist.",
     Color: "color",
     ValueOptional: "value (optional)",
-    Search: "Search...",
+    SearchPlaceholder: "Search...",
     AvgPing: "Avg. Ping",
     AvgResponse: "Avg. Response",
     EntryPage: "Entry Page",
diff --git a/src/languages/sv-SE.js b/src/languages/sv-SE.js
index 7282fa68d..b618629d7 100644
--- a/src/languages/sv-SE.js
+++ b/src/languages/sv-SE.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag with this value already exist.",
     Color: "color",
     ValueOptional: "value (optional)",
-    Search: "Search...",
+    SearchPlaceholder: "Search...",
     AvgPing: "Avg. Ping",
     AvgResponse: "Avg. Response",
     EntryPage: "Entry Page",
diff --git a/src/languages/tr-TR.js b/src/languages/tr-TR.js
index b7b2a5e1d..1fb108946 100644
--- a/src/languages/tr-TR.js
+++ b/src/languages/tr-TR.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag with this value already exist.",
     Color: "color",
     ValueOptional: "value (optional)",
-    Search: "Search...",
+    SearchPlaceholder: "Search...",
     AvgPing: "Avg. Ping",
     AvgResponse: "Avg. Response",
     EntryPage: "Entry Page",
diff --git a/src/languages/zh-CN.js b/src/languages/zh-CN.js
index 2add13e6b..ca6e685f6 100644
--- a/src/languages/zh-CN.js
+++ b/src/languages/zh-CN.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "相同内容的标签已存在",
     Color: "颜色",
     ValueOptional: "值（可选）",
-    Search: "搜索...",
+    SearchPlaceholder: "搜索...",
     AvgPing: "平均Ping",
     AvgResponse: "平均响应",
     EntryPage: "入口页面",
diff --git a/src/languages/zh-HK.js b/src/languages/zh-HK.js
index bc47b1e8e..a1018c8da 100644
--- a/src/languages/zh-HK.js
+++ b/src/languages/zh-HK.js
@@ -95,7 +95,7 @@ export default {
     TagWithThisValueAlreadyExist: "Tag with this value already exist.",
     Color: "color",
     ValueOptional: "value (optional)",
-    Search: "Search...",
+    SearchPlaceholder: "Search...",
     AvgPing: "Avg. Ping",
     AvgResponse: "Avg. Response",
     EntryPage: "Entry Page",
diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index 59479b9d1..4a215d891 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -38,7 +38,7 @@
                 <div class="row">
                     <div class="col-md-8">
                         <HeartbeatBar :monitor-id="monitor.id" />
-                        <span class="word">{{ $t("checkEverySecond", [ monitor.interval ]) }}</span>
+                        <span class="word">{{ $t("CheckEverySecond", [ monitor.interval ]) }}</span>
                     </div>
                     <div class="col-md-4 text-center">
                         <span class="badge rounded-pill" :class=" 'bg-' + status.color " style="font-size: 30px;">{{ status.text }}</span>
@@ -59,17 +59,17 @@
                     </div>
                     <div class="col">
                         <h4>{{ pingTitle(true) }}</h4>
-                        <p>({{ $t("24-hour") }})</p>
+                        <p>({{ $t("HoursInADay") }})</p>
                         <span class="num"><CountUp :value="avgPing" /></span>
                     </div>
                     <div class="col">
                         <h4>{{ $t("Uptime") }}</h4>
-                        <p>({{ $t("24-hour") }})</p>
+                        <p>({{ $t("HoursInADay") }})</p>
                         <span class="num"><Uptime :monitor="monitor" type="24" /></span>
                     </div>
                     <div class="col">
                         <h4>{{ $t("Uptime") }}</h4>
-                        <p>({{ $t("30-day") }})</p>
+                        <p>({{ $t("DaysInAMonth") }})</p>
                         <span class="num"><Uptime :monitor="monitor" type="720" /></span>
                     </div>
 
@@ -354,7 +354,7 @@ export default {
         pingTitle(average = false) {
             let translationPrefix = "";
             if (average) {
-                translationPrefix = "Avg. ";
+                translationPrefix = "Avg";
             }
 
             if (this.monitor.type === "http") {
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 2ed77f5cd..dcf995579 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -111,7 +111,7 @@
 
                             <!-- Interval -->
                             <div class="my-3">
-                                <label for="interval" class="form-label">{{ $t("HeartbeatInterval") }} ({{ $t("checkEverySecond", [ monitor.interval ]) }})</label>
+                                <label for="interval" class="form-label">{{ $t("HeartbeatInterval") }} ({{ $t("CheckEverySecond", [ monitor.interval ]) }})</label>
                                 <input id="interval" v-model="monitor.interval" type="number" class="form-control" required min="20" step="1">
                             </div>
 
@@ -126,7 +126,7 @@
                             <div class="my-3">
                                 <label for="retry-interval" class="form-label">
                                     {{ $t("HeartbeatRetryInterval") }}
-                                    <span>({{ $t("retryCheckEverySecond", [ monitor.retryInterval ]) }})</span>
+                                    <span>({{ $t("RetryCheckEverySecond", [ monitor.retryInterval ]) }})</span>
                                 </label>
                                 <input id="retry-interval" v-model="monitor.retryInterval" type="number" class="form-control" required min="20" step="1">
                             </div>
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index d2e061ef3..f7deca5d5 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -237,7 +237,7 @@
             <NotificationDialog ref="notificationDialog" />
             <TwoFADialog ref="TwoFADialog" />
 
-            <Confirm ref="confirmDisableAuth" btn-style="btn-danger" :yes-text="$t('I understand, please disable')" :no-text="$t('Leave')" @yes="disableAuth">
+            <Confirm ref="confirmDisableAuth" btn-style="btn-danger" :yes-text="$t('IUnderstandPleaseDisable')" :no-text="$t('Leave')" @yes="disableAuth">
                 <template v-if="$i18n.locale === 'es-ES' ">
                     <p>Seguro que deseas <strong>deshabilitar la autenticación</strong>?</p>
                     <p>Es para <strong>quien implementa autenticación de terceros</strong> ante Uptime Kuma como por ejemplo Cloudflare Access.</p>
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index 7b20c1478..e908ae779 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -182,7 +182,7 @@
                     </select>
                 </div>
                 <div v-else class="text-center">
-                    {{ $t("NoMonitorsAvailable.") }}  <router-link to="/add">{{ $t("AddOne") }}</router-link>
+                    {{ $t("NoMonitorsAvailable") }}  <router-link to="/add">{{ $t("AddOne") }}</router-link>
                 </div>
             </div>
         </div>
@@ -197,7 +197,7 @@
         </div>
 
         <footer class="mt-5 mb-4">
-            {{ $t("PoweredBy") }} <a target="_blank" href="https://github.com/louislam/uptime-kuma">{{ $t("Uptime Kuma" )}}</a>
+            {{ $t("PoweredBy") }} <a target="_blank" href="https://github.com/louislam/uptime-kuma">{{ $t("UptimeKuma" )}}</a>
         </footer>
     </div>
 </template>