From 9b1de7572e25329fa60fedc14c2f12aa8f23f751 Mon Sep 17 00:00:00 2001
From: Eduardo Silva <eduardo@eth0.com.br>
Date: Sun, 25 Jan 2026 11:47:13 -0300
Subject: [PATCH] update translations

---
 locale/de/LC_MESSAGES/django.po    | 177 ++++++++++++++++++-----------
 locale/es/LC_MESSAGES/django.po    | 177 ++++++++++++++++++-----------
 locale/fr/LC_MESSAGES/django.po    | 177 ++++++++++++++++++-----------
 locale/pt_BR/LC_MESSAGES/django.po | 177 ++++++++++++++++++-----------
 locale/sk/LC_MESSAGES/django.po    | 177 ++++++++++++++++++-----------
 5 files changed, 550 insertions(+), 335 deletions(-)

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 1eb8056..ffd409c 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-24 14:25-0300\n"
+"POT-Creation-Date: 2026-01-25 11:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,9 @@ msgstr ""
 #: cluster/forms.py:18 dns/forms.py:111 routing_templates/forms.py:28
 #: templates/cluster/workers_list.html:8 templates/dns/static_host_list.html:68
 #: templates/routing_templates/list.html:8
-#: templates/user_manager/peer_group_list.html:8 user_manager/forms.py:177
+#: templates/user_manager/peer_group_list.html:8
+#: templates/wireguard/server_detail.html:12
+#: templates/wireguard/server_list.html:19 user_manager/forms.py:177
 #: wireguard_peer/forms.py:10
 msgid "Name"
 msgstr "Name"
@@ -52,6 +54,7 @@ msgid "City"
 msgstr "Stadt"
 
 #: cluster/forms.py:24 dns/forms.py:65 templates/dns/static_host_list.html:17
+#: templates/wireguard/server_detail.html:39
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -67,6 +70,7 @@ msgstr "Token"
 #: templates/wireguard/apply_route_template.html:63
 #: templates/wireguard/wireguard_manage_ip.html:42
 #: templates/wireguard/wireguard_manage_peer.html:203
+#: templates/wireguard/wireguard_manage_server.html:119
 #: templates/wireguard/wireguard_peer_list.html:168 user_manager/forms.py:49
 #: user_manager/forms.py:180 vpn_invite/forms.py:192 vpn_invite/forms.py:326
 msgid "Back"
@@ -89,7 +93,7 @@ msgstr "Löschen"
 #: templates/firewall/manage_redirect_rule.html:84
 #: templates/wireguard/wireguard_manage_ip.html:41
 #: templates/wireguard/wireguard_manage_peer.html:201
-#: templates/wireguard/wireguard_manage_server.html:130
+#: templates/wireguard/wireguard_manage_server.html:117
 #: user_manager/forms.py:98 user_manager/forms.py:205 vpn_invite/forms.py:191
 #: vpn_invite/forms.py:325
 msgid "Save"
@@ -161,7 +165,7 @@ msgstr "Ein Worker-Update ist erforderlich."
 msgid "Access Denied"
 msgstr "Zugriff verweigert"
 
-#: cluster/views.py:21 templates/base.html:172
+#: cluster/views.py:21 templates/template_parts/base_sidebar.html:97
 msgid "Cluster"
 msgstr "Cluster"
 
@@ -677,7 +681,7 @@ msgstr "Firewall‑Einstellungen erfolgreich gespeichert"
 msgid "Language"
 msgstr "Sprache"
 
-#: intl_tools/forms.py:24 templates/base.html:57
+#: intl_tools/forms.py:24 templates/template_parts/base_navbar.html:14
 msgid "Change Language"
 msgstr "Sprache ändern"
 
@@ -767,7 +771,7 @@ msgstr "Routen von allen Peers"
 msgid "One route per line in CIDR notation."
 msgstr "Eine Route pro Zeile in CIDR-Notation."
 
-#: routing_templates/views.py:16 templates/base.html:154
+#: routing_templates/views.py:16 templates/template_parts/base_sidebar.html:79
 msgid "Routing Templates"
 msgstr "Routing-Vorlagen"
 
@@ -904,50 +908,13 @@ msgstr "Sie wurden erfolgreich abgemeldet."
 msgid "Login again"
 msgstr "Erneut anmelden"
 
-#: templates/base.html:89 templates/cluster/workers_list.html:9
-#: templates/dns/static_host_list.html:72 vpn_invite/forms.py:78
+#: templates/cluster/workers_list.html:9 templates/dns/static_host_list.html:72
+#: templates/template_parts/base_sidebar.html:13 vpn_invite/forms.py:78
 #: vpn_invite/forms.py:79 vpn_invite/forms.py:80 vpn_invite/forms.py:81
 #: vpn_invite/forms.py:82
 msgid "Status"
 msgstr "Status"
 
-#: templates/base.html:135 user_manager/views.py:74
-msgid "User Manager"
-msgstr "Benutzerverwaltung"
-
-#: templates/base.html:163 templates/wireguard/wireguard_peer_list.html:209
-#: vpn_invite/views.py:37
-msgid "VPN Invite"
-msgstr "VPN‑Einladung"
-
-#: templates/base.html:250
-msgid "Update Required"
-msgstr "Aktualisierung erforderlich"
-
-#: templates/base.html:252
-msgid ""
-"Your WireGuard settings have been modified. To apply these changes, please "
-"update the configuration and reload the WireGuard service."
-msgstr ""
-"Ihre WireGuard‑Einstellungen wurden geändert. Um die Änderungen anzuwenden, "
-"aktualisieren Sie die Konfiguration und laden Sie den WireGuard‑Dienst neu."
-
-#: templates/base.html:261
-msgid "Update and restart service"
-msgstr "Aktualisieren und Dienst neu starten"
-
-#: templates/base.html:269
-msgid "Update and reload service"
-msgstr "Aktualisieren und Dienst neu laden"
-
-#: templates/base.html:282
-msgid "Update Available"
-msgstr "Aktualisierung verfügbar"
-
-#: templates/base.html:284
-msgid "Version"
-msgstr "Version"
-
 #: templates/cluster/workers_list.html:11
 #: templates/wireguard/wireguard_peer_list.html:77
 #: templates/wireguard/wireguard_peer_list.html:129
@@ -1471,6 +1438,43 @@ msgstr "Standard‑Richtlinie"
 msgid "Updated"
 msgstr "Aktualisieren"
 
+#: templates/template_parts/base_footer.html:4
+msgid "Update Available"
+msgstr "Aktualisierung verfügbar"
+
+#: templates/template_parts/base_footer.html:7
+msgid "Version"
+msgstr "Version"
+
+#: templates/template_parts/base_pending_changes_warning.html:4
+msgid "Update Required"
+msgstr "Aktualisierung erforderlich"
+
+#: templates/template_parts/base_pending_changes_warning.html:6
+msgid ""
+"Your WireGuard settings have been modified. To apply these changes, please "
+"update the configuration and reload the WireGuard service."
+msgstr ""
+"Ihre WireGuard‑Einstellungen wurden geändert. Um die Änderungen anzuwenden, "
+"aktualisieren Sie die Konfiguration und laden Sie den WireGuard‑Dienst neu."
+
+#: templates/template_parts/base_pending_changes_warning.html:15
+msgid "Update and restart service"
+msgstr "Aktualisieren und Dienst neu starten"
+
+#: templates/template_parts/base_pending_changes_warning.html:23
+msgid "Update and reload service"
+msgstr "Aktualisieren und Dienst neu laden"
+
+#: templates/template_parts/base_sidebar.html:59 user_manager/views.py:74
+msgid "User Manager"
+msgstr "Benutzerverwaltung"
+
+#: templates/template_parts/base_sidebar.html:88
+#: templates/wireguard/wireguard_peer_list.html:209 vpn_invite/views.py:37
+msgid "VPN Invite"
+msgstr "VPN‑Einladung"
+
 #: templates/user_manager/list.html:9 user_manager/forms.py:20
 msgid "User Level"
 msgstr "Benutzerstufe"
@@ -1521,6 +1525,8 @@ msgid "Add Peer Group"
 msgstr "Peer‑Gruppe hinzufügen"
 
 #: templates/user_manager/peer_group_list.html:9
