Translations: Sync with source code

9 files changed, 982 insertions, 1199 deletions

diff --git a/client/locales/da/messages.gotext.json b/client/locales/da/messages.gotext.json
index c45ad99..ec3f607 100644
--- a/client/locales/da/messages.gotext.json
+++ b/client/locales/da/messages.gotext.json
@@ -17,118 +17,88 @@
             ]
         },
         {
-            "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": "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 current server could not be found when getting it for expiry",
-            "message": "The current server could not be found when getting it for expiry",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The secure internet location could not be set",
-            "message": "The secure internet location could not be set",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The authorization procedure failed to complete",
-            "message": "The authorization procedure failed to complete",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
+            "id": "The custom server with URL: '{Identifier}' could not be added",
+            "message": "The custom server with URL: '{Identifier}' could not be added",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "No suitable profiles could be found",
-            "message": "No suitable profiles could be found",
-            "translation": ""
-        },
-        {
-            "id": "Profile with ID: '{PID}' could not be set",
-            "message": "Profile with ID: '{PID}' could not be set",
+            "id": "input: '{Identifier}' is not a valid URL",
+            "message": "input: '{Identifier}' is not a valid URL",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "Profile with ID: '{PID}' could not be obtained from the server",
-            "message": "Profile with ID: '{PID}' could not be obtained from the server",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The identifier that was passed to the library is incorrect",
-            "message": "The identifier that was passed to the library is incorrect",
-            "translation": ""
-        },
-        {
-            "id": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "message": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
+            "id": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
             "translation": "",
             "placeholders": [
                 {
@@ -142,8 +112,8 @@
             ]
         },
         {
-            "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": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
             "translation": "",
             "placeholders": [
                 {
@@ -157,8 +127,8 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
+            "id": "Server: '{Identifier}' could not be obtained",
+            "message": "Server: '{Identifier}' could not be obtained",
             "translation": "",
             "placeholders": [
                 {
@@ -172,8 +142,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": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
             "translation": "",
             "placeholders": [
                 {
@@ -187,8 +157,8 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
+            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
+            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
             "translation": "",
             "placeholders": [
                 {
@@ -202,18 +172,8 @@
             ]
         },
         {
-            "id": "The VPN configuration could not be obtained",
-            "message": "The VPN configuration could not be obtained",
-            "translation": ""
-        },
-        {
-            "id": "The current profile could not be found",
-            "message": "The current profile could not be found",
-            "translation": ""
-        },
-        {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
+            "id": "The server: '{Identifier}' could not be removed",
+            "message": "The server: '{Identifier}' could not be removed",
             "translation": "",
             "placeholders": [
                 {
@@ -223,88 +183,72 @@
                     "underlyingType": "string",
                     "argNum": 1,
                     "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
                 }
             ]
         },
         {
-            "id": "The operation for getting a VPN configuration was canceled",
-            "message": "The operation for getting a VPN configuration was canceled",
+            "id": "The current server could not be retrieved",
+            "message": "The current server could not be retrieved",
             "translation": ""
         },
         {
-            "id": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "message": "Failed to set the server with identifier: '{Identifier}' as the current",
+            "id": "Failed to set the profile ID: '{PID}'",
+            "message": "Failed to set the profile ID: '{PID}'",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "Identifier",
+                    "id": "PID",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "identifier"
+                    "expr": "pID"
                 }
             ]
         },
         {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
-                }
-            ]
+            "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": "Failed to get the current server to cleanup the connection",
-            "message": "Failed to get the current server to cleanup the connection",
+            "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 cleanup process was canceled",
-            "message": "The cleanup process was canceled",
+            "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 for the current server",
-            "message": "Failed to cleanup the VPN connection for the current server",
+            "id": "Failed to cleanup the VPN connection",
+            "message": "Failed to cleanup the VPN connection",
             "translation": ""
         },
         {
-            "id": "No secure internet server available to set a location for",
-            "message": "No secure internet server available to set a location for",
-            "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": "Failed to get current server for renewing the session",
-            "message": "Failed to get current server for renewing the session",
+            "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 renewing process was canceled",
-            "message": "The renewing process was canceled",
+            "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": ""
         },
         {
@@ -331,11 +275,44 @@
             ]
         },
         {
-            "id": "timeout reached",
-            "message": "timeout reached",
+            "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",
             "translation": ""
         },
         {
+            "id": "The VPN proxy exited",
+            "message": "The VPN proxy exited",
+            "translation": ""
+        },
+        {
+            "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "message": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "translation": "",
+            "placeholders": [
+                {
+                    "id": "URL",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "tErr.URL"
+                },
+                {
+                    "id": "Method",
+                    "string": "%[2]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "tErr.Method"
+                }
+            ]
+        },
+        {
             "id": "with cause:",
             "message": "with cause:",
             "translation": ""
diff --git a/client/locales/de/messages.gotext.json b/client/locales/de/messages.gotext.json
index a10da29..1296e32 100644
--- a/client/locales/de/messages.gotext.json
+++ b/client/locales/de/messages.gotext.json
@@ -17,118 +17,88 @@
             ]
         },
         {
-            "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": "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 current server could not be found when getting it for expiry",
-            "message": "The current server could not be found when getting it for expiry",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The secure internet location could not be set",
-            "message": "The secure internet location could not be set",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The authorization procedure failed to complete",
-            "message": "The authorization procedure failed to complete",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
+            "id": "The custom server with URL: '{Identifier}' could not be added",
+            "message": "The custom server with URL: '{Identifier}' could not be added",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "No suitable profiles could be found",
-            "message": "No suitable profiles could be found",
-            "translation": ""
-        },
-        {
-            "id": "Profile with ID: '{PID}' could not be set",
-            "message": "Profile with ID: '{PID}' could not be set",
+            "id": "input: '{Identifier}' is not a valid URL",
+            "message": "input: '{Identifier}' is not a valid URL",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "Profile with ID: '{PID}' could not be obtained from the server",
-            "message": "Profile with ID: '{PID}' could not be obtained from the server",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The identifier that was passed to the library is incorrect",
-            "message": "The identifier that was passed to the library is incorrect",
-            "translation": ""
-        },
-        {
-            "id": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "message": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
+            "id": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
             "translation": "",
             "placeholders": [
                 {
@@ -142,8 +112,8 @@
             ]
         },
         {
-            "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": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
             "translation": "",
             "placeholders": [
                 {
@@ -157,8 +127,8 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
+            "id": "Server: '{Identifier}' could not be obtained",
+            "message": "Server: '{Identifier}' could not be obtained",
             "translation": "",
             "placeholders": [
                 {
@@ -172,8 +142,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": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
             "translation": "",
             "placeholders": [
                 {
@@ -187,8 +157,8 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
+            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
+            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
             "translation": "",
             "placeholders": [
                 {
@@ -202,18 +172,8 @@
             ]
         },
         {
-            "id": "The VPN configuration could not be obtained",
-            "message": "The VPN configuration could not be obtained",
-            "translation": ""
-        },
-        {
-            "id": "The current profile could not be found",
-            "message": "The current profile could not be found",
-            "translation": ""
-        },
-        {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
+            "id": "The server: '{Identifier}' could not be removed",
+            "message": "The server: '{Identifier}' could not be removed",
             "translation": "",
             "placeholders": [
                 {
@@ -223,88 +183,72 @@
                     "underlyingType": "string",
                     "argNum": 1,
                     "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
                 }
             ]
         },
         {
-            "id": "The operation for getting a VPN configuration was canceled",
-            "message": "The operation for getting a VPN configuration was canceled",
+            "id": "The current server could not be retrieved",
+            "message": "The current server could not be retrieved",
             "translation": ""
         },
         {
-            "id": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "message": "Failed to set the server with identifier: '{Identifier}' as the current",
+            "id": "Failed to set the profile ID: '{PID}'",
+            "message": "Failed to set the profile ID: '{PID}'",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "Identifier",
+                    "id": "PID",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "identifier"
+                    "expr": "pID"
                 }
             ]
         },
         {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
-                }
-            ]
+            "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": "Failed to get the current server to cleanup the connection",
-            "message": "Failed to get the current server to cleanup the connection",
+            "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 cleanup process was canceled",
-            "message": "The cleanup process was canceled",
+            "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 for the current server",
-            "message": "Failed to cleanup the VPN connection for the current server",
+            "id": "Failed to cleanup the VPN connection",
+            "message": "Failed to cleanup the VPN connection",
             "translation": ""
         },
         {
-            "id": "No secure internet server available to set a location for",
-            "message": "No secure internet server available to set a location for",
-            "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": "Failed to get current server for renewing the session",
-            "message": "Failed to get current server for renewing the session",
+            "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 renewing process was canceled",
-            "message": "The renewing process was canceled",
+            "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": ""
         },
         {
@@ -331,11 +275,44 @@
             ]
         },
         {
-            "id": "timeout reached",
-            "message": "timeout reached",
+            "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",
             "translation": ""
         },
         {
+            "id": "The VPN proxy exited",
+            "message": "The VPN proxy exited",
+            "translation": ""
+        },
+        {
+            "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "message": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "translation": "",
+            "placeholders": [
+                {
+                    "id": "URL",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "tErr.URL"
+                },
+                {
+                    "id": "Method",
+                    "string": "%[2]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "tErr.Method"
+                }
+            ]
+        },
+        {
             "id": "with cause:",
             "message": "with cause:",
             "translation": ""
diff --git a/client/locales/en/messages.gotext.json b/client/locales/en/messages.gotext.json
index ab168fc..14fdd8a 100644
--- a/client/locales/en/messages.gotext.json
+++ b/client/locales/en/messages.gotext.json
@@ -19,143 +19,101 @@
             "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",
+            "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": "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",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "The current server could not be found when getting it for expiry",
-            "message": "The current server could not be found when getting it for expiry",
-            "translation": "The current server could not be found when getting it for expiry",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "translation": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
+            "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",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ],
             "fuzzy": true
         },
         {
-            "id": "The secure internet location could not be set",
-            "message": "The secure internet location could not be set",
-            "translation": "The secure internet location could not be set",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "translation": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
+            "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",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ],
             "fuzzy": true
         },
         {
-            "id": "The authorization procedure failed to complete",
-            "message": "The authorization procedure failed to complete",
-            "translation": "The authorization procedure failed to complete",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "translation": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
+            "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",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ],
             "fuzzy": true
         },
         {
-            "id": "No suitable profiles could be found",
-            "message": "No suitable profiles could be found",
-            "translation": "No suitable profiles could be found",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "Profile with ID: '{PID}' could not be set",
-            "message": "Profile with ID: '{PID}' could not be set",
-            "translation": "Profile with ID: '{PID}' could not be set",
+            "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": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ],
             "fuzzy": true
         },
         {
-            "id": "Profile with ID: '{PID}' could not be obtained from the server",
-            "message": "Profile with ID: '{PID}' could not be obtained from the server",
-            "translation": "Profile with ID: '{PID}' could not be obtained from the server",
+            "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",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ],
             "fuzzy": true
         },
         {
-            "id": "The identifier that was passed to the library is incorrect",
-            "message": "The identifier that was passed to the library is incorrect",
-            "translation": "The identifier that was passed to the library is incorrect",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "message": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "translation": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
+            "id": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "translation": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -170,9 +128,9 @@
             "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": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "translation": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -187,9 +145,9 @@
             "fuzzy": true
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "translation": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
+            "id": "Server: '{Identifier}' could not be obtained",
+            "message": "Server: '{Identifier}' could not be obtained",
+            "translation": "Server: '{Identifier}' could not be obtained",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -204,9 +162,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": "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",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -221,9 +179,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": "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": [
                 {
@@ -238,23 +196,9 @@
             "fuzzy": true
         },
         {
-            "id": "The VPN configuration could not be obtained",
-            "message": "The VPN configuration could not be obtained",
-            "translation": "The VPN configuration could not be obtained",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "The current profile could not be found",
-            "message": "The current profile could not be found",
-            "translation": "The current profile could not be found",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "translation": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
+            "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": [
                 {
@@ -264,106 +208,90 @@
                     "underlyingType": "string",
                     "argNum": 1,
                     "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
                 }
             ],
             "fuzzy": true
         },
         {
-            "id": "The operation for getting a VPN configuration was canceled",
-            "message": "The operation for getting a VPN configuration was canceled",
-            "translation": "The operation for getting a VPN configuration was canceled",
+            "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 server with identifier: '{Identifier}' as the current",
-            "message": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "translation": "Failed to set the server with identifier: '{Identifier}' as the current",
+            "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": "Identifier",
+                    "id": "PID",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "identifier"
+                    "expr": "pID"
                 }
             ],
             "fuzzy": true
         },
         {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "translation": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
+            "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.",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
-                }
-            ],
             "fuzzy": true
         },
         {
-            "id": "Failed to get the current server to cleanup the connection",
-            "message": "Failed to get the current server to cleanup the connection",
-            "translation": "Failed to get the current server to cleanup the connection",
+            "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 cleanup process was canceled",
-            "message": "The cleanup process was canceled",
-            "translation": "The cleanup process was canceled",
+            "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 for the current server",
-            "message": "Failed to cleanup the VPN connection for the current server",
-            "translation": "Failed to cleanup the VPN connection for the current server",
+            "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": "No secure internet server available to set a location for",
-            "message": "No secure internet server available to set a location for",
-            "translation": "No secure internet server available to set a location for",
+            "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": "Failed to get current server for renewing the session",
-            "message": "Failed to get current server for renewing the session",
-            "translation": "Failed to get current server for renewing the session",
+            "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 renewing process was canceled",
-            "message": "The renewing process was canceled",
-            "translation": "The renewing process was canceled",
+            "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
         },
