Client: Move a lot of errors to internal only

9 files changed, 180 insertions, 1634 deletions

diff --git a/client/locales/da/messages.gotext.json b/client/locales/da/messages.gotext.json
index ad585f0..a78cfc9 100644
--- a/client/locales/da/messages.gotext.json
+++ b/client/locales/da/messages.gotext.json
@@ -2,28 +2,8 @@
     "language": "da",
     "messages": [
         {
-            "id": "The log file with directory: '{Directory}' failed to initialize",
-            "message": "The log file with directory: '{Directory}' failed to initialize",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Directory",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "directory"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when getting the VPN expiration date",
-            "message": "The current server was not found when getting the VPN expiration date",
-            "translation": ""
-        },
-        {
-            "id": "The institute access server with URL: '{Identifier}' could not be added",
-            "message": "The institute access server with URL: '{Identifier}' could not be added",
+            "id": "Failed to add an institute access server with URL: '{Identifier}'",
+            "message": "Failed to add an institute access server with URL: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -37,8 +17,8 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be added",
+            "id": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "message": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -52,8 +32,8 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
+            "id": "Failed to add a server with URL: '{Identifier}'",
+            "message": "Failed to add a server with URL: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -67,23 +47,8 @@
             ]
         },
         {
-            "id": "input: '{Identifier}' is not a valid URL",
-            "message": "input: '{Identifier}' is not a valid URL",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "message": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
+            "id": "The input: '{Identifier}' is not a valid URL",
+            "message": "The input: '{Identifier}' is not a valid URL",
             "translation": "",
             "placeholders": [
                 {
@@ -127,8 +92,8 @@
             ]
         },
         {
-            "id": "Server: '{Identifier}' could not be connected to",
-            "message": "Server: '{Identifier}' could not be connected to",
+            "id": "Failed to connect to server: '{Identifier}'",
+            "message": "Failed to connect to server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -142,8 +107,8 @@
             ]
         },
         {
-            "id": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "id": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "message": "Failed to obtain a VPN configuration for server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -157,136 +122,13 @@
             ]
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The server: '{Identifier}' could not be removed",
-            "message": "The server: '{Identifier}' could not be removed",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved",
-            "message": "The current server could not be retrieved",
-            "translation": ""
-        },
-        {
-            "id": "Failed to set the profile ID: '{PID}'",
-            "message": "Failed to set the profile ID: '{PID}'",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "PID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pID"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when cleaning up the connection",
-            "message": "The current server was not found when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "No OAuth tokens were found when cleaning up the connection",
-            "message": "No OAuth tokens were found when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "The server was unable to be retrieved when cleaning up the connection",
-            "message": "The server was unable to be retrieved when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "Failed to cleanup the VPN connection",
-            "message": "Failed to cleanup the VPN connection",
-            "translation": ""
-        },
-        {
-            "id": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "message": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "OrgID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "orgID"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved when renewing the session",
-            "message": "The current server could not be retrieved when renewing the session",
-            "translation": ""
-        },
-        {
-            "id": "The server was unable to be retrieved when renewing the session",
-            "message": "The server was unable to be retrieved when renewing the session",
-            "translation": ""
-        },
-        {
-            "id": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "message": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Gateway",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "gateway"
-                },
-                {
-                    "id": "Mtu",
-                    "string": "%[2]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "mtu"
-                }
-            ]
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of organizations",
-            "message": "An error occurred after getting the discovery files for the list of organizations",
-            "translation": ""
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of servers",
-            "message": "An error occurred after getting the discovery files for the list of servers",
+            "id": "Failed to obtain the list of organizations",
+            "message": "Failed to obtain the list of organizations",
             "translation": ""
         },
         {
-            "id": "The VPN proxy exited",
-            "message": "The VPN proxy exited",
+            "id": "Failed to obtain the list of servers",
+            "message": "Failed to obtain the list of servers",
             "translation": ""
         },
         {
diff --git a/client/locales/de/messages.gotext.json b/client/locales/de/messages.gotext.json
index e64546b..ccf5487 100644
--- a/client/locales/de/messages.gotext.json
+++ b/client/locales/de/messages.gotext.json
@@ -2,44 +2,9 @@
     "language": "de",
     "messages": [
         {
-            "id": "The log file with directory: '{Directory}' failed to initialize",
-            "message": "The log file with directory: '{Directory}' failed to initialize",
-            "translation": "Die Log-Datei im Verzeichnis '{Directory}' konnte nicht initialisiert werden",
-            "placeholders": [
-                {
-                    "id": "Directory",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "directory"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when getting the VPN expiration date",
-            "message": "The current server was not found when getting the VPN expiration date",
-            "translation": "Der momentane Server wurde bei der Abfrage des Verfallsdatums der VPN nicht gefunden"
-        },
-        {
-            "id": "The institute access server with URL: '{Identifier}' could not be added",
-            "message": "The institute access server with URL: '{Identifier}' could not be added",
-            "translation": "Der Institutszugriffserver mit der URL '{Identifier}' konnte nicht hinzugefügt werden",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "translation": "Der sichere Internet-Server mit der Organisations-ID '{Identifier}' konnte nicht hinzugefügt werden",
+            "id": "Failed to add an institute access server with URL: '{Identifier}'",
+            "message": "Failed to add an institute access server with URL: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -52,9 +17,9 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
-            "translation": "Der benutzerdefinierte Server mit der URL '{Identifier}' konnte nicht hinzugefügt werden",
+            "id": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "message": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -67,9 +32,9 @@
             ]
         },
         {
-            "id": "input: '{Identifier}' is not a valid URL",
-            "message": "input: '{Identifier}' is not a valid URL",
-            "translation": "Eingabe: '{Identifier}' ist keine valide URL",
+            "id": "Failed to add a server with URL: '{Identifier}'",
+            "message": "Failed to add a server with URL: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -82,9 +47,9 @@
             ]
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "message": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "translation": "Serveridentifikator '{Identifier}' ist beim Abrufen der VPN-Konfiguration invalid",
+            "id": "The input: '{Identifier}' is not a valid URL",
+            "message": "The input: '{Identifier}' is not a valid URL",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -127,8 +92,8 @@
             ]
         },
         {
-            "id": "Server: '{Identifier}' could not be connected to",
-            "message": "Server: '{Identifier}' could not be connected to",
+            "id": "Failed to connect to server: '{Identifier}'",
+            "message": "Failed to connect to server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -142,39 +107,9 @@
             ]
         },
         {
-            "id": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "translation": "Es konnte keine VPN-Konfiguration für den Server '{Identifier}' gefunden werden",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "translation": "Serveridentifikator '{Identifier}' ist beim Entfernen des Servers invalid",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The server: '{Identifier}' could not be removed",
-            "message": "The server: '{Identifier}' could not be removed",
-            "translation": "Der Server '{Identifier}' konnte nicht entfernt werden",
+            "id": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "message": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -187,107 +122,14 @@
             ]
         },
         {
-            "id": "The current server could not be retrieved",
-            "message": "The current server could not be retrieved",
-            "translation": "Der momentane Server konnte nicht abgerufen werden"
-        },
-        {
-            "id": "Failed to set the profile ID: '{PID}'",
-            "message": "Failed to set the profile ID: '{PID}'",
-            "translation": "Die Profil-ID '{PID}' konnte nicht gesetzt werden",
-            "placeholders": [
-                {
-                    "id": "PID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pID"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when cleaning up the connection",
-            "message": "The current server was not found when cleaning up the connection",
-            "translation": "Der momentane Server konnte beim Aufräumen der Verbindung nicht gefunden werden"
-        },
-        {
-            "id": "No OAuth tokens were found when cleaning up the connection",
-            "message": "No OAuth tokens were found when cleaning up the connection",
-            "translation": "Keine OAuth-Tokens wurden beim Aufräumen der Verbindung gefunden"
-        },
-        {
-            "id": "The server was unable to be retrieved when cleaning up the connection",
-            "message": "The server was unable to be retrieved when cleaning up the connection",
-            "translation": "Der Server konnte beim Aufräumen der Verbindung nicht abgerufen werden"
-        },
-        {
-            "id": "Failed to cleanup the VPN connection",
-            "message": "Failed to cleanup the VPN connection",
-            "translation": "Die VPN-Verbindung konnte nicht aufgeräumt werden"
-        },
-        {
-            "id": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "message": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "translation": "Es konnte kein sicherer Internetserver mit der ID '{OrgID}' zum Setzen des Ortes abgerufen werden",
-            "placeholders": [
-                {
-                    "id": "OrgID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "orgID"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved when renewing the session",
-            "message": "The current server could not be retrieved when renewing the session",
-            "translation": "Der momentane Server konnte beim Erneuern der Sitzung nicht abgerufen werden"
-        },
-        {
-            "id": "The server was unable to be retrieved when renewing the session",
-            "message": "The server was unable to be retrieved when renewing the session",
-            "translation": "Der Server konnte beim Erneuern der Sitzung nicht abgerufen werden"
-        },
-        {
-            "id": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "message": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "translation": "Failover konnte nicht mit Gateway '{Gateway}' und MTU '{Mtu}' abgeschlossen werden",
-            "placeholders": [
-                {
-                    "id": "Gateway",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "gateway"
-                },
-                {
-                    "id": "Mtu",
-                    "string": "%[2]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "mtu"
-                }
-            ]
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of organizations",
-            "message": "An error occurred after getting the discovery files for the list of organizations",
-            "translation": "Nach dem Abfragen der Discovery-Dateien für die Organisationsliste trat ein Fehler auf"
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of servers",
-            "message": "An error occurred after getting the discovery files for the list of servers",
-            "translation": "Nach dem Abfragen der Discovery-Dateien für die Serverliste trat ein Fehler auf"
+            "id": "Failed to obtain the list of organizations",
+            "message": "Failed to obtain the list of organizations",
+            "translation": ""
         },
         {
-            "id": "The VPN proxy exited",
-            "message": "The VPN proxy exited",
-            "translation": "Die VPN-Proxy brach ab"
+            "id": "Failed to obtain the list of servers",
+            "message": "Failed to obtain the list of servers",
+            "translation": ""
         },
         {
             "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
diff --git a/client/locales/en/messages.gotext.json b/client/locales/en/messages.gotext.json
index cff7351..ce08917 100644
--- a/client/locales/en/messages.gotext.json
+++ b/client/locales/en/messages.gotext.json
@@ -2,33 +2,9 @@
     "language": "en",
     "messages": [
         {
-            "id": "The log file with directory: '{Directory}' failed to initialize",
-            "message": "The log file with directory: '{Directory}' failed to initialize",
-            "translation": "The log file with directory: '{Directory}' failed to initialize",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "Directory",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "directory"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": "The current server was not found when getting the VPN expiration date",
-            "message": "The current server was not found when getting the VPN expiration date",
-            "translation": "The current server was not found when getting the VPN expiration date",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "The institute access server with URL: '{Identifier}' could not be added",
-            "message": "The institute access server with URL: '{Identifier}' could not be added",
-            "translation": "The institute access server with URL: '{Identifier}' could not be added",
+            "id": "Failed to add an institute access server with URL: '{Identifier}'",
+            "message": "Failed to add an institute access server with URL: '{Identifier}'",
+            "translation": "Failed to add an institute access server with URL: '{Identifier}'",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -43,9 +19,9 @@
             "fuzzy": true
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "translation": "The secure internet server with organisation ID: '{Identifier}' could not be added",
+            "id": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "message": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "translation": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -60,9 +36,9 @@
             "fuzzy": true
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
-            "translation": "The custom server with URL: '{Identifier}' could not be added",
+            "id": "Failed to add a server with URL: '{Identifier}'",
+            "message": "Failed to add a server with URL: '{Identifier}'",
+            "translation": "Failed to add a server with URL: '{Identifier}'",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -77,26 +53,9 @@
             "fuzzy": true
         },
         {
-            "id": "input: '{Identifier}' is not a valid URL",
-            "message": "input: '{Identifier}' is not a valid URL",
-            "translation": "input: '{Identifier}' is not a valid URL",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "message": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "translation": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
+            "id": "The input: '{Identifier}' is not a valid URL",
+            "message": "The input: '{Identifier}' is not a valid URL",
+            "translation": "The input: '{Identifier}' is not a valid URL",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -145,9 +104,9 @@
             "fuzzy": true
         },
         {
-            "id": "Server: '{Identifier}' could not be connected to",
-            "message": "Server: '{Identifier}' could not be connected to",
-            "translation": "Server: '{Identifier}' could not be connected to",
+            "id": "Failed to connect to server: '{Identifier}'",
+            "message": "Failed to connect to server: '{Identifier}'",
+            "translation": "Failed to connect to server: '{Identifier}'",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -162,9 +121,9 @@
             "fuzzy": true
         },
         {
-            "id": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "translation": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "id": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "message": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "translation": "Failed to obtain a VPN configuration for server: '{Identifier}'",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -179,165 +138,16 @@
             "fuzzy": true
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "translation": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": "The server: '{Identifier}' could not be removed",
-            "message": "The server: '{Identifier}' could not be removed",
-            "translation": "The server: '{Identifier}' could not be removed",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": "The current server could not be retrieved",
-            "message": "The current server could not be retrieved",
-            "translation": "The current server could not be retrieved",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "Failed to set the profile ID: '{PID}'",
-            "message": "Failed to set the profile ID: '{PID}'",
-            "translation": "Failed to set the profile ID: '{PID}'",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "PID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pID"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": "The current server was not found when cleaning up the connection",
-            "message": "The current server was not found when cleaning up the connection",
-            "translation": "The current server was not found when cleaning up the connection",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "No OAuth tokens were found when cleaning up the connection",
-            "message": "No OAuth tokens were found when cleaning up the connection",
-            "translation": "No OAuth tokens were found when cleaning up the connection",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "The server was unable to be retrieved when cleaning up the connection",
-            "message": "The server was unable to be retrieved when cleaning up the connection",
-            "translation": "The server was unable to be retrieved when cleaning up the connection",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "Failed to cleanup the VPN connection",
-            "message": "Failed to cleanup the VPN connection",
-            "translation": "Failed to cleanup the VPN connection",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "message": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "translation": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "OrgID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "orgID"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": "The current server could not be retrieved when renewing the session",
-            "message": "The current server could not be retrieved when renewing the session",
-            "translation": "The current server could not be retrieved when renewing the session",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "The server was unable to be retrieved when renewing the session",
-            "message": "The server was unable to be retrieved when renewing the session",
-            "translation": "The server was unable to be retrieved when renewing the session",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "message": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "translation": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "Gateway",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "gateway"
-                },
-                {
-                    "id": "Mtu",
-                    "string": "%[2]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "mtu"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of organizations",
-            "message": "An error occurred after getting the discovery files for the list of organizations",
-            "translation": "An error occurred after getting the discovery files for the list of organizations",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of servers",
-            "message": "An error occurred after getting the discovery files for the list of servers",
-            "translation": "An error occurred after getting the discovery files for the list of servers",
+            "id": "Failed to obtain the list of organizations",
+            "message": "Failed to obtain the list of organizations",
+            "translation": "Failed to obtain the list of organizations",
             "translatorComment": "Copied from source.",
             "fuzzy": true
         },
         {
-            "id": "The VPN proxy exited",
-            "message": "The VPN proxy exited",
-            "translation": "The VPN proxy exited",
+            "id": "Failed to obtain the list of servers",
+            "message": "Failed to obtain the list of servers",
+            "translation": "Failed to obtain the list of servers",
             "translatorComment": "Copied from source.",
             "fuzzy": true
         },
diff --git a/client/locales/es/messages.gotext.json b/client/locales/es/messages.gotext.json
index 5b90446..f7d0607 100644
--- a/client/locales/es/messages.gotext.json
+++ b/client/locales/es/messages.gotext.json
@@ -2,29 +2,9 @@
     "language": "es",
     "messages": [
         {
-            "id": "The log file with directory: '{Directory}' failed to initialize",
-            "message": "The log file with directory: '{Directory}' failed to initialize",
-            "translation": "El archivo de registro con el directorio: '{Directory}' no se puede inicializar",
-            "placeholders": [
-                {
-                    "id": "Directory",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "directory"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when getting the VPN expiration date",
-            "message": "The current server was not found when getting the VPN expiration date",
-            "translation": "No se ha encontrado el servidor actual al obtener la fecha de caducidad de la VPN"
-        },
-        {
-            "id": "The institute access server with URL: '{Identifier}' could not be added",
-            "message": "The institute access server with URL: '{Identifier}' could not be added",
-            "translation": "El servidor de acceso al instituto con URL '{Identifier}' no ha podido ser añadido",
+            "id": "Failed to add an institute access server with URL: '{Identifier}'",
+            "message": "Failed to add an institute access server with URL: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -37,9 +17,9 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "translation": "El servidor seguro de Internet con ID de organización: '{Identifier}' no se ha podido añadir",
+            "id": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "message": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -52,9 +32,9 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
-            "translation": "El servidor personalizado con URL: '{Identifier}' no ha podido ser añadido",
+            "id": "Failed to add a server with URL: '{Identifier}'",
+            "message": "Failed to add a server with URL: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -67,24 +47,9 @@
             ]
         },
         {
-            "id": "input: '{Identifier}' is not a valid URL",
-            "message": "input: '{Identifier}' is not a valid URL",
-            "translation": "input: '{Identifier}' no es una URL válida",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "message": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "translation": "El identificador del servidor: '{Identifier}', no es válido al obtener una configuración VPN",
+            "id": "The input: '{Identifier}' is not a valid URL",
+            "message": "The input: '{Identifier}' is not a valid URL",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -127,9 +92,9 @@
             ]
         },
         {
-            "id": "Server: '{Identifier}' could not be connected to",
-            "message": "Server: '{Identifier}' could not be connected to",
-            "translation": "Servidor: '{Identifier}' no se ha podido conectar",
+            "id": "Failed to connect to server: '{Identifier}'",
+            "message": "Failed to connect to server: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -142,9 +107,9 @@
             ]
         },
         {
-            "id": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "translation": "No hay configuración VPN para el servidor: '{Identifier}' se ha podido obtener",
+            "id": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "message": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -157,137 +122,14 @@
             ]
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "translation": "El identificador del servidor: '{Identifier}', no es válido al eliminar el servidor",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The server: '{Identifier}' could not be removed",
-            "message": "The server: '{Identifier}' could not be removed",
-            "translation": "El servidor: '{Identifier}' no pudo ser eliminado",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved",
-            "message": "The current server could not be retrieved",
-            "translation": "No se ha podido recuperar el servidor actual"
-        },
-        {
-            "id": "Failed to set the profile ID: '{PID}'",
-            "message": "Failed to set the profile ID: '{PID}'",
-            "translation": "Error al establecer el ID del perfil: '{PID}'",
-            "placeholders": [
-                {
-                    "id": "PID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pID"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when cleaning up the connection",
-            "message": "The current server was not found when cleaning up the connection",
-            "translation": "No se ha encontrado el servidor actual al restablecer la conexión"
-        },
-        {
-            "id": "No OAuth tokens were found when cleaning up the connection",
-            "message": "No OAuth tokens were found when cleaning up the connection",
-            "translation": "No se han encontrado tokens OAuth al limpiar la conexión"
-        },
-        {
-            "id": "The server was unable to be retrieved when cleaning up the connection",
-            "message": "The server was unable to be retrieved when cleaning up the connection",
-            "translation": "No se ha podido recuperar el servidor al limpiar la conexión"
-        },
-        {
-            "id": "Failed to cleanup the VPN connection",
-            "message": "Failed to cleanup the VPN connection",
-            "translation": "Error al limpiar la conexión VPN"
-        },
-        {
-            "id": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "message": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "translation": "Error al obtener el servidor seguro de Internet con id: '{OrgID}' para establecer una ubicación",
-            "placeholders": [
-                {
-                    "id": "OrgID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "orgID"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved when renewing the session",
-            "message": "The current server could not be retrieved when renewing the session",
-            "translation": "No se ha podido recuperar el servidor actual al renovar la sesión"
-        },
-        {
-            "id": "The server was unable to be retrieved when renewing the session",
-            "message": "The server was unable to be retrieved when renewing the session",
-            "translation": "No se ha podido recuperar el servidor al renovar la sesión"
-        },
-        {
-            "id": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "message": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "translation": "Error en la conmutación por error con puerta de enlace: '{Gateway}' y MTU: '{Mtu}'",
-            "placeholders": [
-                {
-                    "id": "Gateway",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "gateway"
-                },
-                {
-                    "id": "Mtu",
-                    "string": "%[2]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "mtu"
-                }
-            ]
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of organizations",
-            "message": "An error occurred after getting the discovery files for the list of organizations",
-            "translation": "Se ha producido un error al obtener los archivos de detección de la lista de las organizaciones"
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of servers",
-            "message": "An error occurred after getting the discovery files for the list of servers",
-            "translation": "Se ha producido un error al obtener los archivos de detección de la lista de servidores"
+            "id": "Failed to obtain the list of organizations",
+            "message": "Failed to obtain the list of organizations",
+            "translation": ""
         },
         {
-            "id": "The VPN proxy exited",
-            "message": "The VPN proxy exited",
-            "translation": "Se ha desconectado del proxy VPN"
+            "id": "Failed to obtain the list of servers",
+            "message": "Failed to obtain the list of servers",
+            "translation": ""
         },
         {
             "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
@@ -323,4 +165,4 @@
             "translation": "Se ha producido un error"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/client/locales/fr/messages.gotext.json b/client/locales/fr/messages.gotext.json
index b68ec4f..7b20fe0 100644
--- a/client/locales/fr/messages.gotext.json
+++ b/client/locales/fr/messages.gotext.json
@@ -2,28 +2,8 @@
     "language": "fr",
     "messages": [
         {
-            "id": "The log file with directory: '{Directory}' failed to initialize",
-            "message": "The log file with directory: '{Directory}' failed to initialize",
-            "translation": "Le fichier de registre du répertoire : '{Directory}' n'a pas pu être initialisé",
-            "placeholders": [
-                {
-                    "id": "Directory",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "directory"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when getting the VPN expiration date",
-            "message": "The current server was not found when getting the VPN expiration date",
-            "translation": ""
-        },
-        {
-            "id": "The institute access server with URL: '{Identifier}' could not be added",
-            "message": "The institute access server with URL: '{Identifier}' could not be added",
+            "id": "Failed to add an institute access server with URL: '{Identifier}'",
+            "message": "Failed to add an institute access server with URL: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -37,24 +17,9 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "translation": "Le serveur internet sécurisé avec l'ID d'organisation : '{Identifier}' n'a pas pu être ajouté",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
-            "translation": "Le serveur personnalisé avec l'URL : '{Identifier}' n'a pas pu être ajouté",
+            "id": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "message": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -67,8 +32,8 @@
             ]
         },
         {
-            "id": "input: '{Identifier}' is not a valid URL",
-            "message": "input: '{Identifier}' is not a valid URL",
+            "id": "Failed to add a server with URL: '{Identifier}'",
+            "message": "Failed to add a server with URL: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -82,8 +47,8 @@
             ]
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "message": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
+            "id": "The input: '{Identifier}' is not a valid URL",
+            "message": "The input: '{Identifier}' is not a valid URL",
             "translation": "",
             "placeholders": [
                 {
@@ -127,8 +92,8 @@
             ]
         },
         {
-            "id": "Server: '{Identifier}' could not be connected to",
-            "message": "Server: '{Identifier}' could not be connected to",
+            "id": "Failed to connect to server: '{Identifier}'",
+            "message": "Failed to connect to server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -142,8 +107,8 @@
             ]
         },
         {
-            "id": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "id": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "message": "Failed to obtain a VPN configuration for server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -157,136 +122,13 @@
             ]
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The server: '{Identifier}' could not be removed",
-            "message": "The server: '{Identifier}' could not be removed",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved",
-            "message": "The current server could not be retrieved",
-            "translation": ""
-        },
-        {
-            "id": "Failed to set the profile ID: '{PID}'",
-            "message": "Failed to set the profile ID: '{PID}'",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "PID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pID"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when cleaning up the connection",
-            "message": "The current server was not found when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "No OAuth tokens were found when cleaning up the connection",
-            "message": "No OAuth tokens were found when cleaning up the connection",
+            "id": "Failed to obtain the list of organizations",
+            "message": "Failed to obtain the list of organizations",
             "translation": ""
         },
         {
-            "id": "The server was unable to be retrieved when cleaning up the connection",
-            "message": "The server was unable to be retrieved when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "Failed to cleanup the VPN connection",
-            "message": "Failed to cleanup the VPN connection",
-            "translation": ""
-        },
-        {
-            "id": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "message": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "OrgID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "orgID"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved when renewing the session",
-            "message": "The current server could not be retrieved when renewing the session",
-            "translation": ""
-        },
-        {
-            "id": "The server was unable to be retrieved when renewing the session",
-            "message": "The server was unable to be retrieved when renewing the session",
-            "translation": ""
-        },
-        {
-            "id": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "message": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Gateway",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "gateway"
-                },
-                {
-                    "id": "Mtu",
-                    "string": "%[2]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "mtu"
-                }
-            ]
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of organizations",
-            "message": "An error occurred after getting the discovery files for the list of organizations",
-            "translation": "Une erreur est survenue pendant la récupération des fichiers de détection de la liste des organisations"
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of servers",
-            "message": "An error occurred after getting the discovery files for the list of servers",
-            "translation": "Une erreur est survenue pendant la récupération des fichiers de détection de la liste des serveurs"
-        },
-        {
-            "id": "The VPN proxy exited",
-            "message": "The VPN proxy exited",
+            "id": "Failed to obtain the list of servers",
+            "message": "Failed to obtain the list of servers",
             "translation": ""
         },
         {
diff --git a/client/locales/it/messages.gotext.json b/client/locales/it/messages.gotext.json
index 058ba5e..37fe021 100644
--- a/client/locales/it/messages.gotext.json
+++ b/client/locales/it/messages.gotext.json
@@ -2,28 +2,8 @@
     "language": "it",
     "messages": [
         {
-            "id": "The log file with directory: '{Directory}' failed to initialize",
-            "message": "The log file with directory: '{Directory}' failed to initialize",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Directory",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "directory"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when getting the VPN expiration date",
-            "message": "The current server was not found when getting the VPN expiration date",
-            "translation": ""
-        },
-        {
-            "id": "The institute access server with URL: '{Identifier}' could not be added",
-            "message": "The institute access server with URL: '{Identifier}' could not be added",
+            "id": "Failed to add an institute access server with URL: '{Identifier}'",
+            "message": "Failed to add an institute access server with URL: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -37,8 +17,8 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be added",
+            "id": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "message": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -52,8 +32,8 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
+            "id": "Failed to add a server with URL: '{Identifier}'",
+            "message": "Failed to add a server with URL: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -67,23 +47,8 @@
             ]
         },
         {
-            "id": "input: '{Identifier}' is not a valid URL",
-            "message": "input: '{Identifier}' is not a valid URL",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "message": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
+            "id": "The input: '{Identifier}' is not a valid URL",
+            "message": "The input: '{Identifier}' is not a valid URL",
             "translation": "",
             "placeholders": [
                 {
@@ -127,8 +92,8 @@
             ]
         },
         {
-            "id": "Server: '{Identifier}' could not be connected to",
-            "message": "Server: '{Identifier}' could not be connected to",
+            "id": "Failed to connect to server: '{Identifier}'",
+            "message": "Failed to connect to server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -142,8 +107,8 @@
             ]
         },
         {
-            "id": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "id": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "message": "Failed to obtain a VPN configuration for server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -157,136 +122,13 @@
             ]
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The server: '{Identifier}' could not be removed",
-            "message": "The server: '{Identifier}' could not be removed",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved",
-            "message": "The current server could not be retrieved",
-            "translation": ""
-        },
-        {
-            "id": "Failed to set the profile ID: '{PID}'",
-            "message": "Failed to set the profile ID: '{PID}'",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "PID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pID"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when cleaning up the connection",
-            "message": "The current server was not found when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "No OAuth tokens were found when cleaning up the connection",
-            "message": "No OAuth tokens were found when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "The server was unable to be retrieved when cleaning up the connection",
-            "message": "The server was unable to be retrieved when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "Failed to cleanup the VPN connection",
-            "message": "Failed to cleanup the VPN connection",
-            "translation": ""
-        },
-        {
-            "id": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "message": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "OrgID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "orgID"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved when renewing the session",
-            "message": "The current server could not be retrieved when renewing the session",
-            "translation": ""
-        },
-        {
-            "id": "The server was unable to be retrieved when renewing the session",
-            "message": "The server was unable to be retrieved when renewing the session",
-            "translation": ""
-        },
-        {
-            "id": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "message": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Gateway",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "gateway"
-                },
-                {
-                    "id": "Mtu",
-                    "string": "%[2]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "mtu"
-                }
-            ]
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of organizations",
-            "message": "An error occurred after getting the discovery files for the list of organizations",
-            "translation": ""
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of servers",
-            "message": "An error occurred after getting the discovery files for the list of servers",
+            "id": "Failed to obtain the list of organizations",
+            "message": "Failed to obtain the list of organizations",
             "translation": ""
         },
         {
-            "id": "The VPN proxy exited",
-            "message": "The VPN proxy exited",
+            "id": "Failed to obtain the list of servers",
+            "message": "Failed to obtain the list of servers",
             "translation": ""
         },
         {
diff --git a/client/locales/nl/messages.gotext.json b/client/locales/nl/messages.gotext.json
index 04e08f0..c63beb7 100644
--- a/client/locales/nl/messages.gotext.json
+++ b/client/locales/nl/messages.gotext.json
@@ -2,29 +2,9 @@
     "language": "nl",
     "messages": [
         {
-            "id": "The log file with directory: '{Directory}' failed to initialize",
-            "message": "The log file with directory: '{Directory}' failed to initialize",
-            "translation": "Het log bestand met pad: '{Directory}' kon niet aangemaakt worden",
-            "placeholders": [
-                {
-                    "id": "Directory",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "directory"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when getting the VPN expiration date",
-            "message": "The current server was not found when getting the VPN expiration date",
-            "translation": "De huidige server was niet gevonden tijdens het ophalen van de VPN verloopdatum"
-        },
-        {
-            "id": "The institute access server with URL: '{Identifier}' could not be added",
-            "message": "The institute access server with URL: '{Identifier}' could not be added",
-            "translation": "De institute access server met URL: '{Identifier}' kan niet toegevoegd worden",
+            "id": "Failed to add an institute access server with URL: '{Identifier}'",
+            "message": "Failed to add an institute access server with URL: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -37,9 +17,9 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "translation": "De secure internet server met identiteit: '{Identifier}' kan niet toegevoegd worden",
+            "id": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "message": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -52,9 +32,9 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
-            "translation": "De server met URL: '{Identifier}' kan niet toegevoegd worden",
+            "id": "Failed to add a server with URL: '{Identifier}'",
+            "message": "Failed to add a server with URL: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -67,24 +47,9 @@
             ]
         },
         {
-            "id": "input: '{Identifier}' is not a valid URL",
-            "message": "input: '{Identifier}' is not a valid URL",
-            "translation": "het ingegeven veld: '{Identifier}' is niet een geldige URL",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "message": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "translation": "De identiteit van de server: '{Identifier}', is niet geldig tijdens het ophalen van de VPN configuratie",
+            "id": "The input: '{Identifier}' is not a valid URL",
+            "message": "The input: '{Identifier}' is not a valid URL",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -127,9 +92,9 @@
             ]
         },
         {
-            "id": "Server: '{Identifier}' could not be connected to",
-            "message": "Server: '{Identifier}' could not be connected to",
-            "translation": "Er kon geen verbinding worden gemaakt met de server: '{Identifier}'",
+            "id": "Failed to connect to server: '{Identifier}'",
+            "message": "Failed to connect to server: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -142,9 +107,9 @@
             ]
         },
         {
-            "id": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "translation": "Er kon geen VPN configuratie opgehaald worden voor de server: '{Identifier}'",
+            "id": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "message": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -157,137 +122,14 @@
             ]
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "translation": "De server: '{Identifier}' is niet geldig om verwijderd te worden",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The server: '{Identifier}' could not be removed",
-            "message": "The server: '{Identifier}' could not be removed",
-            "translation": "De server: '{Identifier}' kan niet worden verwijderd",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved",
-            "message": "The current server could not be retrieved",
-            "translation": "De huidige server kan niet worden opgehaald"
-        },
-        {
-            "id": "Failed to set the profile ID: '{PID}'",
-            "message": "Failed to set the profile ID: '{PID}'",
-            "translation": "Het profiel met identiteit: '{PID}' kan niet opgeslagen worden",
-            "placeholders": [
-                {
-                    "id": "PID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pID"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when cleaning up the connection",
-            "message": "The current server was not found when cleaning up the connection",
-            "translation": "De huidige server was niet gevonden tijdens het opschonen van de verbinding"
-        },
-        {
-            "id": "No OAuth tokens were found when cleaning up the connection",
-            "message": "No OAuth tokens were found when cleaning up the connection",
-            "translation": "Er was geen authorizatie gevonden tijdens het opschonen van de verbinding"
-        },
-        {
-            "id": "The server was unable to be retrieved when cleaning up the connection",
-            "message": "The server was unable to be retrieved when cleaning up the connection",
-            "translation": "De server kon niet opgehaald worden tijdens het opschonen van de verbinding"
-        },
-        {
-            "id": "Failed to cleanup the VPN connection",
-            "message": "Failed to cleanup the VPN connection",
-            "translation": "De VPN verbinding kon niet opgeschoond worden"
-        },
-        {
-            "id": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "message": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "translation": "De secure internet server met identiteit: '{OrgID}' kon niet opgehaald worden tijdens het bevestigen van de locatie",
-            "placeholders": [
-                {
-                    "id": "OrgID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "orgID"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved when renewing the session",
-            "message": "The current server could not be retrieved when renewing the session",
-            "translation": "De huidige server kon niet opgehaald worden tijdens het vernieuwen van de sessie"
-        },
-        {
-            "id": "The server was unable to be retrieved when renewing the session",
-            "message": "The server was unable to be retrieved when renewing the session",
-            "translation": "De server kon niet opgehaald worden tijdens het vernieuwen van de sessie"
-        },
-        {
-            "id": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "message": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "translation": "Het 'failover' proces kan niet voltooid worden. Gateway: '{Gateway}' en MTU: '{Mtu}'",
-            "placeholders": [
-                {
-                    "id": "Gateway",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "gateway"
-                },
-                {
-                    "id": "Mtu",
-                    "string": "%[2]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "mtu"
-                }
-            ]
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of organizations",
-            "message": "An error occurred after getting the discovery files for the list of organizations",
-            "translation": "Er is een fout opgetreden met het ophalen van de lijst van organisaties"
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of servers",
-            "message": "An error occurred after getting the discovery files for the list of servers",
-            "translation": "Er is een fout opgetreden met het ophalen van de lijst van servers"
+            "id": "Failed to obtain the list of organizations",
+            "message": "Failed to obtain the list of organizations",
+            "translation": ""
         },
         {
-            "id": "The VPN proxy exited",
-            "message": "The VPN proxy exited",
-            "translation": "De VPN proxy is afgesloten"
+            "id": "Failed to obtain the list of servers",
+            "message": "Failed to obtain the list of servers",
+            "translation": ""
         },
         {
             "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
@@ -323,4 +165,4 @@
             "translation": "Een interne fout is opgetreden"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/client/locales/sl/messages.gotext.json b/client/locales/sl/messages.gotext.json
index 078beba..d252291 100644
--- a/client/locales/sl/messages.gotext.json
+++ b/client/locales/sl/messages.gotext.json
@@ -2,44 +2,9 @@
     "language": "sl",
     "messages": [
         {
-            "id": "The log file with directory: '{Directory}' failed to initialize",
-            "message": "The log file with directory: '{Directory}' failed to initialize",
-            "translation": "Napaka pri vzpostavitvi datoteke dnevnika v imeniku '{Directory}'",
-            "placeholders": [
-                {
-                    "id": "Directory",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "directory"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when getting the VPN expiration date",
-            "message": "The current server was not found when getting the VPN expiration date",
-            "translation": ""
-        },
-        {
-            "id": "The institute access server with URL: '{Identifier}' could not be added",
-            "message": "The institute access server with URL: '{Identifier}' could not be added",
-            "translation": "Strežnika z naslovom '{Identifier}' za dostop do ustanove ni bilo možno dodati",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "translation": "Strežnika za varni splet organizacije z ID-jem '{Identifier}' ni bilo možno dodati",
+            "id": "Failed to add an institute access server with URL: '{Identifier}'",
+            "message": "Failed to add an institute access server with URL: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -52,9 +17,9 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
-            "translation": "Svojega strežnika z naslovom '{Identifier}' ni bilo možno dodati",
+            "id": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "message": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -67,8 +32,8 @@
             ]
         },
         {
-            "id": "input: '{Identifier}' is not a valid URL",
-            "message": "input: '{Identifier}' is not a valid URL",
+            "id": "Failed to add a server with URL: '{Identifier}'",
+            "message": "Failed to add a server with URL: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -82,8 +47,8 @@
             ]
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "message": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
+            "id": "The input: '{Identifier}' is not a valid URL",
+            "message": "The input: '{Identifier}' is not a valid URL",
             "translation": "",
             "placeholders": [
                 {
@@ -127,8 +92,8 @@
             ]
         },
         {
-            "id": "Server: '{Identifier}' could not be connected to",
-            "message": "Server: '{Identifier}' could not be connected to",
+            "id": "Failed to connect to server: '{Identifier}'",
+            "message": "Failed to connect to server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -142,8 +107,8 @@
             ]
         },
         {
-            "id": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "id": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "message": "Failed to obtain a VPN configuration for server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -157,136 +122,13 @@
             ]
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The server: '{Identifier}' could not be removed",
-            "message": "The server: '{Identifier}' could not be removed",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved",
-            "message": "The current server could not be retrieved",
-            "translation": ""
-        },
-        {
-            "id": "Failed to set the profile ID: '{PID}'",
-            "message": "Failed to set the profile ID: '{PID}'",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "PID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pID"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when cleaning up the connection",
-            "message": "The current server was not found when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "No OAuth tokens were found when cleaning up the connection",
-            "message": "No OAuth tokens were found when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "The server was unable to be retrieved when cleaning up the connection",
-            "message": "The server was unable to be retrieved when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "Failed to cleanup the VPN connection",
-            "message": "Failed to cleanup the VPN connection",
+            "id": "Failed to obtain the list of organizations",
+            "message": "Failed to obtain the list of organizations",
             "translation": ""
         },
         {
-            "id": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "message": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "OrgID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "orgID"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved when renewing the session",
-            "message": "The current server could not be retrieved when renewing the session",
-            "translation": ""
-        },
-        {
-            "id": "The server was unable to be retrieved when renewing the session",
-            "message": "The server was unable to be retrieved when renewing the session",
-            "translation": ""
-        },
-        {
-            "id": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "message": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "translation": "Preklop ni uspel s prehodom '{Gateway}' in MTU-jem '{Mtu}'",
-            "placeholders": [
-                {
-                    "id": "Gateway",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "gateway"
-                },
-                {
-                    "id": "Mtu",
-                    "string": "%[2]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "mtu"
-                }
-            ]
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of organizations",
-            "message": "An error occurred after getting the discovery files for the list of organizations",
-            "translation": "Pri nalaganju datotek kataloga organizacij je prišlo do napake"
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of servers",
-            "message": "An error occurred after getting the discovery files for the list of servers",
-            "translation": "Pri nalaganju datotek kataloga strežnikov je prišlo do napake"
-        },
-        {
-            "id": "The VPN proxy exited",
-            "message": "The VPN proxy exited",
+            "id": "Failed to obtain the list of servers",
+            "message": "Failed to obtain the list of servers",
             "translation": ""
         },
         {
diff --git a/client/locales/uk/messages.gotext.json b/client/locales/uk/messages.gotext.json
index d9e8879..0ff4668 100644
--- a/client/locales/uk/messages.gotext.json
+++ b/client/locales/uk/messages.gotext.json
@@ -2,28 +2,8 @@
     "language": "uk",
     "messages": [
         {
-            "id": "The log file with directory: '{Directory}' failed to initialize",
-            "message": "The log file with directory: '{Directory}' failed to initialize",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Directory",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "directory"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when getting the VPN expiration date",
-            "message": "The current server was not found when getting the VPN expiration date",
-            "translation": ""
-        },
-        {
-            "id": "The institute access server with URL: '{Identifier}' could not be added",
-            "message": "The institute access server with URL: '{Identifier}' could not be added",
+            "id": "Failed to add an institute access server with URL: '{Identifier}'",
+            "message": "Failed to add an institute access server with URL: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -37,8 +17,8 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be added",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be added",
+            "id": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
+            "message": "Failed to add a secure internet server with organisation ID: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -52,8 +32,8 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
+            "id": "Failed to add a server with URL: '{Identifier}'",
+            "message": "Failed to add a server with URL: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -67,23 +47,8 @@
             ]
         },
         {
-            "id": "input: '{Identifier}' is not a valid URL",
-            "message": "input: '{Identifier}' is not a valid URL",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
-            "message": "Server identifier: '{Identifier}', is not valid when getting a VPN configuration",
+            "id": "The input: '{Identifier}' is not a valid URL",
+            "message": "The input: '{Identifier}' is not a valid URL",
             "translation": "",
             "placeholders": [
                 {
@@ -127,8 +92,8 @@
             ]
         },
         {
-            "id": "Server: '{Identifier}' could not be connected to",
-            "message": "Server: '{Identifier}' could not be connected to",
+            "id": "Failed to connect to server: '{Identifier}'",
+            "message": "Failed to connect to server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -142,8 +107,8 @@
             ]
         },
         {
-            "id": "No VPN configuration for server: '{Identifier}' could be obtained",
-            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "id": "Failed to obtain a VPN configuration for server: '{Identifier}'",
+            "message": "Failed to obtain a VPN configuration for server: '{Identifier}'",
             "translation": "",
             "placeholders": [
                 {
@@ -157,136 +122,13 @@
             ]
         },
         {
-            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The server: '{Identifier}' could not be removed",
-            "message": "The server: '{Identifier}' could not be removed",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved",
-            "message": "The current server could not be retrieved",
-            "translation": ""
-        },
-        {
-            "id": "Failed to set the profile ID: '{PID}'",
-            "message": "Failed to set the profile ID: '{PID}'",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "PID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "pID"
-                }
-            ]
-        },
-        {
-            "id": "The current server was not found when cleaning up the connection",
-            "message": "The current server was not found when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "No OAuth tokens were found when cleaning up the connection",
-            "message": "No OAuth tokens were found when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "The server was unable to be retrieved when cleaning up the connection",
-            "message": "The server was unable to be retrieved when cleaning up the connection",
-            "translation": ""
-        },
-        {
-            "id": "Failed to cleanup the VPN connection",
-            "message": "Failed to cleanup the VPN connection",
-            "translation": ""
-        },
-        {
-            "id": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "message": "Failed to get the secure internet server with id: '{OrgID}' for setting a location",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "OrgID",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "orgID"
-                }
-            ]
-        },
-        {
-            "id": "The current server could not be retrieved when renewing the session",
-            "message": "The current server could not be retrieved when renewing the session",
-            "translation": ""
-        },
-        {
-            "id": "The server was unable to be retrieved when renewing the session",
-            "message": "The server was unable to be retrieved when renewing the session",
-            "translation": ""
-        },
-        {
-            "id": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "message": "Failover failed to complete with gateway: '{Gateway}' and MTU: '{Mtu}'",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Gateway",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "gateway"
-                },
-                {
-                    "id": "Mtu",
-                    "string": "%[2]d",
-                    "type": "int",
-                    "underlyingType": "int",
-                    "argNum": 2,
-                    "expr": "mtu"
-                }
-            ]
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of organizations",
-            "message": "An error occurred after getting the discovery files for the list of organizations",
-            "translation": ""
-        },
-        {
-            "id": "An error occurred after getting the discovery files for the list of servers",
-            "message": "An error occurred after getting the discovery files for the list of servers",
+            "id": "Failed to obtain the list of organizations",
+            "message": "Failed to obtain the list of organizations",
             "translation": ""
         },
         {
-            "id": "The VPN proxy exited",
-            "message": "The VPN proxy exited",
+            "id": "Failed to obtain the list of servers",
+            "message": "Failed to obtain the list of servers",
             "translation": ""
         },
         {