+#: templates/wireguard/server_detail.html:43
+#: templates/wireguard/server_list.html:22
 #: templates/wireguard/wireguard_status.html:48
 msgid "Peers"
 msgstr "Peers"
@@ -1590,6 +1596,56 @@ msgstr "Verknüpfung aufheben"
 msgid "No routing templates available for this interface."
 msgstr "Keine Routen-Vorlagen für diese Schnittstelle verfügbar."
 
+#: templates/wireguard/server_detail.html:17
+#: templates/wireguard/wireguard_manage_peer.html:29 wireguard/forms.py:14
+#: wireguard_peer/forms.py:11
+msgid "Public Key"
+msgstr "Public Key"
+
+#: templates/wireguard/server_detail.html:31
+#: templates/wireguard/server_list.html:20 wireguard/forms.py:16
+msgid "Listen Port"
+msgstr "Listen‑Port"
+
+#: templates/wireguard/server_detail.html:35
+#: templates/wireguard/server_list.html:21
+#, fuzzy
+#| msgid "IP Address"
+msgid "Address"
+msgstr "IP‑Adresse"
+
+#: templates/wireguard/server_detail.html:50
+#, fuzzy
+#| msgid "Instance"
+msgid "Edit Instance"
+msgstr "Instanz"
+
+#: templates/wireguard/server_detail.html:53
+#, fuzzy
+#| msgid "Static Host List"
+msgid "Back to List"
+msgstr "Statische Hostliste"
+
+#: templates/wireguard/server_detail.html:62
+msgid "Traffic Graph"
+msgstr ""
+
+#: templates/wireguard/server_list.html:7 wireguard/views.py:214
+#, fuzzy
+#| msgid "WireGuard Instance"
+msgid "WireGuard Instances"
+msgstr "WireGuard-Instanz"
+
+#: templates/wireguard/server_list.html:10
+msgid "Create Instance"
+msgstr "Instanz erstellen"
+
+#: templates/wireguard/server_list.html:61
+#, fuzzy
+#| msgid "No WireGuard Instances Found"
+msgid "No WireGuard instances found."
+msgstr "Keine WireGuard‑Instanzen gefunden"
+
 #: templates/wireguard/wireguard_manage_ip.html:18
 msgid "Enter Allowed IP"
 msgstr "Erlaubte IP eingeben"
@@ -1617,11 +1673,6 @@ msgstr "Name eingeben"
 msgid "Persistent Keepalive"
 msgstr "Persistent Keepalive"
 
-#: templates/wireguard/wireguard_manage_peer.html:29 wireguard/forms.py:14
-#: wireguard_peer/forms.py:11
-msgid "Public Key"
-msgstr "Public Key"
-
 #: templates/wireguard/wireguard_manage_peer.html:36 wireguard/forms.py:13
 #: wireguard_peer/forms.py:12
 msgid "Private Key"
@@ -1740,11 +1791,7 @@ msgstr ""
 "Peers werden ohne den privaten Schlüssel generiert.\\n Er muss beim Import "
 "manuell eingefügt werden.\\n\\n Möchten Sie fortfahren?"
 
-#: templates/wireguard/wireguard_manage_server.html:18
-msgid "Create Instance"
-msgstr "Instanz erstellen"
-
-#: templates/wireguard/wireguard_manage_server.html:132
+#: templates/wireguard/wireguard_manage_server.html:120
 msgid "Delete Configuration"
 msgstr "Konfiguration löschen"
 
@@ -2434,10 +2481,6 @@ msgstr "Anzeigename"
 msgid "Instance ID"
 msgstr "Instanz‑ID"
 
-#: wireguard/forms.py:16
-msgid "Listen Port"
-msgstr "Listen‑Port"
-
 #: wireguard/forms.py:17
 msgid "Internal IP Address"
 msgstr "Interne IP‑Adresse"
@@ -2471,19 +2514,19 @@ msgstr "Der gewählte Netzbereich überschneidet sich mit einer anderen Instanz.
 msgid "WireGuard Status"
 msgstr "WireGuard‑Status"
 
-#: wireguard/views.py:130
+#: wireguard/views.py:131
 msgid "Update WireGuard Instance"
 msgstr "WireGuard‑Instanz aktualisieren"
 
-#: wireguard/views.py:134
+#: wireguard/views.py:135
 msgid "Delete WireGuard Instance"
 msgstr "WireGuard‑Instanz löschen"
 
-#: wireguard/views.py:137
+#: wireguard/views.py:138
 msgid "Error removing instance: wg"
 msgstr "Fehler beim Entfernen der Instanz: wg"
 
-#: wireguard/views.py:137
+#: wireguard/views.py:138
 msgid ""
 "|Cannot delete the requested WireGuard instance. There are still peers "
 "associated with this instance."
@@ -2491,21 +2534,21 @@ msgstr ""
 "|Die gewünschte WireGuard‑Instanz kann nicht gelöscht werden. Es sind noch "
 "Peers mit dieser Instanz verknüpft."
 
-#: wireguard/views.py:140
+#: wireguard/views.py:141
 msgid "|WireGuard instance deleted: wg"
 msgstr "|WireGuard‑Instanz gelöscht: wg"
 
-#: wireguard/views.py:143
+#: wireguard/views.py:144
 msgid "Invalid confirmation|Please confirm deletion of WireGuard instance: wg"
 msgstr ""
 "Ungültige Bestätigung|Bitte bestätigen Sie das Löschen der "
 "WireGuard‑Instanz: wg"
 
-#: wireguard/views.py:147
+#: wireguard/views.py:148
 msgid "Create a new WireGuard Instance"
 msgstr "Neue WireGuard‑Instanz erstellen"
 
-#: wireguard/views.py:148
+#: wireguard/views.py:149
 msgid "New WireGuard Instance"
 msgstr "Neue WireGuard‑Instanz"
 
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b6c790c..6e965d7 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-24 14:25-0300\n"
+"POT-Creation-Date: 2026-01-25 11:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,9 @@ msgstr ""
 #: cluster/forms.py:18 dns/forms.py:111 routing_templates/forms.py:28
 #: templates/cluster/workers_list.html:8 templates/dns/static_host_list.html:68
 #: templates/routing_templates/list.html:8
-#: templates/user_manager/peer_group_list.html:8 user_manager/forms.py:177
+#: templates/user_manager/peer_group_list.html:8
+#: templates/wireguard/server_detail.html:12
+#: templates/wireguard/server_list.html:19 user_manager/forms.py:177
 #: wireguard_peer/forms.py:10
 msgid "Name"
 msgstr "Nombre"
@@ -52,6 +54,7 @@ msgid "City"
 msgstr "Ciudad"
 
 #: cluster/forms.py:24 dns/forms.py:65 templates/dns/static_host_list.html:17
+#: templates/wireguard/server_detail.html:39
 msgid "Hostname"
 msgstr "Nombre de host"
 
@@ -67,6 +70,7 @@ msgstr "Token"
 #: templates/wireguard/apply_route_template.html:63
 #: templates/wireguard/wireguard_manage_ip.html:42
 #: templates/wireguard/wireguard_manage_peer.html:203
+#: templates/wireguard/wireguard_manage_server.html:119
 #: templates/wireguard/wireguard_peer_list.html:168 user_manager/forms.py:49
 #: user_manager/forms.py:180 vpn_invite/forms.py:192 vpn_invite/forms.py:326
 msgid "Back"
@@ -89,7 +93,7 @@ msgstr "Eliminar"
 #: templates/firewall/manage_redirect_rule.html:84
 #: templates/wireguard/wireguard_manage_ip.html:41
 #: templates/wireguard/wireguard_manage_peer.html:201
-#: templates/wireguard/wireguard_manage_server.html:130
+#: templates/wireguard/wireguard_manage_server.html:117
 #: user_manager/forms.py:98 user_manager/forms.py:205 vpn_invite/forms.py:191
 #: vpn_invite/forms.py:325
 msgid "Save"
@@ -163,7 +167,7 @@ msgstr "Se requiere la actualización del worker."
 msgid "Access Denied"
 msgstr "Acceso denegado"
 
-#: cluster/views.py:21 templates/base.html:172
+#: cluster/views.py:21 templates/template_parts/base_sidebar.html:97
 msgid "Cluster"
 msgstr "Cluster"
 
