Translations: Sync with source code

10 files changed, 1129 insertions, 1442 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": ""
diff --git a/client/zgotext.go b/client/zgotext.go
index 4beb9d9..6c38afc 100644
--- a/client/zgotext.go
+++ b/client/zgotext.go
@@ -46,44 +46,38 @@ func init() {
 }
 
 var messageKeyToIndex = map[string]int{
-	"An error occurred after getting the discovery files for the list of organizations": 1,
-	"An error occurred after getting the discovery files for the list of servers":       2,
-	"An internal error occurred": 33,
-	"Could not retrieve institute access server with URL: '%s' from discovery":                                                       13,
-	"Failed to cleanup the VPN connection for the current server":                                                                    26,
-	"Failed to get current server for renewing the session":                                                                          28,
-	"Failed to get the current server to cleanup the connection":                                                                     24,
-	"Failed to set the server with identifier: '%s' as the current":                                                                  22,
-	"Failover failed to complete with gateway: '%s' and MTU: '%d'":                                                                   30,
-	"Identifier: '%s' for server with type: '%d' is not valid":                                                                       20,
-	"Identifier: '%s' for server with type: '%d' is not valid for removal":                                                           23,
-	"No secure internet server available to set a location for":                                                                      27,
-	"No suitable profiles could be found":                                                                                            9,
-	"Profile with ID: '%s' could not be obtained from the server":                                                                    11,
-	"Profile with ID: '%s' could not be set":                                                                                         10,
-	"The VPN configuration could not be obtained":                                                                                    18,
-	"The authorization procedure failed to complete":                                                                                 7,
-	"The cleanup process was canceled":                                                                                               25,
-	"The client tried to autoconnect to the VPN server: %s, but no secure internet location is found. Please manually connect again": 4,
-	"The client tried to autoconnect to the VPN server: %s, but no valid profiles were found. Please manually connect again":         8,
-	"The client tried to autoconnect to the VPN server: %s, but you need to authorizate again. Please manually connect again":        6,
-	"The current profile could not be found":                                                                                         19,
-	"The current server could not be found when getting it for expiry":                                                               3,
-	"The custom server with URL: '%s' could not be added":                                                                            17,
-	"The identifier that was passed to the library is incorrect":                                                                     12,
-	"The institute access server with URL: '%s' could not be added":                                                                  14,
-	"The log file with directory: '%s' failed to initialize":                                                                         0,
-	"The operation for getting a VPN configuration was canceled":                                                                     21,
-	"The renewing process was canceled":                                                                                              29,
-	"The secure internet location could not be set":                                                                                  5,
-	"The secure internet server with organisation ID: '%s' could not be added":                                                       16,
-	"The secure internet server with organisation ID: '%s' could not be retrieved from discovery":                                    15,
-	"timeout reached": 31,
-	"with cause:":     32,
+	"An error occurred after getting the discovery files for the list of organizations": 23,
+	"An error occurred after getting the discovery files for the list of servers":       24,
+	"An internal error occurred":                                                                                                28,
+	"Failed to cleanup the VPN connection":                                                                                      18,
+	"Failed to get the secure internet server with id: '%s' for setting a location":                                             19,
+	"Failed to set the profile ID: '%s'":                                                                                        14,
+	"Failover failed to complete with gateway: '%s' and MTU: '%d'":                                                              22,
+	"No OAuth tokens were found when cleaning up the connection":                                                                16,
+	"No VPN configuration for server: '%s' could be obtained":                                                                   10,
+	"Server identifier: '%s', is not valid when getting a VPN configuration":                                                    6,
+	"Server identifier: '%s', is not valid when removing the server":                                                            11,
+	"Server: '%s' could not be obtained":                                                                                        9,
+	"The VPN proxy exited":                                                                                                      25,
+	"The client tried to autoconnect to the VPN server: '%s', but the operation failed to complete":                             8,
+	"The client tried to autoconnect to the VPN server: '%s', but you need to authorizate again. Please manually connect again": 7,
+	"The current server could not be retrieved":                                                                                 13,
+	"The current server could not be retrieved when renewing the session":                                                       20,
+	"The current server was not found when cleaning up the connection":                                                          15,
+	"The current server was not found when getting the VPN expiration date":                                                     1,
+	"The custom server with URL: '%s' could not be added":                                                                       4,
+	"The institute access server with URL: '%s' could not be added":                                                             2,
+	"The log file with directory: '%s' failed to initialize":                                                                    0,
+	"The secure internet server with organisation ID: '%s' could not be added":                                                  3,
+	"The server was unable to be retrieved when cleaning up the connection":                                                     17,
+	"The server was unable to be retrieved when renewing the session":                                                           21,
+	"The server: '%s' could not be removed":                                                                                     12,
+	"input: '%s' is not a valid URL":                                                                                            5,
+	"timeout reached for URL: '%s' and HTTP method: '%s'":                                                                       26,
+	"with cause:": 27,
 }
 