@@ -393,10 +321,49 @@
             "fuzzy": true
         },
         {
-            "id": "timeout reached",
-            "message": "timeout reached",
-            "translation": "timeout reached",
+            "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",
+            "translatorComment": "Copied from source.",
+            "fuzzy": true
+        },
+        {
+            "id": "The VPN proxy exited",
+            "message": "The VPN proxy exited",
+            "translation": "The VPN proxy exited",
+            "translatorComment": "Copied from source.",
+            "fuzzy": true
+        },
+        {
+            "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "message": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "translation": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
             "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "URL",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "tErr.URL"
+                },
+                {
+                    "id": "Method",
+                    "string": "%[2]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "tErr.Method"
+                }
+            ],
             "fuzzy": true
         },
         {
diff --git a/client/locales/es/messages.gotext.json b/client/locales/es/messages.gotext.json
index 9711095..1f568f4 100644
--- a/client/locales/es/messages.gotext.json
+++ b/client/locales/es/messages.gotext.json
@@ -17,118 +17,88 @@
             ]
         },
         {
-            "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": "The current server could not be found when getting it for expiry",
-            "message": "The current server could not be found when getting it for expiry",
+            "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 client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The secure internet location could not be set",
-            "message": "The secure internet location could not be set",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The authorization procedure failed to complete",
-            "message": "The authorization procedure failed to complete",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
+            "id": "The custom server with URL: '{Identifier}' could not be added",
+            "message": "The custom server with URL: '{Identifier}' could not be added",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "No suitable profiles could be found",
-            "message": "No suitable profiles could be found",
-            "translation": ""
-        },
-        {
-            "id": "Profile with ID: '{PID}' could not be set",
-            "message": "Profile with ID: '{PID}' could not be set",
+            "id": "input: '{Identifier}' is not a valid URL",
+            "message": "input: '{Identifier}' is not a valid URL",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "Profile with ID: '{PID}' could not be obtained from the server",
-            "message": "Profile with ID: '{PID}' could not be obtained from the server",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The identifier that was passed to the library is incorrect",
-            "message": "The identifier that was passed to the library is incorrect",
-            "translation": ""
-        },
-        {
-            "id": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "message": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
+            "id": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
             "translation": "",
             "placeholders": [
                 {
@@ -142,8 +112,8 @@
             ]
         },
         {
-            "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": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
             "translation": "",
             "placeholders": [
                 {
@@ -157,8 +127,8 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
+            "id": "Server: '{Identifier}' could not be obtained",
+            "message": "Server: '{Identifier}' could not be obtained",
             "translation": "",
             "placeholders": [
                 {
@@ -172,8 +142,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": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
             "translation": "",
             "placeholders": [
                 {
@@ -187,8 +157,8 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
+            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
+            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
             "translation": "",
             "placeholders": [
                 {
@@ -202,18 +172,8 @@
             ]
         },
         {
-            "id": "The VPN configuration could not be obtained",
-            "message": "The VPN configuration could not be obtained",
-            "translation": ""
-        },
-        {
-            "id": "The current profile could not be found",
-            "message": "The current profile could not be found",
-            "translation": ""
-        },
-        {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
+            "id": "The server: '{Identifier}' could not be removed",
+            "message": "The server: '{Identifier}' could not be removed",
             "translation": "",
             "placeholders": [
                 {
@@ -223,88 +183,72 @@
                     "underlyingType": "string",
                     "argNum": 1,
                     "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
                 }
             ]
         },
         {
-            "id": "The operation for getting a VPN configuration was canceled",
-            "message": "The operation for getting a VPN configuration was canceled",
+            "id": "The current server could not be retrieved",
+            "message": "The current server could not be retrieved",
             "translation": ""
         },
         {
-            "id": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "message": "Failed to set the server with identifier: '{Identifier}' as the current",
+            "id": "Failed to set the profile ID: '{PID}'",
+            "message": "Failed to set the profile ID: '{PID}'",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "Identifier",
+                    "id": "PID",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "identifier"
+                    "expr": "pID"
                 }
             ]
         },
         {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
-                }
-            ]
+            "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": "Failed to get the current server to cleanup the connection",
-            "message": "Failed to get the current server to cleanup the connection",
+            "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 cleanup process was canceled",
-            "message": "The cleanup process was canceled",
+            "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 for the current server",
-            "message": "Failed to cleanup the VPN connection for the current server",
+            "id": "Failed to cleanup the VPN connection",
+            "message": "Failed to cleanup the VPN connection",
             "translation": ""
         },
         {
-            "id": "No secure internet server available to set a location for",
-            "message": "No secure internet server available to set a location for",
-            "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": "Failed to get current server for renewing the session",
-            "message": "Failed to get current server for renewing the session",
+            "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 renewing process was canceled",
-            "message": "The renewing process was canceled",
+            "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": ""
         },
         {
@@ -331,11 +275,44 @@
             ]
         },
         {
-            "id": "timeout reached",
-            "message": "timeout reached",
+            "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": "The VPN proxy exited",
+            "message": "The VPN proxy exited",
             "translation": ""
         },
         {
+            "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "message": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "translation": "",
+            "placeholders": [
+                {
+                    "id": "URL",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "tErr.URL"
+                },
+                {
+                    "id": "Method",
+                    "string": "%[2]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "tErr.Method"
+                }
+            ]
+        },
+        {
             "id": "with cause:",
             "message": "with cause:",
             "translation": ""
diff --git a/client/locales/fr/messages.gotext.json b/client/locales/fr/messages.gotext.json
index d5a2700..09fc7cd 100644
--- a/client/locales/fr/messages.gotext.json
+++ b/client/locales/fr/messages.gotext.json
@@ -17,118 +17,73 @@
             ]
         },
         {
-            "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 current server could not be found when getting it for expiry",
-            "message": "The current server could not be found when getting it for expiry",
+            "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 client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "translation": "Le client a essayé de se connecter automatiquement au serveur VPN : {Namesrv}, mais aucune localisation internet sécurisée n'a été trouvée. Veuillez vous connecter manuellement de nouveau",
-            "placeholders": [
-                {
-                    "id": "Namesrv",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "server.Name(srv)"
-                }
-            ]
-        },
-        {
-            "id": "The secure internet location could not be set",
-            "message": "The secure internet location could not be set",
-            "translation": "La localisation internet sécurisée n'a pas pu être définie"
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The authorization procedure failed to complete",
-            "message": "The authorization procedure failed to complete",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "translation": "Le client a essayé de se connecter automatiquement au serveur VPN : {Namesrv}, mais aucun profil valide n'a été trouvé. Veuillez vous connecter manuellement de nouveau",
+            "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": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "No suitable profiles could be found",
-            "message": "No suitable profiles could be found",
-            "translation": "Aucun profil adéquat n'a été trouvé"
-        },
-        {
-            "id": "Profile with ID: '{PID}' could not be set",
-            "message": "Profile with ID: '{PID}' could not be set",
-            "translation": "Le profil avec l'ID : '{PID}' n'a pas pu être défini",
+            "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é",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "Profile with ID: '{PID}' could not be obtained from the server",
-            "message": "Profile with ID: '{PID}' could not be obtained from the server",
-            "translation": "Le profil avec l'ID : '{PID}' n'a pas pu être obtenu du serveur",
+            "id": "input: '{Identifier}' is not a valid URL",
+            "message": "input: '{Identifier}' is not a valid URL",
+            "translation": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The identifier that was passed to the library is incorrect",
-            "message": "The identifier that was passed to the library is incorrect",
-            "translation": "L'identifiant envoyé à la librairie est incorrect"
-        },
-        {
-            "id": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "message": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
+            "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": "",
             "placeholders": [
                 {
@@ -142,8 +97,8 @@
             ]
         },
         {
-            "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": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
             "translation": "",
             "placeholders": [
                 {
@@ -157,8 +112,8 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
+            "id": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
             "translation": "",
             "placeholders": [
                 {
@@ -172,9 +127,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é",
+            "id": "Server: '{Identifier}' could not be obtained",
+            "message": "Server: '{Identifier}' could not be obtained",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -187,9 +142,9 @@
             ]
         },
         {
-            "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": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -202,19 +157,9 @@
             ]
         },
         {
-            "id": "The VPN configuration could not be obtained",
-            "message": "The VPN configuration could not be obtained",
-            "translation": "La configuration VPN n'a pas pu être obtenue"
-        },
-        {
-            "id": "The current profile could not be found",
-            "message": "The current profile could not be found",
-            "translation": "Le profil actuel n'a pas été trouvé"
-        },
-        {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "translation": "L'identifiant : '{Identifier}' du serveur avec le type : '{Type}' n'est pas valide",
+            "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",
@@ -223,25 +168,12 @@
                     "underlyingType": "string",
                     "argNum": 1,
                     "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
                 }
             ]
         },
         {
-            "id": "The operation for getting a VPN configuration was canceled",
-            "message": "The operation for getting a VPN configuration was canceled",
-            "translation": ""
-        },
-        {
-            "id": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "message": "Failed to set the server with identifier: '{Identifier}' as the current",
+            "id": "The server: '{Identifier}' could not be removed",
+            "message": "The server: '{Identifier}' could not be removed",
             "translation": "",
             "placeholders": [
                 {
@@ -255,56 +187,68 @@
             ]
         },
         {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
+            "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": "Identifier",
+                    "id": "PID",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
+                    "expr": "pID"
                 }
             ]
         },
         {
-            "id": "Failed to get the current server to cleanup the connection",
-            "message": "Failed to get the current server to cleanup the connection",
+            "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": "The cleanup process was canceled",
-            "message": "The cleanup process was canceled",
+            "id": "No OAuth tokens were found when cleaning up the connection",
+            "message": "No OAuth tokens were found when cleaning up the connection",
             "translation": ""
         },
         {
-            "id": "Failed to cleanup the VPN connection for the current server",
-            "message": "Failed to cleanup the VPN connection for the current server",
+            "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": "No secure internet server available to set a location for",
-            "message": "No secure internet server available to set a location for",
+            "id": "Failed to cleanup the VPN connection",
+            "message": "Failed to cleanup the VPN connection",
             "translation": ""
         },
         {
-            "id": "Failed to get current server for renewing the session",
-            "message": "Failed to get current server for renewing the session",
+            "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 renewing process was canceled",
-            "message": "The renewing process was canceled",
+            "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": ""
         },
         {
@@ -331,11 +275,44 @@
             ]
         },
         {
-            "id": "timeout reached",
-            "message": "timeout reached",
+            "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",
             "translation": ""
         },
         {
+            "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "message": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "translation": "",
+            "placeholders": [
+                {
+                    "id": "URL",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "tErr.URL"
+                },
+                {
+                    "id": "Method",
+                    "string": "%[2]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "tErr.Method"
+                }
+            ]
+        },
+        {
             "id": "with cause:",
             "message": "with cause:",
             "translation": ""
diff --git a/client/locales/it/messages.gotext.json b/client/locales/it/messages.gotext.json
index 474035b..0dd39e6 100644
--- a/client/locales/it/messages.gotext.json
+++ b/client/locales/it/messages.gotext.json
@@ -17,118 +17,88 @@
             ]
         },
         {
-            "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": "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 current server could not be found when getting it for expiry",
-            "message": "The current server could not be found when getting it for expiry",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The secure internet location could not be set",
-            "message": "The secure internet location could not be set",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The authorization procedure failed to complete",
-            "message": "The authorization procedure failed to complete",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
+            "id": "The custom server with URL: '{Identifier}' could not be added",
+            "message": "The custom server with URL: '{Identifier}' could not be added",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "No suitable profiles could be found",
-            "message": "No suitable profiles could be found",
-            "translation": ""
-        },
-        {
-            "id": "Profile with ID: '{PID}' could not be set",
-            "message": "Profile with ID: '{PID}' could not be set",
+            "id": "input: '{Identifier}' is not a valid URL",
+            "message": "input: '{Identifier}' is not a valid URL",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "Profile with ID: '{PID}' could not be obtained from the server",
-            "message": "Profile with ID: '{PID}' could not be obtained from the server",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The identifier that was passed to the library is incorrect",
-            "message": "The identifier that was passed to the library is incorrect",
-            "translation": ""
-        },
-        {
-            "id": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "message": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
+            "id": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
             "translation": "",
             "placeholders": [
                 {
@@ -142,8 +112,8 @@
             ]
         },
         {
-            "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": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
             "translation": "",
             "placeholders": [
                 {
@@ -157,8 +127,8 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
+            "id": "Server: '{Identifier}' could not be obtained",
+            "message": "Server: '{Identifier}' could not be obtained",
             "translation": "",
             "placeholders": [
                 {
@@ -172,8 +142,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": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
             "translation": "",
             "placeholders": [
                 {
@@ -187,8 +157,8 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
+            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
+            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
             "translation": "",
             "placeholders": [
                 {
@@ -202,18 +172,8 @@
             ]
         },
         {
-            "id": "The VPN configuration could not be obtained",
-            "message": "The VPN configuration could not be obtained",
-            "translation": ""
-        },
-        {
-            "id": "The current profile could not be found",
-            "message": "The current profile could not be found",
-            "translation": ""
-        },
-        {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
+            "id": "The server: '{Identifier}' could not be removed",
+            "message": "The server: '{Identifier}' could not be removed",
             "translation": "",
             "placeholders": [
                 {
@@ -223,88 +183,72 @@
                     "underlyingType": "string",
                     "argNum": 1,
                     "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
                 }
             ]
         },
         {
-            "id": "The operation for getting a VPN configuration was canceled",
-            "message": "The operation for getting a VPN configuration was canceled",
+            "id": "The current server could not be retrieved",
+            "message": "The current server could not be retrieved",
             "translation": ""
         },
         {
-            "id": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "message": "Failed to set the server with identifier: '{Identifier}' as the current",
+            "id": "Failed to set the profile ID: '{PID}'",
+            "message": "Failed to set the profile ID: '{PID}'",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "Identifier",
+                    "id": "PID",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "identifier"
+                    "expr": "pID"
                 }
             ]
         },
         {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
-                }
-            ]
+            "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": "Failed to get the current server to cleanup the connection",
-            "message": "Failed to get the current server to cleanup the connection",
+            "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 cleanup process was canceled",
-            "message": "The cleanup process was canceled",
+            "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 for the current server",
-            "message": "Failed to cleanup the VPN connection for the current server",
+            "id": "Failed to cleanup the VPN connection",
+            "message": "Failed to cleanup the VPN connection",
             "translation": ""
         },
         {
-            "id": "No secure internet server available to set a location for",
-            "message": "No secure internet server available to set a location for",
-            "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": "Failed to get current server for renewing the session",
-            "message": "Failed to get current server for renewing the session",
+            "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 renewing process was canceled",
-            "message": "The renewing process was canceled",
+            "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": ""
         },
         {
@@ -331,11 +275,44 @@
             ]
         },
         {
-            "id": "timeout reached",
-            "message": "timeout reached",
+            "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",
             "translation": ""
         },
         {
+            "id": "The VPN proxy exited",
+            "message": "The VPN proxy exited",
+            "translation": ""
+        },
+        {
+            "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "message": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "translation": "",
+            "placeholders": [
+                {
+                    "id": "URL",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "tErr.URL"
+                },
+                {
+                    "id": "Method",
+                    "string": "%[2]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "tErr.Method"
+                }
+            ]
+        },
+        {
             "id": "with cause:",
             "message": "with cause:",
             "translation": ""
diff --git a/client/locales/nl/messages.gotext.json b/client/locales/nl/messages.gotext.json
index 21a53a5..0d94d5a 100644
--- a/client/locales/nl/messages.gotext.json
+++ b/client/locales/nl/messages.gotext.json
@@ -17,119 +17,89 @@
             ]
         },
         {
-            "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": "The current server could not be found when getting it for expiry",
-            "message": "The current server could not be found when getting it for expiry",
-            "translation": "De huidige VPN server kon niet worden gevonden"
+            "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 client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "translation": "De client wilde automatisch verbinden met VPN server: {Namesrv}, maar de huidige locatie is niet gevonden. U moet opnieuw handmatig verbinden",
+            "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",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The secure internet location could not be set",
-            "message": "The secure internet location could not be set",
-            "translation": "De locatie voor de secure internet server kon niet opgeslagen"
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "translation": "De client wilde automatisch verbinden met VPN server: {Namesrv}, maar authorizatie is nodig. U moet handmatig opnieuw verbinden",
+            "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",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The authorization procedure failed to complete",
-            "message": "The authorization procedure failed to complete",
-            "translation": "Het authorizatie proces kon niet voltooid worden"
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "translation": "De client wilde automatisch verbinden met VPN server: {Namesrv}, maar er was geen geldig profiel gevinden. U moet handmatig opnieuw verbinden",
+            "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",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "No suitable profiles could be found",
-            "message": "No suitable profiles could be found",
-            "translation": "Er zijn geen profielen gevonden om mee te verbinden"
-        },
-        {
-            "id": "Profile with ID: '{PID}' could not be set",
-            "message": "Profile with ID: '{PID}' could not be set",
-            "translation": "Het profiel met identiteit: '{PID}' kon niet opgeslagen worden",
+            "id": "input: '{Identifier}' is not a valid URL",
+            "message": "input: '{Identifier}' is not a valid URL",
+            "translation": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "Profile with ID: '{PID}' could not be obtained from the server",
-            "message": "Profile with ID: '{PID}' could not be obtained from the server",
-            "translation": "Het profiel met identiteit: '{PID}' kon niet opgehaald worden van de server",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The identifier that was passed to the library is incorrect",
-            "message": "The identifier that was passed to the library is incorrect",
-            "translation": "De identiteit die aan de library werd gegeven is niet correct"
-        },
-        {
-            "id": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "message": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "translation": "De institute access server met URL: '{Identifier}' kan niet opgehaald worden van discovery",
+            "id": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -142,9 +112,9 @@
             ]
         },
         {
-            "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": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -157,9 +127,9 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "translation": "De secure internet server met identiteit: '{Identifier}' kan niet opgehaald worden van discovery",
+            "id": "Server: '{Identifier}' could not be obtained",
+            "message": "Server: '{Identifier}' could not be obtained",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -172,9 +142,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": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -187,9 +157,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": "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",
@@ -202,19 +172,9 @@
             ]
         },
         {
-            "id": "The VPN configuration could not be obtained",
-            "message": "The VPN configuration could not be obtained",
-            "translation": "De VPN configuratie kan niet opgehaald worden"
-        },
-        {
-            "id": "The current profile could not be found",
-            "message": "The current profile could not be found",
-            "translation": "Het huidig profiel kan niet gevonden worden"
-        },
-        {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "translation": "De identiteit: '{Identifier}' voor server met type: '{Type}' is niet geldig",
+            "id": "The server: '{Identifier}' could not be removed",
+            "message": "The server: '{Identifier}' could not be removed",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -223,89 +183,73 @@
                     "underlyingType": "string",
                     "argNum": 1,
                     "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
                 }
             ]
         },
         {
-            "id": "The operation for getting a VPN configuration was canceled",
-            "message": "The operation for getting a VPN configuration was canceled",
-            "translation": "De procedure om een VPN configuratie op te halen is verbroken"
+            "id": "The current server could not be retrieved",
+            "message": "The current server could not be retrieved",
+            "translation": ""
         },
         {
-            "id": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "message": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "translation": "De server met identiteit: '{Identifier}' kan niet als de hudige server gezet worden",
+            "id": "Failed to set the profile ID: '{PID}'",
+            "message": "Failed to set the profile ID: '{PID}'",
+            "translation": "",
             "placeholders": [
                 {
-                    "id": "Identifier",
+                    "id": "PID",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "identifier"
+                    "expr": "pID"
                 }
             ]
         },
         {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "translation": "Identiteit: '{Identifier}' voor server met type: '{Type}' is niet geldig om verwijderd te worden",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
-                }
-            ]
+            "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": "Failed to get the current server to cleanup the connection",
-            "message": "Failed to get the current server to cleanup the connection",
-            "translation": "De huidige server kan niet opgehaald worden om de connectie te verwijderen"
+            "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 cleanup process was canceled",
-            "message": "The cleanup process was canceled",
-            "translation": "De opschoon procedure was afgebroken"
+            "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 for the current server",
-            "message": "Failed to cleanup the VPN connection for the current server",
-            "translation": "De VPN connectie is niet volledig opgeruimd"
+            "id": "Failed to cleanup the VPN connection",
+            "message": "Failed to cleanup the VPN connection",
+            "translation": ""
         },
         {
-            "id": "No secure internet server available to set a location for",
-            "message": "No secure internet server available to set a location for",
-            "translation": "Er is geen \"secure internet\" server beschikbaar om de locatie voor in te stellen"
+            "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": "Failed to get current server for renewing the session",
-            "message": "Failed to get current server for renewing the session",
-            "translation": "De huidige server kan niet opgehaald worden om de sessie te hernieuwen"
+            "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 renewing process was canceled",
-            "message": "The renewing process was canceled",
-            "translation": "De hernieuw procedure was afgebroken"
+            "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}'",
@@ -331,9 +275,42 @@
             ]
         },
         {
-            "id": "timeout reached",
-            "message": "timeout reached",
-            "translation": "Er is een time-out opgetreden in de verbinding. Controleer uw internetverbinding"
+            "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": "The VPN proxy exited",
+            "message": "The VPN proxy exited",
+            "translation": ""
+        },
+        {
+            "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "message": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "translation": "",
+            "placeholders": [
+                {
+                    "id": "URL",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "tErr.URL"
+                },
+                {
+                    "id": "Method",
+                    "string": "%[2]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "tErr.Method"
+                }
+            ]
         },
         {
             "id": "with cause:",
@@ -346,4 +323,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 51eba1d..c1a229c 100644
--- a/client/locales/sl/messages.gotext.json
+++ b/client/locales/sl/messages.gotext.json
@@ -17,119 +17,89 @@
             ]
         },
         {
-            "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 current server could not be found when getting it for expiry",
-            "message": "The current server could not be found when getting it for expiry",
-            "translation": "Ugotavljanje preteka ne more določiti izbranega strežnika"
+            "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 client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "translation": "Odjemalec je poskusil samodejno vzpostaviti povezavo s strežnikom VPN {Namesrv}, vendar ni našel nobene lokacije za varni splet. Ponovno vzpostavite povezavo ročno",
+            "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": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The secure internet location could not be set",
-            "message": "The secure internet location could not be set",
-            "translation": "Napaka pri nastavljanju lokacije za varni splet"
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "translation": "Odjemalec je poskusil samodejno vzpostaviti povezavo s strežnikom VPN {Namesrv}, vendar ga morate ponovno avtorizirati. Ponovno vzpostavite povezavo ročno",
+            "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",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The authorization procedure failed to complete",
-            "message": "The authorization procedure failed to complete",
-            "translation": "Napaka pri postopku avtorizacije"
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "translation": "Odjemalec je poskusil samodejno vzpostaviti povezavo s strežnikom VPN {Namesrv}, vendar ni našel nobenega veljavnega profila. Ponovno vzpostavite povezavo ročno",
+            "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",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "No suitable profiles could be found",
-            "message": "No suitable profiles could be found",
-            "translation": "Ustreznih profilov ni bilo mogoče najti"
-        },
-        {
-            "id": "Profile with ID: '{PID}' could not be set",
-            "message": "Profile with ID: '{PID}' could not be set",
-            "translation": "Profila z ID-jem '{PID}' ni bilo mogoče nastaviti",
+            "id": "input: '{Identifier}' is not a valid URL",
+            "message": "input: '{Identifier}' is not a valid URL",
+            "translation": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "Profile with ID: '{PID}' could not be obtained from the server",
-            "message": "Profile with ID: '{PID}' could not be obtained from the server",
-            "translation": "Profila z ID-jem '{PID}' ni bilo mogoče naložiti s strežnika",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The identifier that was passed to the library is incorrect",
-            "message": "The identifier that was passed to the library is incorrect",
-            "translation": "ID poslan knjižnici je napačen"
-        },
-        {
-            "id": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "message": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "translation": "Strežnika z naslovom URL '{Identifier}' za dostop do ustanove ni bilo možno najti v katalogu",
+            "id": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -142,9 +112,9 @@
             ]
         },
         {
-            "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",
+            "id": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -157,9 +127,9 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "translation": "Strežnika za varni splet organizacije z ID-jem '{Identifier}' ni bilo možno najti v katalogu",
+            "id": "Server: '{Identifier}' could not be obtained",
+            "message": "Server: '{Identifier}' could not be obtained",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -172,9 +142,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": "Strežnika za varni splet organizacije z ID-jem '{Identifier}' ni bilo možno dodati",
+            "id": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -187,9 +157,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": "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",
@@ -202,19 +172,9 @@
             ]
         },
         {
-            "id": "The VPN configuration could not be obtained",
-            "message": "The VPN configuration could not be obtained",
-            "translation": "Napaka pri prenosu nastavitev VPN"
-        },
-        {
-            "id": "The current profile could not be found",
-            "message": "The current profile could not be found",
-            "translation": "Izbranega profila ni bilo mogoče najti"
-        },
-        {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "translation": "ID '{Identifier}' za strežnik vrste '{Type}' ni veljaven",
+            "id": "The server: '{Identifier}' could not be removed",
+            "message": "The server: '{Identifier}' could not be removed",
+            "translation": "",
             "placeholders": [
                 {
                     "id": "Identifier",
@@ -223,88 +183,72 @@
                     "underlyingType": "string",
                     "argNum": 1,
                     "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
                 }
             ]
         },
         {
-            "id": "The operation for getting a VPN configuration was canceled",
-            "message": "The operation for getting a VPN configuration was canceled",
-            "translation": "Operacija za nalaganje nastavitev VPN je bila preklicana"
+            "id": "The current server could not be retrieved",
+            "message": "The current server could not be retrieved",
+            "translation": ""
         },
         {
-            "id": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "message": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "translation": "Napaka pri izbiri strežnika z ID-jem '{Identifier}'",
+            "id": "Failed to set the profile ID: '{PID}'",
+            "message": "Failed to set the profile ID: '{PID}'",
+            "translation": "",
             "placeholders": [
                 {
-                    "id": "Identifier",
+                    "id": "PID",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "identifier"
+                    "expr": "pID"
                 }
             ]
         },
         {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "translation": "ID '{Identifier}' strežnika vrste '{Type}' ni veljaven za odstranitev",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
-                }
-            ]
+            "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": "Failed to get the current server to cleanup the connection",
-            "message": "Failed to get the current server to cleanup the connection",
-            "translation": "Napaka pri določanju izbranega strežnika za čiščenje povezave"
+            "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 cleanup process was canceled",
-            "message": "The cleanup process was canceled",
+            "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 for the current server",
-            "message": "Failed to cleanup the VPN connection for the current server",
-            "translation": "Napaka pri čiščenju povezave VPN za izbrani strežnik"
+            "id": "Failed to cleanup the VPN connection",
+            "message": "Failed to cleanup the VPN connection",
+            "translation": ""
         },
         {
-            "id": "No secure internet server available to set a location for",
-            "message": "No secure internet server available to set a location for",
-            "translation": "Za izbiro lokacije ni na voljo nobenega strežnika za varni splet"
+            "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": "Failed to get current server for renewing the session",
-            "message": "Failed to get current server for renewing the session",
-            "translation": "Napaka pri ugotavljanju izbranega strežnika za podaljšanje seje"
+            "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 renewing process was canceled",
-            "message": "The renewing process was canceled",
+            "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": ""
         },
         {
@@ -331,9 +275,42 @@
             ]
         },
         {
-            "id": "timeout reached",
-            "message": "timeout reached",
-            "translation": "čas je potekel"
+            "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",
+            "translation": ""
+        },
+        {
+            "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "message": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "translation": "",
+            "placeholders": [
+                {
+                    "id": "URL",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "tErr.URL"
+                },
+                {
+                    "id": "Method",
+                    "string": "%[2]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "tErr.Method"
+                }
+            ]
         },
         {
             "id": "with cause:",
diff --git a/client/locales/uk/messages.gotext.json b/client/locales/uk/messages.gotext.json
index 93ab6af..5b48869 100644
--- a/client/locales/uk/messages.gotext.json
+++ b/client/locales/uk/messages.gotext.json
@@ -17,118 +17,88 @@
             ]
         },
         {
-            "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": "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 current server could not be found when getting it for expiry",
-            "message": "The current server could not be found when getting it for expiry",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no secure internet location is found. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The secure internet location could not be set",
-            "message": "The secure internet location could not be set",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but you need to authorizate again. Please manually connect again",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The authorization procedure failed to complete",
-            "message": "The authorization procedure failed to complete",
-            "translation": ""
-        },
-        {
-            "id": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
-            "message": "The client tried to autoconnect to the VPN server: {Namesrv}, but no valid profiles were found. Please manually connect again",
+            "id": "The custom server with URL: '{Identifier}' could not be added",
+            "message": "The custom server with URL: '{Identifier}' could not be added",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "Namesrv",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "server.Name(srv)"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "No suitable profiles could be found",
-            "message": "No suitable profiles could be found",
-            "translation": ""
-        },
-        {
-            "id": "Profile with ID: '{PID}' could not be set",
-            "message": "Profile with ID: '{PID}' could not be set",
+            "id": "input: '{Identifier}' is not a valid URL",
+            "message": "input: '{Identifier}' is not a valid URL",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "Profile with ID: '{PID}' could not be obtained from the server",
-            "message": "Profile with ID: '{PID}' could not be obtained from the server",
+            "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": "",
             "placeholders": [
                 {
-                    "id": "PID",
+                    "id": "Identifier",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "pID"
+                    "expr": "identifier"
                 }
             ]
         },
         {
-            "id": "The identifier that was passed to the library is incorrect",
-            "message": "The identifier that was passed to the library is incorrect",
-            "translation": ""
-        },
-        {
-            "id": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
-            "message": "Could not retrieve institute access server with URL: '{Identifier}' from discovery",
+            "id": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but you need to authorizate again. Please manually connect again",
             "translation": "",
             "placeholders": [
                 {
@@ -142,8 +112,8 @@
             ]
         },
         {
-            "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": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
+            "message": "The client tried to autoconnect to the VPN server: '{Identifier}', but the operation failed to complete",
             "translation": "",
             "placeholders": [
                 {
@@ -157,8 +127,8 @@
             ]
         },
         {
-            "id": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
-            "message": "The secure internet server with organisation ID: '{Identifier}' could not be retrieved from discovery",
+            "id": "Server: '{Identifier}' could not be obtained",
+            "message": "Server: '{Identifier}' could not be obtained",
             "translation": "",
             "placeholders": [
                 {
@@ -172,8 +142,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": "No VPN configuration for server: '{Identifier}' could be obtained",
+            "message": "No VPN configuration for server: '{Identifier}' could be obtained",
             "translation": "",
             "placeholders": [
                 {
@@ -187,8 +157,8 @@
             ]
         },
         {
-            "id": "The custom server with URL: '{Identifier}' could not be added",
-            "message": "The custom server with URL: '{Identifier}' could not be added",
+            "id": "Server identifier: '{Identifier}', is not valid when removing the server",
+            "message": "Server identifier: '{Identifier}', is not valid when removing the server",
             "translation": "",
             "placeholders": [
                 {
@@ -202,18 +172,8 @@
             ]
         },
         {
-            "id": "The VPN configuration could not be obtained",
-            "message": "The VPN configuration could not be obtained",
-            "translation": ""
-        },
-        {
-            "id": "The current profile could not be found",
-            "message": "The current profile could not be found",
-            "translation": ""
-        },
-        {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid",
+            "id": "The server: '{Identifier}' could not be removed",
+            "message": "The server: '{Identifier}' could not be removed",
             "translation": "",
             "placeholders": [
                 {
@@ -223,88 +183,72 @@
                     "underlyingType": "string",
                     "argNum": 1,
                     "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
                 }
             ]
         },
         {
-            "id": "The operation for getting a VPN configuration was canceled",
-            "message": "The operation for getting a VPN configuration was canceled",
+            "id": "The current server could not be retrieved",
+            "message": "The current server could not be retrieved",
             "translation": ""
         },
         {
-            "id": "Failed to set the server with identifier: '{Identifier}' as the current",
-            "message": "Failed to set the server with identifier: '{Identifier}' as the current",
+            "id": "Failed to set the profile ID: '{PID}'",
+            "message": "Failed to set the profile ID: '{PID}'",
             "translation": "",
             "placeholders": [
                 {
-                    "id": "Identifier",
+                    "id": "PID",
                     "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "identifier"
+                    "expr": "pID"
                 }
             ]
         },
         {
-            "id": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "message": "Identifier: '{Identifier}' for server with type: '{Type}' is not valid for removal",
-            "translation": "",
-            "placeholders": [
-                {
-                    "id": "Identifier",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "identifier"
-                },
-                {
-                    "id": "Type",
-                    "string": "%[2]d",
-                    "type": "github.com/eduvpn/eduvpn-common/types/server.Type",
-                    "underlyingType": "int8",
-                    "argNum": 2,
-                    "expr": "_type"
-                }
-            ]
+            "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": "Failed to get the current server to cleanup the connection",
-            "message": "Failed to get the current server to cleanup the connection",
+            "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 cleanup process was canceled",
-            "message": "The cleanup process was canceled",
+            "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 for the current server",
-            "message": "Failed to cleanup the VPN connection for the current server",
+            "id": "Failed to cleanup the VPN connection",
+            "message": "Failed to cleanup the VPN connection",
             "translation": ""
         },
         {
-            "id": "No secure internet server available to set a location for",
-            "message": "No secure internet server available to set a location for",
-            "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": "Failed to get current server for renewing the session",
-            "message": "Failed to get current server for renewing the session",
+            "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 renewing process was canceled",
-            "message": "The renewing process was canceled",
+            "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": ""
         },
         {
@@ -331,11 +275,44 @@
             ]
         },
         {
-            "id": "timeout reached",
-            "message": "timeout reached",
+            "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",
             "translation": ""
         },
         {
+            "id": "The VPN proxy exited",
+            "message": "The VPN proxy exited",
+            "translation": ""
+        },
+        {
+            "id": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "message": "timeout reached for URL: '{URL}' and HTTP method: '{Method}'",
+            "translation": "",
+            "placeholders": [
+                {
+                    "id": "URL",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "tErr.URL"
+                },
+                {
+                    "id": "Method",
+                    "string": "%[2]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "tErr.Method"
+                }
+            ]
+        },
+        {
             "id": "with cause:",
             "message": "with cause:",
             "translation": ""