@@ -674,7 +678,7 @@ msgstr "Configuración de firewall guardada correctamente"
 msgid "Language"
 msgstr "Idioma"
 
-#: intl_tools/forms.py:24 templates/base.html:57
+#: intl_tools/forms.py:24 templates/template_parts/base_navbar.html:14
 msgid "Change Language"
 msgstr "Cambiar idioma"
 
@@ -763,7 +767,7 @@ msgstr "Rutas de Todos los Pares"
 msgid "One route per line in CIDR notation."
 msgstr "Una ruta por línea en notación CIDR."
 
-#: routing_templates/views.py:16 templates/base.html:154
+#: routing_templates/views.py:16 templates/template_parts/base_sidebar.html:79
 msgid "Routing Templates"
 msgstr "Plantillas de Enrutamiento"
 
@@ -899,50 +903,13 @@ msgstr "Has cerrado sesión correctamente."
 msgid "Login again"
 msgstr "Iniciar sesión de nuevo"
 
-#: templates/base.html:89 templates/cluster/workers_list.html:9
-#: templates/dns/static_host_list.html:72 vpn_invite/forms.py:78
+#: templates/cluster/workers_list.html:9 templates/dns/static_host_list.html:72
+#: templates/template_parts/base_sidebar.html:13 vpn_invite/forms.py:78
 #: vpn_invite/forms.py:79 vpn_invite/forms.py:80 vpn_invite/forms.py:81
 #: vpn_invite/forms.py:82
 msgid "Status"
 msgstr "Estado"
 
-#: templates/base.html:135 user_manager/views.py:74
-msgid "User Manager"
-msgstr "Gestión de usuarios"
-
-#: templates/base.html:163 templates/wireguard/wireguard_peer_list.html:209
-#: vpn_invite/views.py:37
-msgid "VPN Invite"
-msgstr "Invitación VPN"
-
-#: templates/base.html:250
-msgid "Update Required"
-msgstr "Actualización requerida"
-
-#: templates/base.html:252
-msgid ""
-"Your WireGuard settings have been modified. To apply these changes, please "
-"update the configuration and reload the WireGuard service."
-msgstr ""
-"Tus ajustes de WireGuard han sido modificados. Para aplicar los cambios, "
-"actualiza la configuración y recarga el servicio WireGuard."
-
-#: templates/base.html:261
-msgid "Update and restart service"
-msgstr "Actualizar y reiniciar servicio"
-
-#: templates/base.html:269
-msgid "Update and reload service"
-msgstr "Actualizar y recargar servicio"
-
-#: templates/base.html:282
-msgid "Update Available"
-msgstr "Actualización disponible"
-
-#: templates/base.html:284
-msgid "Version"
-msgstr "Versión"
-
 #: templates/cluster/workers_list.html:11
 #: templates/wireguard/wireguard_peer_list.html:77
 #: templates/wireguard/wireguard_peer_list.html:129
@@ -1461,6 +1428,43 @@ msgstr "Política predeterminada"
 msgid "Updated"
 msgstr "Actualizar"
 
+#: templates/template_parts/base_footer.html:4
+msgid "Update Available"
+msgstr "Actualización disponible"
+
+#: templates/template_parts/base_footer.html:7
+msgid "Version"
+msgstr "Versión"
+
+#: templates/template_parts/base_pending_changes_warning.html:4
+msgid "Update Required"
+msgstr "Actualización requerida"
+
+#: templates/template_parts/base_pending_changes_warning.html:6
+msgid ""
+"Your WireGuard settings have been modified. To apply these changes, please "
+"update the configuration and reload the WireGuard service."
+msgstr ""
+"Tus ajustes de WireGuard han sido modificados. Para aplicar los cambios, "
+"actualiza la configuración y recarga el servicio WireGuard."
+
+#: templates/template_parts/base_pending_changes_warning.html:15
+msgid "Update and restart service"
+msgstr "Actualizar y reiniciar servicio"
+
+#: templates/template_parts/base_pending_changes_warning.html:23
+msgid "Update and reload service"
+msgstr "Actualizar y recargar servicio"
+
+#: templates/template_parts/base_sidebar.html:59 user_manager/views.py:74
+msgid "User Manager"
+msgstr "Gestión de usuarios"
+
+#: templates/template_parts/base_sidebar.html:88
+#: templates/wireguard/wireguard_peer_list.html:209 vpn_invite/views.py:37
+msgid "VPN Invite"
+msgstr "Invitación VPN"
+
 #: templates/user_manager/list.html:9 user_manager/forms.py:20
 msgid "User Level"
 msgstr "Nivel de acceso"
@@ -1511,6 +1515,8 @@ msgid "Add Peer Group"
 msgstr "Añadir grupo de peers"
 
 #: templates/user_manager/peer_group_list.html:9
+#: templates/wireguard/server_detail.html:43
+#: templates/wireguard/server_list.html:22
 #: templates/wireguard/wireguard_status.html:48
 msgid "Peers"
 msgstr "Peers"
@@ -1579,6 +1585,56 @@ msgstr "Desvincular"
 msgid "No routing templates available for this interface."
 msgstr "No hay plantillas de enrutamiento disponibles para esta interfaz."
 
+#: templates/wireguard/server_detail.html:17
+#: templates/wireguard/wireguard_manage_peer.html:29 wireguard/forms.py:14
+#: wireguard_peer/forms.py:11
+msgid "Public Key"
+msgstr "Clave pública"
+
+#: templates/wireguard/server_detail.html:31
+#: templates/wireguard/server_list.html:20 wireguard/forms.py:16
+msgid "Listen Port"
+msgstr "Puerto"
+
+#: templates/wireguard/server_detail.html:35
+#: templates/wireguard/server_list.html:21
+#, fuzzy
+#| msgid "IP Address"
+msgid "Address"
+msgstr "Dirección IP"
+
+#: templates/wireguard/server_detail.html:50
+#, fuzzy
+#| msgid "Instance"
+msgid "Edit Instance"
+msgstr "Instancia"
+
+#: templates/wireguard/server_detail.html:53
+#, fuzzy
+#| msgid "Static Host List"
+msgid "Back to List"
+msgstr "Lista de hosts estáticos"
+
+#: templates/wireguard/server_detail.html:62
+msgid "Traffic Graph"
+msgstr ""
+
+#: templates/wireguard/server_list.html:7 wireguard/views.py:214
+#, fuzzy
+#| msgid "WireGuard Instance"
+msgid "WireGuard Instances"
+msgstr "Instancia de WireGuard"
+
+#: templates/wireguard/server_list.html:10
+msgid "Create Instance"
+msgstr "Crear instancia"
+
+#: templates/wireguard/server_list.html:61
+#, fuzzy
+#| msgid "No WireGuard Instances Found"
+msgid "No WireGuard instances found."
+msgstr "No se encontraron instancias WireGuard"
+
 #: templates/wireguard/wireguard_manage_ip.html:18
 msgid "Enter Allowed IP"
 msgstr "Ingresar IP permitida"
@@ -1606,11 +1662,6 @@ msgstr "Ingresar nombre"
 msgid "Persistent Keepalive"
 msgstr "Keepalive persistente"
 
-#: templates/wireguard/wireguard_manage_peer.html:29 wireguard/forms.py:14
-#: wireguard_peer/forms.py:11
-msgid "Public Key"
-msgstr "Clave pública"
-
 #: templates/wireguard/wireguard_manage_peer.html:36 wireguard/forms.py:13
 #: wireguard_peer/forms.py:12
 msgid "Private Key"
@@ -1730,11 +1781,7 @@ msgstr ""
 "peer se generarán sin la clave privada.\\n Debe insertarse manualmente al "
 "importar.\\n\\n ¿Deseas continuar?"
 
-#: templates/wireguard/wireguard_manage_server.html:18
-msgid "Create Instance"
-msgstr "Crear instancia"
-
-#: templates/wireguard/wireguard_manage_server.html:132
+#: templates/wireguard/wireguard_manage_server.html:120
 msgid "Delete Configuration"
 msgstr "Eliminar configuración"
 
@@ -2413,10 +2460,6 @@ msgstr "Nombre para mostrar"
 msgid "Instance ID"
 msgstr "Instancia"
 