-var daIndex = []uint32{ // 35 elements
-	// Entry 0 - 1F
+var daIndex = []uint32{ // 30 elements
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -91,16 +85,12 @@ var daIndex = []uint32{ // 35 elements
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	// Entry 20 - 3F
-	0x00000000, 0x00000000, 0x00000000,
-} // Size: 164 bytes
+	0x00000000, 0x00000000,
+} // Size: 144 bytes
 
 const daData string = ""
 
-var deIndex = []uint32{ // 35 elements
-	// Entry 0 - 1F
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+var deIndex = []uint32{ // 30 elements
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -108,72 +98,60 @@ var deIndex = []uint32{ // 35 elements
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	// Entry 20 - 3F
-	0x00000000, 0x00000000, 0x00000000,
-} // Size: 164 bytes
+	0x00000000, 0x00000000,
+} // Size: 144 bytes
 
 const deData string = ""
 
-var enIndex = []uint32{ // 35 elements
-	// Entry 0 - 1F
-	0x00000000, 0x0000003a, 0x0000008c, 0x000000d8,
-	0x00000119, 0x0000019b, 0x000001c9, 0x00000244,
-	0x00000273, 0x000002ed, 0x00000311, 0x0000033b,
-	0x0000037a, 0x000003b5, 0x00000401, 0x00000442,
-	0x000004a1, 0x000004ed, 0x00000524, 0x00000550,
-	0x00000577, 0x000005b6, 0x000005f1, 0x00000632,
-	0x0000067d, 0x000006b8, 0x000006d9, 0x00000715,
-	0x0000074f, 0x00000785, 0x000007a7, 0x000007ea,
-	// Entry 20 - 3F
-	0x000007fa, 0x00000806, 0x00000821,
-} // Size: 164 bytes
-
-const enData string = "" + // Size: 2081 bytes
-	"\x02The log file with directory: '%[1]s' failed to initialize\x02An erro" +
-	"r occurred after getting the discovery files for the list of organizatio" +
-	"ns\x02An error occurred after getting the discovery files for the list o" +
-	"f servers\x02The current server could not be found when getting it for e" +
-	"xpiry\x02The client tried to autoconnect to the VPN server: %[1]s, but n" +
-	"o secure internet location is found. Please manually connect again\x02Th" +
-	"e secure internet location could not be set\x02The client tried to autoc" +
-	"onnect to the VPN server: %[1]s, but you need to authorizate again. Plea" +
-	"se manually connect again\x02The authorization procedure failed to compl" +
-	"ete\x02The client tried to autoconnect to the VPN server: %[1]s, but no " +
-	"valid profiles were found. Please manually connect again\x02No suitable " +
-	"profiles could be found\x02Profile with ID: '%[1]s' could not be set\x02" +
-	"Profile with ID: '%[1]s' could not be obtained from the server\x02The id" +
-	"entifier that was passed to the library is incorrect\x02Could not retrie" +
-	"ve institute access server with URL: '%[1]s' from discovery\x02The insti" +
-	"tute access server with URL: '%[1]s' could not be added\x02The secure in" +
-	"ternet server with organisation ID: '%[1]s' could not be retrieved from " +
-	"discovery\x02The secure internet server with organisation ID: '%[1]s' co" +
-	"uld not be added\x02The custom server with URL: '%[1]s' could not be add" +
-	"ed\x02The VPN configuration could not be obtained\x02The current profile" +
-	" could not be found\x02Identifier: '%[1]s' for server with type: '%[2]d'" +
-	" is not valid\x02The operation for getting a VPN configuration was cance" +
-	"led\x02Failed to set the server with identifier: '%[1]s' as the current" +
-	"\x02Identifier: '%[1]s' for server with type: '%[2]d' is not valid for r" +
-	"emoval\x02Failed to get the current server to cleanup the connection\x02" +
-	"The cleanup process was canceled\x02Failed to cleanup the VPN connection" +
-	" for the current server\x02No secure internet server available to set a " +
-	"location for\x02Failed to get current server for renewing the session" +
-	"\x02The renewing process was canceled\x02Failover failed to complete wit" +
-	"h gateway: '%[1]s' and MTU: '%[2]d'\x02timeout reached\x02with cause:" +
-	"\x02An internal error occurred"
-
-var esIndex = []uint32{ // 35 elements
-	// Entry 0 - 1F
-	0x00000000, 0x0000004a, 0x000000ab, 0x00000104,
-	0x00000104, 0x00000104, 0x00000104, 0x00000104,
-	0x00000104, 0x00000104, 0x00000104, 0x00000104,
-	0x00000104, 0x00000104, 0x00000104, 0x00000104,
-	0x00000104, 0x00000104, 0x00000104, 0x00000104,
-	0x00000104, 0x00000104, 0x00000104, 0x00000104,
-	0x00000104, 0x00000104, 0x00000104, 0x00000104,
-	0x00000104, 0x00000104, 0x00000104, 0x00000104,
-	// Entry 20 - 3F
-	0x00000104, 0x00000104, 0x00000104,
-} // Size: 164 bytes
+var enIndex = []uint32{ // 30 elements
+	0x00000000, 0x0000003a, 0x00000080, 0x000000c1,
+	0x0000010d, 0x00000144, 0x00000166, 0x000001b0,
+	0x0000022d, 0x0000028e, 0x000002b4, 0x000002ef,
+	0x00000331, 0x0000035a, 0x00000384, 0x000003aa,
+	0x000003eb, 0x00000426, 0x0000046c, 0x00000491,
+	0x000004e2, 0x00000526, 0x00000566, 0x000005a9,
+	0x000005fb, 0x00000647, 0x0000065c, 0x00000696,
+	0x000006a2, 0x000006bd,
+} // Size: 144 bytes
+
+const enData string = "" + // Size: 1725 bytes
+	"\x02The log file with directory: '%[1]s' failed to initialize\x02The cur" +
+	"rent server was not found when getting the VPN expiration date\x02The in" +
+	"stitute access server with URL: '%[1]s' could not be added\x02The secure" +
+	" internet server with organisation ID: '%[1]s' could not be added\x02The" +
+	" custom server with URL: '%[1]s' could not be added\x02input: '%[1]s' is" +
+	" not a valid URL\x02Server identifier: '%[1]s', is not valid when gettin" +
+	"g a VPN configuration\x02The client tried to autoconnect to the VPN serv" +
+	"er: '%[1]s', but you need to authorizate again. Please manually connect " +
+	"again\x02The client tried to autoconnect to the VPN server: '%[1]s', but" +
+	" the operation failed to complete\x02Server: '%[1]s' could not be obtain" +
+	"ed\x02No VPN configuration for server: '%[1]s' could be obtained\x02Serv" +
+	"er identifier: '%[1]s', is not valid when removing the server\x02The ser" +
+	"ver: '%[1]s' could not be removed\x02The current server could not be ret" +
+	"rieved\x02Failed to set the profile ID: '%[1]s'\x02The current server wa" +
+	"s not found when cleaning up the connection\x02No OAuth tokens were foun" +
+	"d when cleaning up the connection\x02The server was unable to be retriev" +
+	"ed when cleaning up the connection\x02Failed to cleanup the VPN connecti" +
+	"on\x02Failed to get the secure internet server with id: '%[1]s' for sett" +
+	"ing a location\x02The current server could not be retrieved when renewin" +
+	"g the session\x02The server was unable to be retrieved when renewing the" +
+	" session\x02Failover failed to complete with gateway: '%[1]s' and MTU: '" +
+	"%[2]d'\x02An error occurred after getting the discovery files for the li" +
+	"st of organizations\x02An error occurred after getting the discovery fil" +
+	"es for the list of servers\x02The VPN proxy exited\x02timeout reached fo" +
+	"r URL: '%[1]s' and HTTP method: '%[2]s'\x02with cause:\x02An internal er" +
+	"ror occurred"
+
+var esIndex = []uint32{ // 30 elements
+	0x00000000, 0x0000004a, 0x0000004a, 0x0000004a,
+	0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a,
+	0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a,
+	0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a,
+	0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a,
+	0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a,
+	0x000000ab, 0x00000104, 0x00000104, 0x00000104,
+	0x00000104, 0x00000104,
+} // Size: 144 bytes
 
 const esData string = "" + // Size: 260 bytes
 	"\x02El archivo de registro con el directorio: '%[1]s' no se puede inicia" +
@@ -181,43 +159,27 @@ const esData string = "" + // Size: 260 bytes
 	"e la lista de las organizaciones\x02Se ha producido un error al obtener " +
 	"los archivos de detección de la lista de servidores"
 
-var frIndex = []uint32{ // 35 elements
-	// Entry 0 - 1F
-	0x00000000, 0x0000004f, 0x000000ba, 0x00000120,
-	0x00000120, 0x000001de, 0x0000021d, 0x0000021d,
-	0x0000021d, 0x000002c5, 0x000002ed, 0x00000324,
-	0x00000365, 0x00000399, 0x00000399, 0x00000399,
-	0x00000399, 0x000003f4, 0x0000043b, 0x00000469,
-	0x00000490, 0x000004db, 0x000004db, 0x000004db,
-	0x000004db, 0x000004db, 0x000004db, 0x000004db,
-	0x000004db, 0x000004db, 0x000004db, 0x000004db,
-	// Entry 20 - 3F
-	0x000004db, 0x000004db, 0x000004db,
-} // Size: 164 bytes
-
-const frData string = "" + // Size: 1243 bytes
+var frIndex = []uint32{ // 30 elements
+	0x00000000, 0x0000004f, 0x0000004f, 0x0000004f,
+	0x000000aa, 0x000000f1, 0x000000f1, 0x000000f1,
+	0x000000f1, 0x000000f1, 0x000000f1, 0x000000f1,
+	0x000000f1, 0x000000f1, 0x000000f1, 0x000000f1,
+	0x000000f1, 0x000000f1, 0x000000f1, 0x000000f1,
+	0x000000f1, 0x000000f1, 0x000000f1, 0x000000f1,
+	0x0000015c, 0x000001c2, 0x000001c2, 0x000001c2,
+	0x000001c2, 0x000001c2,
+} // Size: 144 bytes
+
+const frData string = "" + // Size: 450 bytes
 	"\x02Le fichier de registre du répertoire\u202f: '%[1]s' n'a pas pu être " +
-	"initialisé\x02Une erreur est survenue pendant la récupération des fichie" +
-	"rs de détection de la liste des organisations\x02Une erreur est survenue" +
-	" pendant la récupération des fichiers de détection de la liste des serve" +
-	"urs\x02Le client a essayé de se connecter automatiquement au serveur VPN" +
-	" : %[1]s, mais aucune localisation internet sécurisée n'a été trouvée. V" +
-	"euillez vous connecter manuellement de nouveau\x02La localisation intern" +
-	"et sécurisée n'a pas pu être définie\x02Le client a essayé de se connect" +
-	"er automatiquement au serveur VPN : %[1]s, mais aucun profil valide n'a " +
-	"été trouvé. Veuillez vous connecter manuellement de nouveau\x02Aucun pr" +
-	"ofil adéquat n'a été trouvé\x02Le profil avec l'ID : '%[1]s' n'a pas pu " +
-	"être défini\x02Le profil avec l'ID : '%[1]s' n'a pas pu être obtenu du " +
-	"serveur\x02L'identifiant envoyé à la librairie est incorrect\x02Le serve" +
-	"ur internet sécurisé avec l'ID d'organisation : '%[1]s' n'a pas pu être " +
-	"ajouté\x02Le serveur personnalisé avec l'URL : '%[1]s' n'a pas pu être a" +
-	"jouté\x02La configuration VPN n'a pas pu être obtenue\x02Le profil actue" +
-	"l n'a pas été trouvé\x02L'identifiant : '%[1]s' du serveur avec le type " +
-	": '%[2]d' n'est pas valide"
+	"initialisé\x02Le serveur internet sécurisé avec l'ID d'organisation : '%" +
+	"[1]s' n'a pas pu être ajouté\x02Le serveur personnalisé avec l'URL : '%[" +
+	"1]s' n'a pas pu être ajouté\x02Une erreur est survenue pendant la récupé" +
+	"ration des fichiers de détection de la liste des organisations\x02Une er" +
+	"reur est survenue pendant la récupération des fichiers de détection de l" +
+	"a liste des serveurs"
 
-var itIndex = []uint32{ // 35 elements
-	// Entry 0 - 1F
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+var itIndex = []uint32{ // 30 elements
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -225,111 +187,54 @@ var itIndex = []uint32{ // 35 elements
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	// Entry 20 - 3F
-	0x00000000, 0x00000000, 0x00000000,
-} // Size: 164 bytes
+	0x00000000, 0x00000000,
+} // Size: 144 bytes
 
 const itData string = ""
 
-var nlIndex = []uint32{ // 35 elements
-	// Entry 0 - 1F
-	0x00000000, 0x0000003c, 0x00000084, 0x000000c7,
-	0x000000f6, 0x00000180, 0x000001be, 0x0000023a,
-	0x0000026b, 0x000002f5, 0x00000329, 0x00000368,
-	0x000003b4, 0x000003f2, 0x00000446, 0x0000048d,
-	0x000004e7, 0x00000534, 0x0000056a, 0x00000598,
-	0x000005c4, 0x00000608, 0x00000646, 0x00000693,
-	0x000006ec, 0x00000737, 0x0000075c, 0x00000788,
-	0x000007d9, 0x00000820, 0x00000845, 0x00000896,
-	// Entry 20 - 3F
-	0x000008e7, 0x000008f4, 0x00000913,
-} // Size: 164 bytes
+var nlIndex = []uint32{ // 30 elements
+	0x00000000, 0x0000003c, 0x0000003c, 0x00000083,
+	0x000000d0, 0x00000106, 0x00000106, 0x00000106,
+	0x00000106, 0x00000106, 0x00000106, 0x00000106,
+	0x00000106, 0x00000106, 0x00000106, 0x00000106,
+	0x00000106, 0x00000106, 0x00000106, 0x00000106,
+	0x00000106, 0x00000106, 0x00000106, 0x00000157,
+	0x0000019f, 0x000001e2, 0x000001e2, 0x000001e2,
+	0x000001ef, 0x0000020e,
+} // Size: 144 bytes
 
-const nlData string = "" + // Size: 2323 bytes
-	"\x02Het log bestand met pad: '%[1]s' kan niet aangemaakt worden\x02Er is" +
-	" een fout opgetreden met het ophalen van de lijst van organisaties\x02Er" +
-	" is een fout opgetreden met het ophalen van de lijst van servers\x02De h" +
-	"uidige VPN server kon niet worden gevonden\x02De client wilde automatisc" +
-	"h verbinden met VPN server: %[1]s, maar de huidige locatie is niet gevon" +
-	"den. U moet opnieuw handmatig verbinden\x02De locatie voor de secure int" +
-	"ernet server kon niet opgeslagen\x02De client wilde automatisch verbinde" +
-	"n met VPN server: %[1]s, maar authorizatie is nodig. U moet handmatig op" +
-	"nieuw verbinden\x02Het authorizatie proces kon niet voltooid worden\x02D" +
-	"e client wilde automatisch verbinden met VPN server: %[1]s, maar er was " +
-	"geen geldig profiel gevinden. U moet handmatig opnieuw verbinden\x02Er z" +
-	"ijn geen profielen gevonden om mee te verbinden\x02Het profiel met ident" +
-	"iteit: '%[1]s' kon niet opgeslagen worden\x02Het profiel met identiteit:" +
-	" '%[1]s' kon niet opgehaald worden van de server\x02De identiteit die aa" +
-	"n de library werd gegeven is niet correct\x02De institute access server " +
-	"met URL: '%[1]s' kan niet opgehaald worden van discovery\x02De institute" +
-	" access server met URL: '%[1]s' kan niet toegevoegd worden\x02De secure " +
-	"internet server met identiteit: '%[1]s' kan niet opgehaald worden van di" +
-	"scovery\x02De secure internet server met identiteit: '%[1]s' kan niet to" +
-	"egevoegd worden\x02De server met URL: '%[1]s' kan niet toegevoegd worden" +
-	"\x02De VPN configuratie kan niet opgehaald worden\x02Het huidig profiel " +
-	"kan niet gevonden worden\x02De identiteit: '%[1]s' voor server met type:" +
-	" '%[2]d' is niet geldig\x02De procedure om een VPN configuratie op te ha" +
-	"len is verbroken\x02De server met identiteit: '%[1]s' kan niet als de hu" +
-	"dige server gezet worden\x02Identiteit: '%[1]s' voor server met type: '%" +
-	"[2]d' is niet geldig om verwijderd te worden\x02De huidige server kan ni" +
-	"et opgehaald worden om de connectie te verwijderen\x02De opschoon proced" +
-	"ure was afgebroken\x02De VPN connectie is niet volledig opgeruimd\x02Er " +
-	"is geen \x22secure internet\x22 server beschikbaar om de locatie voor in" +
-	" te stellen\x02De huidige server kan niet opgehaald worden om de sessie " +
-	"te hernieuwen\x02De hernieuw procedure was afgebroken\x02Het 'failover' " +
-	"proces kan niet voltooid worden. Gateway: '%[1]s' en MTU: '%[2]d'\x02Er " +
-	"is een time-out opgetreden in de verbinding. Controleer uw internetverbi" +
-	"nding\x02met oorzaak:\x02Een interne fout is opgetreden"
+const nlData string = "" + // Size: 526 bytes
+	"\x02Het log bestand met pad: '%[1]s' kan niet aangemaakt worden\x02De in" +
+	"stitute access server met URL: '%[1]s' kan niet toegevoegd worden\x02De " +
+	"secure internet server met identiteit: '%[1]s' kan niet toegevoegd worde" +
+	"n\x02De server met URL: '%[1]s' kan niet toegevoegd worden\x02Het 'failo" +
+	"ver' proces kan niet voltooid worden. Gateway: '%[1]s' en MTU: '%[2]d'" +
+	"\x02Er is een fout opgetreden met het ophalen van de lijst van organisat" +
+	"ies\x02Er is een fout opgetreden met het ophalen van de lijst van server" +
+	"s\x02met oorzaak:\x02Een interne fout is opgetreden"
 
-var slIndex = []uint32{ // 35 elements
-	// Entry 0 - 1F
-	0x00000000, 0x0000003c, 0x0000007c, 0x000000bc,
-	0x000000f8, 0x0000019b, 0x000001cb, 0x00000264,
-	0x00000285, 0x00000325, 0x0000034e, 0x00000381,
-	0x000003c1, 0x000003e2, 0x0000043a, 0x00000484,
-	0x000004dc, 0x0000052a, 0x00000566, 0x00000588,
-	0x000005b0, 0x000005e2, 0x0000061b, 0x00000649,
-	0x00000688, 0x000006cb, 0x000006cb, 0x00000704,
-	0x00000746, 0x00000788, 0x00000788, 0x000007bf,
-	// Entry 20 - 3F
-	0x000007cf, 0x000007d9, 0x000007f7,
-} // Size: 164 bytes
+var slIndex = []uint32{ // 30 elements
+	0x00000000, 0x0000003c, 0x0000003c, 0x00000086,
+	0x000000d4, 0x00000110, 0x00000110, 0x00000110,
+	0x00000110, 0x00000110, 0x00000110, 0x00000110,
+	0x00000110, 0x00000110, 0x00000110, 0x00000110,
+	0x00000110, 0x00000110, 0x00000110, 0x00000110,
+	0x00000110, 0x00000110, 0x00000110, 0x00000147,
+	0x00000187, 0x000001c7, 0x000001c7, 0x000001c7,
+	0x000001d1, 0x000001ef,
+} // Size: 144 bytes
 
-const slData string = "" + // Size: 2039 bytes
-	"\x02Napaka pri vzpostavitvi datoteke dnevnika v imeniku '%[1]s'\x02Pri n" +
-	"alaganju datotek kataloga organizacij je prišlo do napake\x02Pri nalagan" +
-	"ju datotek kataloga strežnikov je prišlo do napake\x02Ugotavljanje prete" +
-	"ka ne more določiti izbranega strežnika\x02Odjemalec je poskusil samodej" +
-	"no vzpostaviti povezavo s strežnikom VPN %[1]s, vendar ni našel nobene l" +
-	"okacije za varni splet. Ponovno vzpostavite povezavo ročno\x02Napaka pri" +
-	" nastavljanju lokacije za varni splet\x02Odjemalec je poskusil samodejno" +
-	" vzpostaviti povezavo s strežnikom VPN %[1]s, vendar ga morate ponovno a" +
-	"vtorizirati. Ponovno vzpostavite povezavo ročno\x02Napaka pri postopku a" +
-	"vtorizacije\x02Odjemalec je poskusil samodejno vzpostaviti povezavo s st" +
-	"režnikom VPN %[1]s, vendar ni našel nobenega veljavnega profila. Ponovno" +
-	" vzpostavite povezavo ročno\x02Ustreznih profilov ni bilo mogoče najti" +
-	"\x02Profila z ID-jem '%[1]s' ni bilo mogoče nastaviti\x02Profila z ID-je" +
-	"m '%[1]s' ni bilo mogoče naložiti s strežnika\x02ID poslan knjižnici je " +
-	"napačen\x02Strežnika z naslovom URL '%[1]s' za dostop do ustanove ni bil" +
-	"o možno najti v katalogu\x02Strežnika z naslovom '%[1]s' za dostop do us" +
-	"tanove ni bilo možno dodati\x02Strežnika za varni splet organizacije z I" +
-	"D-jem '%[1]s' ni bilo možno najti v katalogu\x02Strežnika za varni splet" +
-	" organizacije z ID-jem '%[1]s' ni bilo možno dodati\x02Svojega strežnika" +
-	" z naslovom '%[1]s' ni bilo možno dodati\x02Napaka pri prenosu nastavite" +
-	"v VPN\x02Izbranega profila ni bilo mogoče najti\x02ID '%[1]s' za strežni" +
-	"k vrste '%[2]d' ni veljaven\x02Operacija za nalaganje nastavitev VPN je " +
-	"bila preklicana\x02Napaka pri izbiri strežnika z ID-jem '%[1]s'\x02ID '%" +
-	"[1]s' strežnika vrste '%[2]d' ni veljaven za odstranitev\x02Napaka pri d" +
-	"oločanju izbranega strežnika za čiščenje povezave\x02Napaka pri čiščenju" +
-	" povezave VPN za izbrani strežnik\x02Za izbiro lokacije ni na voljo nobe" +
-	"nega strežnika za varni splet\x02Napaka pri ugotavljanju izbranega strež" +
-	"nika za podaljšanje seje\x02Preklop ni uspel s prehodom '%[1]s' in MTU-j" +
-	"em '%[2]d'\x02čas je potekel\x02; razlog:\x02Prišlo je do notranje napak" +
-	"e"
+const slData string = "" + // Size: 495 bytes
+	"\x02Napaka pri vzpostavitvi datoteke dnevnika v imeniku '%[1]s'\x02Strež" +
+	"nika z naslovom '%[1]s' za dostop do ustanove ni bilo možno dodati\x02St" +
+	"režnika za varni splet organizacije z ID-jem '%[1]s' ni bilo možno dodat" +
+	"i\x02Svojega strežnika z naslovom '%[1]s' ni bilo možno dodati\x02Preklo" +
+	"p ni uspel s prehodom '%[1]s' in MTU-jem '%[2]d'\x02Pri nalaganju datote" +
+	"k kataloga organizacij je prišlo do napake\x02Pri nalaganju datotek kata" +
+	"loga strežnikov je prišlo do napake\x02; razlog:\x02Prišlo je do notranj" +
+	"e napake"
 
-var ukIndex = []uint32{ // 35 elements
-	// Entry 0 - 1F
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
+var ukIndex = []uint32{ // 30 elements
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -337,10 +242,9 @@ var ukIndex = []uint32{ // 35 elements
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	// Entry 20 - 3F
-	0x00000000, 0x00000000, 0x00000000,
-} // Size: 164 bytes
+	0x00000000, 0x00000000,
+} // Size: 144 bytes
 
 const ukData string = ""
 
-// Total table size 9422 bytes (9KiB); checksum: 98B554AA
+// Total table size 4752 bytes (4KiB); checksum: 1AA1A07B