-#: wireguard/forms.py:16
-msgid "Listen Port"
-msgstr "Puerto"
-
 #: wireguard/forms.py:17
 msgid "Internal IP Address"
 msgstr "Dirección IP interna"
@@ -2449,38 +2492,38 @@ msgstr "El rango de red seleccionado se solapa con otra instancia."
 msgid "WireGuard Status"
 msgstr "Estado de WireGuard"
 
-#: wireguard/views.py:130
+#: wireguard/views.py:131
 msgid "Update WireGuard Instance"
 msgstr "Actualizar instancia WireGuard"
 
-#: wireguard/views.py:134
+#: wireguard/views.py:135
 msgid "Delete WireGuard Instance"
 msgstr "Eliminar instancia WireGuard"
 
-#: wireguard/views.py:137
+#: wireguard/views.py:138
 msgid "Error removing instance: wg"
 msgstr "Error al eliminar instancia: wg"
 
-#: wireguard/views.py:137
+#: wireguard/views.py:138
 msgid ""
 "|Cannot delete the requested WireGuard instance. There are still peers "
 "associated with this instance."
 msgstr ""
 "|No se puede eliminar la instancia solicitada. Aún hay peers asociados."
 
-#: wireguard/views.py:140
+#: wireguard/views.py:141
 msgid "|WireGuard instance deleted: wg"
 msgstr "|Instancia WireGuard eliminada: wg"
 
-#: wireguard/views.py:143
+#: wireguard/views.py:144
 msgid "Invalid confirmation|Please confirm deletion of WireGuard instance: wg"
 msgstr "Confirmación inválida|Por favor confirma eliminación de instancia: wg"
 
-#: wireguard/views.py:147
+#: wireguard/views.py:148
 msgid "Create a new WireGuard Instance"
 msgstr "Crear nueva instancia WireGuard"
 
-#: wireguard/views.py:148
+#: wireguard/views.py:149
 msgid "New WireGuard Instance"
 msgstr "Nueva instancia WireGuard"
 
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 8913153..f9beca0 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-24 14:25-0300\n"
+"POT-Creation-Date: 2026-01-25 11:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,9 @@ msgstr ""
 #: cluster/forms.py:18 dns/forms.py:111 routing_templates/forms.py:28
 #: templates/cluster/workers_list.html:8 templates/dns/static_host_list.html:68
 #: templates/routing_templates/list.html:8
-#: templates/user_manager/peer_group_list.html:8 user_manager/forms.py:177
+#: templates/user_manager/peer_group_list.html:8
+#: templates/wireguard/server_detail.html:12
+#: templates/wireguard/server_list.html:19 user_manager/forms.py:177
 #: wireguard_peer/forms.py:10
 msgid "Name"
 msgstr "Nom"
@@ -52,6 +54,7 @@ msgid "City"
 msgstr "Ville"
 
 #: cluster/forms.py:24 dns/forms.py:65 templates/dns/static_host_list.html:17
+#: templates/wireguard/server_detail.html:39
 msgid "Hostname"
 msgstr "Nom d’hôte"
 
@@ -67,6 +70,7 @@ msgstr "Jeton"
 #: templates/wireguard/apply_route_template.html:63
 #: templates/wireguard/wireguard_manage_ip.html:42
 #: templates/wireguard/wireguard_manage_peer.html:203
+#: templates/wireguard/wireguard_manage_server.html:119
 #: templates/wireguard/wireguard_peer_list.html:168 user_manager/forms.py:49
 #: user_manager/forms.py:180 vpn_invite/forms.py:192 vpn_invite/forms.py:326
 msgid "Back"
@@ -89,7 +93,7 @@ msgstr "Supprimer"
 #: templates/firewall/manage_redirect_rule.html:84
 #: templates/wireguard/wireguard_manage_ip.html:41
 #: templates/wireguard/wireguard_manage_peer.html:201
-#: templates/wireguard/wireguard_manage_server.html:130
+#: templates/wireguard/wireguard_manage_server.html:117
 #: user_manager/forms.py:98 user_manager/forms.py:205 vpn_invite/forms.py:191
 #: vpn_invite/forms.py:325
 msgid "Save"
@@ -161,7 +165,7 @@ msgstr "La mise à jour du worker est requise."
 msgid "Access Denied"
 msgstr "Accès refusé"
 
-#: cluster/views.py:21 templates/base.html:172
+#: cluster/views.py:21 templates/template_parts/base_sidebar.html:97
 msgid "Cluster"
 msgstr "Cluster"
 
@@ -675,7 +679,7 @@ msgstr "Paramètres du pare‑feu enregistrés avec succès"
 msgid "Language"
 msgstr "Langue"
 
-#: intl_tools/forms.py:24 templates/base.html:57
+#: intl_tools/forms.py:24 templates/template_parts/base_navbar.html:14
 msgid "Change Language"
 msgstr "Changer de langue"
 
@@ -764,7 +768,7 @@ msgstr "Routes de Tous les Pairs"
 msgid "One route per line in CIDR notation."
 msgstr "Une route par ligne en notation CIDR."
 
-#: routing_templates/views.py:16 templates/base.html:154
+#: routing_templates/views.py:16 templates/template_parts/base_sidebar.html:79
 msgid "Routing Templates"
 msgstr "Modèles de Routage"
 
@@ -899,50 +903,13 @@ msgstr "Vous avez été déconnecté avec succès."
 msgid "Login again"
 msgstr "Se reconnecter"
 
-#: templates/base.html:89 templates/cluster/workers_list.html:9
-#: templates/dns/static_host_list.html:72 vpn_invite/forms.py:78
+#: templates/cluster/workers_list.html:9 templates/dns/static_host_list.html:72
+#: templates/template_parts/base_sidebar.html:13 vpn_invite/forms.py:78
 #: vpn_invite/forms.py:79 vpn_invite/forms.py:80 vpn_invite/forms.py:81
 #: vpn_invite/forms.py:82
 msgid "Status"
 msgstr "Statut"
 
-#: templates/base.html:135 user_manager/views.py:74
-msgid "User Manager"
-msgstr "Gestion des utilisateurs"
-
-#: templates/base.html:163 templates/wireguard/wireguard_peer_list.html:209
-#: vpn_invite/views.py:37
-msgid "VPN Invite"
-msgstr "Invitation VPN"
-
-#: templates/base.html:250
-msgid "Update Required"
-msgstr "Mise à jour requise"
-
-#: templates/base.html:252
-msgid ""
-"Your WireGuard settings have been modified. To apply these changes, please "
-"update the configuration and reload the WireGuard service."
-msgstr ""
-"Les paramètres WireGuard ont été modifiés. Pour appliquer ces changements, "
-"mettez à jour la configuration et rechargez le service WireGuard."
-
-#: templates/base.html:261
-msgid "Update and restart service"
-msgstr "Mettre à jour et redémarrer le service"
-
-#: templates/base.html:269
-msgid "Update and reload service"
-msgstr "Mettre à jour et recharger le service"
-
-#: templates/base.html:282
-msgid "Update Available"
-msgstr "Mise à jour disponible"
-
-#: templates/base.html:284
-msgid "Version"
-msgstr "Version"
-
 #: templates/cluster/workers_list.html:11
 #: templates/wireguard/wireguard_peer_list.html:77
 #: templates/wireguard/wireguard_peer_list.html:129
@@ -1462,6 +1429,43 @@ msgstr "Politique par défaut"
 msgid "Updated"
 msgstr "Mettre à jour"
 
+#: templates/template_parts/base_footer.html:4
+msgid "Update Available"
+msgstr "Mise à jour disponible"
+
+#: templates/template_parts/base_footer.html:7
+msgid "Version"
+msgstr "Version"
+
+#: templates/template_parts/base_pending_changes_warning.html:4
+msgid "Update Required"
+msgstr "Mise à jour requise"
+
+#: templates/template_parts/base_pending_changes_warning.html:6
+msgid ""
+"Your WireGuard settings have been modified. To apply these changes, please "
+"update the configuration and reload the WireGuard service."
+msgstr ""
+"Les paramètres WireGuard ont été modifiés. Pour appliquer ces changements, "
+"mettez à jour la configuration et rechargez le service WireGuard."
+
+#: templates/template_parts/base_pending_changes_warning.html:15
+msgid "Update and restart service"
+msgstr "Mettre à jour et redémarrer le service"
+
+#: templates/template_parts/base_pending_changes_warning.html:23
+msgid "Update and reload service"
+msgstr "Mettre à jour et recharger le service"
+
+#: templates/template_parts/base_sidebar.html:59 user_manager/views.py:74
+msgid "User Manager"
+msgstr "Gestion des utilisateurs"
+
+#: templates/template_parts/base_sidebar.html:88
+#: templates/wireguard/wireguard_peer_list.html:209 vpn_invite/views.py:37
+msgid "VPN Invite"
+msgstr "Invitation VPN"
+
 #: templates/user_manager/list.html:9 user_manager/forms.py:20
 msgid "User Level"
 msgstr "Niveau utilisateur"
@@ -1512,6 +1516,8 @@ msgid "Add Peer Group"
 msgstr "Ajouter un groupe de peers"
 
 #: templates/user_manager/peer_group_list.html:9
+#: templates/wireguard/server_detail.html:43
+#: templates/wireguard/server_list.html:22
 #: templates/wireguard/wireguard_status.html:48
 msgid "Peers"
 msgstr "Peers"
@@ -1580,6 +1586,56 @@ msgstr "Dissocier"
 msgid "No routing templates available for this interface."
 msgstr "Aucun modèle de routage disponible pour cette interface."
 
+#: templates/wireguard/server_detail.html:17
+#: templates/wireguard/wireguard_manage_peer.html:29 wireguard/forms.py:14
+#: wireguard_peer/forms.py:11
+msgid "Public Key"
+msgstr "Clé publique"
+
+#: templates/wireguard/server_detail.html:31
+#: templates/wireguard/server_list.html:20 wireguard/forms.py:16
+msgid "Listen Port"
+msgstr "Port d’écoute"
+
+#: templates/wireguard/server_detail.html:35
+#: templates/wireguard/server_list.html:21
+#, fuzzy
+#| msgid "IP Address"
+msgid "Address"
+msgstr "Adresse IP"
+
+#: templates/wireguard/server_detail.html:50
+#, fuzzy
+#| msgid "Instance"
+msgid "Edit Instance"
+msgstr "Instance"
+
+#: templates/wireguard/server_detail.html:53
+#, fuzzy
+#| msgid "Static Host List"
+msgid "Back to List"
+msgstr "Liste d’hôtes statiques"
+
+#: templates/wireguard/server_detail.html:62
+msgid "Traffic Graph"
+msgstr ""
+
+#: templates/wireguard/server_list.html:7 wireguard/views.py:214
+#, fuzzy
+#| msgid "WireGuard Instance"
+msgid "WireGuard Instances"
+msgstr "Instance WireGuard"
+
+#: templates/wireguard/server_list.html:10
+msgid "Create Instance"
+msgstr "Créer une instance"
+
+#: templates/wireguard/server_list.html:61
+#, fuzzy
+#| msgid "No WireGuard Instances Found"
+msgid "No WireGuard instances found."
+msgstr "Aucune instance WireGuard trouvée"
+
 #: templates/wireguard/wireguard_manage_ip.html:18
 msgid "Enter Allowed IP"
 msgstr "Saisir l’IP autorisée"
@@ -1607,11 +1663,6 @@ msgstr "Saisir le nom"
 msgid "Persistent Keepalive"
 msgstr "Keep‑alive persistant"
 
-#: templates/wireguard/wireguard_manage_peer.html:29 wireguard/forms.py:14
-#: wireguard_peer/forms.py:11
-msgid "Public Key"
-msgstr "Clé publique"
-
 #: templates/wireguard/wireguard_manage_peer.html:36 wireguard/forms.py:13
 #: wireguard_peer/forms.py:12
 msgid "Private Key"
@@ -1731,11 +1782,7 @@ msgstr ""
 "seront générés sans la clé privée.\\n Elle doit être insérée manuellement "
 "lors de l'importation.\\n\\n Voulez-vous continuer ?"
 
-#: templates/wireguard/wireguard_manage_server.html:18
-msgid "Create Instance"
-msgstr "Créer une instance"
-
-#: templates/wireguard/wireguard_manage_server.html:132
+#: templates/wireguard/wireguard_manage_server.html:120
 msgid "Delete Configuration"
 msgstr "Supprimer la configuration"
 
@@ -2423,10 +2470,6 @@ msgstr "Nom à afficher"
 msgid "Instance ID"
 msgstr "ID de l’instance"
 
-#: wireguard/forms.py:16
-msgid "Listen Port"
-msgstr "Port d’écoute"
-
 #: wireguard/forms.py:17
 msgid "Internal IP Address"
 msgstr "Adresse IP interne"
@@ -2461,19 +2504,19 @@ msgstr "La plage réseau sélectionnée chevauche une autre instance."
 msgid "WireGuard Status"
 msgstr "Statut WireGuard"
 
-#: wireguard/views.py:130
+#: wireguard/views.py:131
 msgid "Update WireGuard Instance"
 msgstr "Mettre à jour l’instance WireGuard"
 
-#: wireguard/views.py:134
+#: wireguard/views.py:135
 msgid "Delete WireGuard Instance"
 msgstr "Supprimer l’instance WireGuard"
 
-#: wireguard/views.py:137
+#: wireguard/views.py:138
 msgid "Error removing instance: wg"
 msgstr "Erreur lors de la suppression de l’instance: wg"
 
-#: wireguard/views.py:137
+#: wireguard/views.py:138
 msgid ""
 "|Cannot delete the requested WireGuard instance. There are still peers "
 "associated with this instance."
@@ -2481,21 +2524,21 @@ msgstr ""
 "|Impossible de supprimer l’instance WireGuard demandée ; des peers y sont "
 "encore associés."
 
-#: wireguard/views.py:140
+#: wireguard/views.py:141
 msgid "|WireGuard instance deleted: wg"
 msgstr "|Instance WireGuard supprimée: wg"
 
-#: wireguard/views.py:143
+#: wireguard/views.py:144
 msgid "Invalid confirmation|Please confirm deletion of WireGuard instance: wg"
 msgstr ""
 "Confirmation invalide | Veuillez confirmer la suppression de l’instance "
 "WireGuard: wg"
 
-#: wireguard/views.py:147
+#: wireguard/views.py:148
 msgid "Create a new WireGuard Instance"
 msgstr "Créer une nouvelle instance WireGuard"
 
-#: wireguard/views.py:148
+#: wireguard/views.py:149
 msgid "New WireGuard Instance"
 msgstr "Nouvelle instance WireGuard"
 
diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po
index ba8c6f9..d6f65bd 100644
--- a/locale/pt_BR/LC_MESSAGES/django.po
+++ b/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-24 14:25-0300\n"
+"POT-Creation-Date: 2026-01-25 11:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,9 @@ msgstr ""
 #: cluster/forms.py:18 dns/forms.py:111 routing_templates/forms.py:28
 #: templates/cluster/workers_list.html:8 templates/dns/static_host_list.html:68
 #: templates/routing_templates/list.html:8
-#: templates/user_manager/peer_group_list.html:8 user_manager/forms.py:177
+#: templates/user_manager/peer_group_list.html:8
+#: templates/wireguard/server_detail.html:12
+#: templates/wireguard/server_list.html:19 user_manager/forms.py:177
 #: wireguard_peer/forms.py:10
 msgid "Name"
 msgstr "Nome"
@@ -52,6 +54,7 @@ msgid "City"
 msgstr "Cidade"
 
 #: cluster/forms.py:24 dns/forms.py:65 templates/dns/static_host_list.html:17
+#: templates/wireguard/server_detail.html:39
 msgid "Hostname"
 msgstr "Endereço do Host"
 
@@ -67,6 +70,7 @@ msgstr "Token"
 #: templates/wireguard/apply_route_template.html:63
 #: templates/wireguard/wireguard_manage_ip.html:42
 #: templates/wireguard/wireguard_manage_peer.html:203
+#: templates/wireguard/wireguard_manage_server.html:119
 #: templates/wireguard/wireguard_peer_list.html:168 user_manager/forms.py:49
 #: user_manager/forms.py:180 vpn_invite/forms.py:192 vpn_invite/forms.py:326
 msgid "Back"
@@ -89,7 +93,7 @@ msgstr "Excluir"
 #: templates/firewall/manage_redirect_rule.html:84
 #: templates/wireguard/wireguard_manage_ip.html:41
 #: templates/wireguard/wireguard_manage_peer.html:201
-#: templates/wireguard/wireguard_manage_server.html:130
+#: templates/wireguard/wireguard_manage_server.html:117
 #: user_manager/forms.py:98 user_manager/forms.py:205 vpn_invite/forms.py:191
 #: vpn_invite/forms.py:325
 msgid "Save"
@@ -161,7 +165,7 @@ msgstr "A atualização do worker é necessária."
 msgid "Access Denied"
 msgstr "Acesso Negado"
 
-#: cluster/views.py:21 templates/base.html:172
+#: cluster/views.py:21 templates/template_parts/base_sidebar.html:97
 msgid "Cluster"
 msgstr "Cluster"
 
@@ -673,7 +677,7 @@ msgstr "Configurações de Firewall salvas com sucesso"
 msgid "Language"
 msgstr "Idioma"
 
-#: intl_tools/forms.py:24 templates/base.html:57
+#: intl_tools/forms.py:24 templates/template_parts/base_navbar.html:14
 msgid "Change Language"
 msgstr "Alterar Idioma"
 
@@ -761,7 +765,7 @@ msgstr "Rotas de Todos os Peers"
 msgid "One route per line in CIDR notation."
 msgstr "Uma rota por linha em notação CIDR."
 
-#: routing_templates/views.py:16 templates/base.html:154
+#: routing_templates/views.py:16 templates/template_parts/base_sidebar.html:79
 msgid "Routing Templates"
 msgstr "Modelos de Roteamento"
 
@@ -894,50 +898,13 @@ msgstr "Você foi desconectado com sucesso."
 msgid "Login again"
 msgstr "Acessar novamente"
 
-#: templates/base.html:89 templates/cluster/workers_list.html:9
-#: templates/dns/static_host_list.html:72 vpn_invite/forms.py:78
+#: templates/cluster/workers_list.html:9 templates/dns/static_host_list.html:72
+#: templates/template_parts/base_sidebar.html:13 vpn_invite/forms.py:78
 #: vpn_invite/forms.py:79 vpn_invite/forms.py:80 vpn_invite/forms.py:81
 #: vpn_invite/forms.py:82
 msgid "Status"
 msgstr "Estado"
 
-#: templates/base.html:135 user_manager/views.py:74
-msgid "User Manager"
-msgstr "Configurar Usuários"
-
-#: templates/base.html:163 templates/wireguard/wireguard_peer_list.html:209
-#: vpn_invite/views.py:37
-msgid "VPN Invite"
-msgstr "Convite para VPN"
-
-#: templates/base.html:250
-msgid "Update Required"
-msgstr "Atualização Necessária"
-
-#: templates/base.html:252
-msgid ""
-"Your WireGuard settings have been modified. To apply these changes, please "
-"update the configuration and reload the WireGuard service."
-msgstr ""
-"Suas configurações do WireGuard foram modificadas. Para aplicar essas "
-"mudanças, atualize a configuração e recarregue o serviço WireGuard."
-
-#: templates/base.html:261
-msgid "Update and restart service"
-msgstr "Atualizar e reiniciar o serviço"
-
-#: templates/base.html:269
-msgid "Update and reload service"
-msgstr "Atualizar e recarregar o serviço"
-
-#: templates/base.html:282
-msgid "Update Available"
-msgstr "Atualização Disponível"
-
-#: templates/base.html:284
-msgid "Version"
-msgstr "Versão"
-
 #: templates/cluster/workers_list.html:11
 #: templates/wireguard/wireguard_peer_list.html:77
 #: templates/wireguard/wireguard_peer_list.html:129
@@ -1463,6 +1430,43 @@ msgstr "Política Padrão"
 msgid "Updated"
 msgstr "Atualizar"
 
+#: templates/template_parts/base_footer.html:4
+msgid "Update Available"
+msgstr "Atualização Disponível"
+
+#: templates/template_parts/base_footer.html:7
+msgid "Version"
+msgstr "Versão"
+
+#: templates/template_parts/base_pending_changes_warning.html:4
+msgid "Update Required"
+msgstr "Atualização Necessária"
+
+#: templates/template_parts/base_pending_changes_warning.html:6
+msgid ""
+"Your WireGuard settings have been modified. To apply these changes, please "
+"update the configuration and reload the WireGuard service."
+msgstr ""
+"Suas configurações do WireGuard foram modificadas. Para aplicar essas "
+"mudanças, atualize a configuração e recarregue o serviço WireGuard."
+
+#: templates/template_parts/base_pending_changes_warning.html:15
+msgid "Update and restart service"
+msgstr "Atualizar e reiniciar o serviço"
+
+#: templates/template_parts/base_pending_changes_warning.html:23
+msgid "Update and reload service"
+msgstr "Atualizar e recarregar o serviço"
+
+#: templates/template_parts/base_sidebar.html:59 user_manager/views.py:74
+msgid "User Manager"
+msgstr "Configurar Usuários"
+
+#: templates/template_parts/base_sidebar.html:88
+#: templates/wireguard/wireguard_peer_list.html:209 vpn_invite/views.py:37
+msgid "VPN Invite"
+msgstr "Convite para VPN"
+
 #: templates/user_manager/list.html:9 user_manager/forms.py:20
 msgid "User Level"
 msgstr "Nível de Acesso"
@@ -1513,6 +1517,8 @@ msgid "Add Peer Group"
 msgstr "Adicionar Grupo de Peers"
 
 #: templates/user_manager/peer_group_list.html:9
+#: templates/wireguard/server_detail.html:43
+#: templates/wireguard/server_list.html:22
 #: templates/wireguard/wireguard_status.html:48
 msgid "Peers"
 msgstr "Peers"
@@ -1581,6 +1587,56 @@ msgstr "Desvincular"
 msgid "No routing templates available for this interface."
 msgstr "Nenhum modelo de roteamento disponível para esta interface."
 
+#: templates/wireguard/server_detail.html:17
+#: templates/wireguard/wireguard_manage_peer.html:29 wireguard/forms.py:14
+#: wireguard_peer/forms.py:11
+msgid "Public Key"
+msgstr "Chave Pública"
+
+#: templates/wireguard/server_detail.html:31
+#: templates/wireguard/server_list.html:20 wireguard/forms.py:16
+msgid "Listen Port"
+msgstr "Porta"
+
+#: templates/wireguard/server_detail.html:35
+#: templates/wireguard/server_list.html:21
+#, fuzzy
+#| msgid "IP Address"
+msgid "Address"
+msgstr "Endereço IP"
+
+#: templates/wireguard/server_detail.html:50
+#, fuzzy
+#| msgid "Instance"
+msgid "Edit Instance"
+msgstr "Instância"
+
+#: templates/wireguard/server_detail.html:53
+#, fuzzy
+#| msgid "Static Host List"
+msgid "Back to List"
+msgstr "Lista de Endereços Estáticos"
+
+#: templates/wireguard/server_detail.html:62
+msgid "Traffic Graph"
+msgstr ""
+
+#: templates/wireguard/server_list.html:7 wireguard/views.py:214
+#, fuzzy
+#| msgid "WireGuard Instance"
+msgid "WireGuard Instances"
+msgstr "Instância do WireGuard"
+
+#: templates/wireguard/server_list.html:10
+msgid "Create Instance"
+msgstr "Criar Instância"
+
+#: templates/wireguard/server_list.html:61
+#, fuzzy
+#| msgid "No WireGuard Instances Found"
+msgid "No WireGuard instances found."
+msgstr "Nenhuma Instância do WireGuard Encontrada"
+
 #: templates/wireguard/wireguard_manage_ip.html:18
 msgid "Enter Allowed IP"
 msgstr "Inserir IP Permitido"
@@ -1608,11 +1664,6 @@ msgstr "Digite um Nome"
 msgid "Persistent Keepalive"
 msgstr "Conexão Persistente"
 
-#: templates/wireguard/wireguard_manage_peer.html:29 wireguard/forms.py:14
-#: wireguard_peer/forms.py:11
-msgid "Public Key"
-msgstr "Chave Pública"
-
 #: templates/wireguard/wireguard_manage_peer.html:36 wireguard/forms.py:13
 #: wireguard_peer/forms.py:12
 msgid "Private Key"
@@ -1733,11 +1784,7 @@ msgstr ""
 "serão gerados sem a chave privada.\\n Ela deve ser inserida manualmente ao "
 "importar.\\n\\n Deseja continuar?"
 
-#: templates/wireguard/wireguard_manage_server.html:18
-msgid "Create Instance"
-msgstr "Criar Instância"
-
-#: templates/wireguard/wireguard_manage_server.html:132
+#: templates/wireguard/wireguard_manage_server.html:120
 msgid "Delete Configuration"
 msgstr "Excluir Configuração"
 
@@ -2423,10 +2470,6 @@ msgstr "Nome de Exibição"
 msgid "Instance ID"
 msgstr "Instância"
 
-#: wireguard/forms.py:16
-msgid "Listen Port"
-msgstr "Porta"
-
 #: wireguard/forms.py:17
 msgid "Internal IP Address"
 msgstr "Endereço IP Interno"
@@ -2460,19 +2503,19 @@ msgstr "A faixa de rede selecionada se sobrepõe a outra instância."
 msgid "WireGuard Status"
 msgstr "Estado do WireGuard"
 
-#: wireguard/views.py:130
+#: wireguard/views.py:131
 msgid "Update WireGuard Instance"
 msgstr "Atualizar Instância do WireGuard"
 
-#: wireguard/views.py:134
+#: wireguard/views.py:135
 msgid "Delete WireGuard Instance"
 msgstr "Excluir Instância do WireGuard"
 
-#: wireguard/views.py:137
+#: wireguard/views.py:138
 msgid "Error removing instance: wg"
 msgstr "Erro ao remover a instância: wg"
 
-#: wireguard/views.py:137
+#: wireguard/views.py:138
 msgid ""
 "|Cannot delete the requested WireGuard instance. There are still peers "
 "associated with this instance."
@@ -2480,21 +2523,21 @@ msgstr ""
 "|Não é possível excluir a instância do WireGuard solicitada. Existem peers "
 "associados a esta instância."
 
-#: wireguard/views.py:140
+#: wireguard/views.py:141
 msgid "|WireGuard instance deleted: wg"
 msgstr "|Instância do WireGuard excluída: wg"
 
-#: wireguard/views.py:143
+#: wireguard/views.py:144
 msgid "Invalid confirmation|Please confirm deletion of WireGuard instance: wg"
 msgstr ""
 "Confirmação inválida|Por favor, confirme a exclusão da instância do "
 "WireGuard: wg"
 
-#: wireguard/views.py:147
+#: wireguard/views.py:148
 msgid "Create a new WireGuard Instance"
 msgstr "Adicionar uma nova Instância do WireGuard"
 
-#: wireguard/views.py:148
+#: wireguard/views.py:149
 msgid "New WireGuard Instance"
 msgstr "Nova Instância do WireGuard"
 
diff --git a/locale/sk/LC_MESSAGES/django.po b/locale/sk/LC_MESSAGES/django.po
index 68438ee..889d73b 100644
--- a/locale/sk/LC_MESSAGES/django.po
+++ b/locale/sk/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-24 14:25-0300\n"
+"POT-Creation-Date: 2026-01-25 11:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,9 @@ msgstr ""
 #: cluster/forms.py:18 dns/forms.py:111 routing_templates/forms.py:28
 #: templates/cluster/workers_list.html:8 templates/dns/static_host_list.html:68
 #: templates/routing_templates/list.html:8
-#: templates/user_manager/peer_group_list.html:8 user_manager/forms.py:177
+#: templates/user_manager/peer_group_list.html:8
+#: templates/wireguard/server_detail.html:12
+#: templates/wireguard/server_list.html:19 user_manager/forms.py:177
 #: wireguard_peer/forms.py:10
 msgid "Name"
 msgstr "Názov"
@@ -53,6 +55,7 @@ msgid "City"
 msgstr "Mesto"
 
 #: cluster/forms.py:24 dns/forms.py:65 templates/dns/static_host_list.html:17
+#: templates/wireguard/server_detail.html:39
 msgid "Hostname"
 msgstr "Názov hostiteľa"
 
@@ -68,6 +71,7 @@ msgstr "Token"
 #: templates/wireguard/apply_route_template.html:63
 #: templates/wireguard/wireguard_manage_ip.html:42
 #: templates/wireguard/wireguard_manage_peer.html:203
+#: templates/wireguard/wireguard_manage_server.html:119
 #: templates/wireguard/wireguard_peer_list.html:168 user_manager/forms.py:49
 #: user_manager/forms.py:180 vpn_invite/forms.py:192 vpn_invite/forms.py:326
 msgid "Back"
@@ -90,7 +94,7 @@ msgstr "Vymazať"
 #: templates/firewall/manage_redirect_rule.html:84
 #: templates/wireguard/wireguard_manage_ip.html:41
 #: templates/wireguard/wireguard_manage_peer.html:201
-#: templates/wireguard/wireguard_manage_server.html:130
+#: templates/wireguard/wireguard_manage_server.html:117
 #: user_manager/forms.py:98 user_manager/forms.py:205 vpn_invite/forms.py:191
 #: vpn_invite/forms.py:325
 msgid "Save"
@@ -159,7 +163,7 @@ msgstr "Vyžaduje sa aktualizácia workera."
 msgid "Access Denied"
 msgstr "Prístup zamietnutý"
 
-#: cluster/views.py:21 templates/base.html:172
+#: cluster/views.py:21 templates/template_parts/base_sidebar.html:97
 msgid "Cluster"
 msgstr "Cluster"
 
@@ -668,7 +672,7 @@ msgstr "Nastavenia firewall boli úspešne uložené"
 msgid "Language"
 msgstr "Jazyk"
 
-#: intl_tools/forms.py:24 templates/base.html:57
+#: intl_tools/forms.py:24 templates/template_parts/base_navbar.html:14
 msgid "Change Language"
 msgstr "Zmeniť jazyk"
 
@@ -753,7 +757,7 @@ msgstr "Trasy od Všetkých Peerov"
 msgid "One route per line in CIDR notation."
 msgstr "Jedna trasa na riadok v notácii CIDR."
 
-#: routing_templates/views.py:16 templates/base.html:154
+#: routing_templates/views.py:16 templates/template_parts/base_sidebar.html:79
 msgid "Routing Templates"
 msgstr "Smerovacie Šablóny"
 
@@ -885,50 +889,13 @@ msgstr "Boli ste úspešne odhlásený."
 msgid "Login again"
 msgstr "Prihlásiť sa znovu"
 
-#: templates/base.html:89 templates/cluster/workers_list.html:9
-#: templates/dns/static_host_list.html:72 vpn_invite/forms.py:78
+#: templates/cluster/workers_list.html:9 templates/dns/static_host_list.html:72
+#: templates/template_parts/base_sidebar.html:13 vpn_invite/forms.py:78
 #: vpn_invite/forms.py:79 vpn_invite/forms.py:80 vpn_invite/forms.py:81
 #: vpn_invite/forms.py:82
 msgid "Status"
 msgstr "Stav"
 
-#: templates/base.html:135 user_manager/views.py:74
-msgid "User Manager"
-msgstr "Správa používateľov"
-
-#: templates/base.html:163 templates/wireguard/wireguard_peer_list.html:209
-#: vpn_invite/views.py:37
-msgid "VPN Invite"
-msgstr "VPN pozvánka"
-
-#: templates/base.html:250
-msgid "Update Required"
-msgstr "Aktualizácia potrebná"
-
-#: templates/base.html:252
-msgid ""
-"Your WireGuard settings have been modified. To apply these changes, please "
-"update the configuration and reload the WireGuard service."
-msgstr ""
-"Vaše WireGuard nastavenia boli zmenené. Pre aplikovanie týchto zmien, prosím "
-"aktualizujte konfiguráciu a reštartujte WireGuard službu."
-
-#: templates/base.html:261
-msgid "Update and restart service"
-msgstr "Aktualizovať a reštartovať službu"
-
-#: templates/base.html:269
-msgid "Update and reload service"
-msgstr "Aktualizovať a znovu načítať službu"
-
-#: templates/base.html:282
-msgid "Update Available"
-msgstr "Aktualizácia dostupná"
-
-#: templates/base.html:284
-msgid "Version"
-msgstr "Verzia"
-
 #: templates/cluster/workers_list.html:11
 #: templates/wireguard/wireguard_peer_list.html:77
 #: templates/wireguard/wireguard_peer_list.html:129
@@ -1451,6 +1418,43 @@ msgstr "Predvolená politika"
 msgid "Updated"
 msgstr "Aktualizovať"
 
+#: templates/template_parts/base_footer.html:4
+msgid "Update Available"
+msgstr "Aktualizácia dostupná"
+
+#: templates/template_parts/base_footer.html:7
+msgid "Version"
+msgstr "Verzia"
+
+#: templates/template_parts/base_pending_changes_warning.html:4
+msgid "Update Required"
+msgstr "Aktualizácia potrebná"
+
+#: templates/template_parts/base_pending_changes_warning.html:6
+msgid ""
+"Your WireGuard settings have been modified. To apply these changes, please "
+"update the configuration and reload the WireGuard service."
+msgstr ""
+"Vaše WireGuard nastavenia boli zmenené. Pre aplikovanie týchto zmien, prosím "
+"aktualizujte konfiguráciu a reštartujte WireGuard službu."
+
+#: templates/template_parts/base_pending_changes_warning.html:15
+msgid "Update and restart service"
+msgstr "Aktualizovať a reštartovať službu"
+
+#: templates/template_parts/base_pending_changes_warning.html:23
+msgid "Update and reload service"
+msgstr "Aktualizovať a znovu načítať službu"
+
+#: templates/template_parts/base_sidebar.html:59 user_manager/views.py:74
+msgid "User Manager"
+msgstr "Správa používateľov"
+
+#: templates/template_parts/base_sidebar.html:88
+#: templates/wireguard/wireguard_peer_list.html:209 vpn_invite/views.py:37
+msgid "VPN Invite"
+msgstr "VPN pozvánka"
+
 #: templates/user_manager/list.html:9 user_manager/forms.py:20
 msgid "User Level"
 msgstr "Úroveň používateľa"
@@ -1501,6 +1505,8 @@ msgid "Add Peer Group"
 msgstr "Pridať peer skupinu"
 
 #: templates/user_manager/peer_group_list.html:9
+#: templates/wireguard/server_detail.html:43
+#: templates/wireguard/server_list.html:22
 #: templates/wireguard/wireguard_status.html:48
 msgid "Peers"
 msgstr "Peeri"
@@ -1569,6 +1575,56 @@ msgstr "Zrušiť prepojenie"
 msgid "No routing templates available for this interface."
 msgstr "Pre toto rozhranie nie sú k dispozícii žiadne smerovacie šablóny."
 
+#: templates/wireguard/server_detail.html:17
+#: templates/wireguard/wireguard_manage_peer.html:29 wireguard/forms.py:14
+#: wireguard_peer/forms.py:11
+msgid "Public Key"
+msgstr "Verejný kľúč"
+
+#: templates/wireguard/server_detail.html:31
+#: templates/wireguard/server_list.html:20 wireguard/forms.py:16
+msgid "Listen Port"
+msgstr "Počúvací port"
+
+#: templates/wireguard/server_detail.html:35
+#: templates/wireguard/server_list.html:21
+#, fuzzy
+#| msgid "IP Address"
+msgid "Address"
+msgstr "IP adresa"
+
+#: templates/wireguard/server_detail.html:50
+#, fuzzy
+#| msgid "Instance"
+msgid "Edit Instance"
+msgstr "Inštancia"
+
+#: templates/wireguard/server_detail.html:53
+#, fuzzy
+#| msgid "Static Host List"
+msgid "Back to List"
+msgstr "Zoznam statických hostiteľov"
+
+#: templates/wireguard/server_detail.html:62
+msgid "Traffic Graph"
+msgstr ""
+
+#: templates/wireguard/server_list.html:7 wireguard/views.py:214
+#, fuzzy
+#| msgid "WireGuard Instance"
+msgid "WireGuard Instances"
+msgstr "WireGuard Inštancia"
+
+#: templates/wireguard/server_list.html:10
+msgid "Create Instance"
+msgstr "Vytvoriť inštanciu"
+
+#: templates/wireguard/server_list.html:61
+#, fuzzy
+#| msgid "No WireGuard Instances Found"
+msgid "No WireGuard instances found."
+msgstr "Nenašli sa žiadne WireGuard inštancie"
+
 #: templates/wireguard/wireguard_manage_ip.html:18
 msgid "Enter Allowed IP"
 msgstr "Zadajte povolenú IP"
@@ -1596,11 +1652,6 @@ msgstr "Zadajte názov"
 msgid "Persistent Keepalive"
 msgstr "Trvalý keepalive"
 
-#: templates/wireguard/wireguard_manage_peer.html:29 wireguard/forms.py:14
-#: wireguard_peer/forms.py:11
-msgid "Public Key"
-msgstr "Verejný kľúč"
-
 #: templates/wireguard/wireguard_manage_peer.html:36 wireguard/forms.py:13
 #: wireguard_peer/forms.py:12
 msgid "Private Key"
@@ -1720,11 +1771,7 @@ msgstr ""
 "vygenerované bez súkromného kľúča.\\n Musí byť vložený manuálne pri "
 "importovaní.\\n\\n Chcete pokračovať?"
 
-#: templates/wireguard/wireguard_manage_server.html:18
-msgid "Create Instance"
-msgstr "Vytvoriť inštanciu"
-
-#: templates/wireguard/wireguard_manage_server.html:132
+#: templates/wireguard/wireguard_manage_server.html:120
 msgid "Delete Configuration"
 msgstr "Vymazať konfiguráciu"
 
@@ -2404,10 +2451,6 @@ msgstr "Zobrazovací názov"
 msgid "Instance ID"
 msgstr "ID inštancie"
 
-#: wireguard/forms.py:16
-msgid "Listen Port"
-msgstr "Počúvací port"
-
 #: wireguard/forms.py:17
 msgid "Internal IP Address"
 msgstr "Interná IP adresa"
@@ -2440,19 +2483,19 @@ msgstr "Vybraný rozsah siete sa prekrýva s inou inštanciou."
 msgid "WireGuard Status"
 msgstr "Stav WireGuard"
 
-#: wireguard/views.py:130
+#: wireguard/views.py:131
 msgid "Update WireGuard Instance"
 msgstr "Aktualizovať WireGuard inštanciu"
 
-#: wireguard/views.py:134
+#: wireguard/views.py:135
 msgid "Delete WireGuard Instance"
 msgstr "Vymazať WireGuard inštanciu"
 
-#: wireguard/views.py:137
+#: wireguard/views.py:138
 msgid "Error removing instance: wg"
 msgstr "Chyba pri odstraňovaní inštancie: wg"
 
-#: wireguard/views.py:137
+#: wireguard/views.py:138
 msgid ""
 "|Cannot delete the requested WireGuard instance. There are still peers "
 "associated with this instance."
@@ -2460,19 +2503,19 @@ msgstr ""
 "|Nemožno vymazať požadovanú WireGuard inštanciu. Stále sú s touto inštanciou "
 "spojené peeri."
 
-#: wireguard/views.py:140
+#: wireguard/views.py:141
 msgid "|WireGuard instance deleted: wg"
 msgstr "|WireGuard inštancia vymazaná: wg"
 
-#: wireguard/views.py:143
+#: wireguard/views.py:144
 msgid "Invalid confirmation|Please confirm deletion of WireGuard instance: wg"
 msgstr "Neplatné potvrdenie|Prosím potvrďte vymazanie WireGuard inštancie: wg"
 
-#: wireguard/views.py:147
+#: wireguard/views.py:148
 msgid "Create a new WireGuard Instance"
 msgstr "Vytvoriť novú WireGuard inštanciu"
 
-#: wireguard/views.py:148
+#: wireguard/views.py:149
 msgid "New WireGuard Instance"
 msgstr "Nová WireGuard inštancia"