[bug] don't initialize the gateway selection before bitmask is ready

- Resolves: #110

1 files changed, 46 insertions, 20 deletions

diff --git a/locales/en-US/messages.gotext.json b/locales/en-US/messages.gotext.json
index d8e72cc..aa6dbd4 100644
--- a/locales/en-US/messages.gotext.json
+++ b/locales/en-US/messages.gotext.json
@@ -7,7 +7,7 @@
                 "An error has ocurred initializing the VPN: {Err}"
             ],
             "message": "An error has ocurred initializing the VPN: {Err}",
-            "translation": "An error has ocurred initializing VPN: {Err}",
+            "translation": "An error has ocurred initializing the VPN: {Err}",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -36,7 +36,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "n.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
                 }
             ],
             "fuzzy": true
@@ -51,10 +51,10 @@
         {
             "id": [
                 "aboutText",
-                "{ApplicationName} is an easy, fast, and secure VPN service from riseup.net. {ApplicationName} does not require a user account, keep logs, or track you in any way.\n\t    \nThis service is paid for entirely by donations from users like you. Please donate at https://riseup.net/vpn/donate.\n\t\t\nBy using this application, you agree to the Terms of Service available at https://riseup.net/tos. This service is provide as-is, without any warranty, and is intended for people who work to make the world a better place.\n\n\n{ApplicationName_1} version: {Version}"
+                "{ApplicationName} is an easy, fast, and secure VPN service from {Provider}. {ApplicationName} does not require a user account, keep logs, or track you in any way.\n\t    \nThis service is paid for entirely by donations from users like you. Please donate at {DonateURL}.\n\t\t\nBy using this application, you agree to the Terms of Service available at {TosURL}. This service is provide as-is, without any warranty, and is intended for people who work to make the world a better place.\n\n\n{ApplicationName_1} version: {Version}"
             ],
-            "message": "{ApplicationName} is an easy, fast, and secure VPN service from riseup.net. {ApplicationName} does not require a user account, keep logs, or track you in any way.\n\t    \nThis service is paid for entirely by donations from users like you. Please donate at https://riseup.net/vpn/donate.\n\t\t\nBy using this application, you agree to the Terms of Service available at https://riseup.net/tos. This service is provide as-is, without any warranty, and is intended for people who work to make the world a better place.\n\n\n{ApplicationName_1} version: {Version}",
-            "translation": "{ApplicationName} is an easy, fast, and secure VPN service from riseup.net. {ApplicationName} does not require a user account, keep logs, or track you in any way.\n\t    \nThis service is paid for entirely by donations from users like you. Please donate at https://riseup.net/vpn/donate.\n\t\t\nBy using this application, you agree to the Terms of Service available at https://riseup.net/tos. This service is provide as-is, without any warranty, and is intended for people who work to make the world a better place.\n\n\n{ApplicationName_1} version: {Version}",
+            "message": "{ApplicationName} is an easy, fast, and secure VPN service from {Provider}. {ApplicationName} does not require a user account, keep logs, or track you in any way.\n\t    \nThis service is paid for entirely by donations from users like you. Please donate at {DonateURL}.\n\t\t\nBy using this application, you agree to the Terms of Service available at {TosURL}. This service is provide as-is, without any warranty, and is intended for people who work to make the world a better place.\n\n\n{ApplicationName_1} version: {Version}",
+            "translation": "{ApplicationName} is an easy, fast, and secure VPN service from {Provider}. {ApplicationName} does not require a user account, keep logs, or track you in any way.\n\t    \nThis service is paid for entirely by donations from users like you. Please donate at {DonateURL}.\n\t\t\nBy using this application, you agree to the Terms of Service available at {TosURL}. This service is provide as-is, without any warranty, and is intended for people who work to make the world a better place.\n\n\n{ApplicationName_1} version: {Version}",
             "translatorComment": "Copied from source.",
             "placeholders": [
                 {
@@ -63,7 +63,15 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "n.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
+                },
+                {
+                    "id": "Provider",
+                    "string": "%[2]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "config.Provider"
                 },
                 {
                     "id": "ApplicationName",
@@ -71,7 +79,23 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "n.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
+                },
+                {
+                    "id": "DonateURL",
+                    "string": "%[3]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 3,
+                    "expr": "config.DonateURL"
+                },
+                {
+                    "id": "TosURL",
+                    "string": "%[4]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 4,
+                    "expr": "config.TosURL"
                 },
                 {
                     "id": "ApplicationName_1",
@@ -79,14 +103,14 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "n.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
                 },
                 {
                     "id": "Version",
-                    "string": "%[2]s",
+                    "string": "%[5]s",
                     "type": "string",
                     "underlyingType": "string",
-                    "argNum": 2,
+                    "argNum": 5,
                     "expr": "version"
                 }
             ],
@@ -138,7 +162,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "n.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
                 },
                 {
                     "id": "Err",
@@ -216,7 +240,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "bt.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
                 },
                 {
                     "id": "City",
@@ -241,7 +265,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "bt.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
                 }
             ],
             "fuzzy": true
@@ -258,7 +282,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "bt.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
                 }
             ],
             "fuzzy": true
@@ -280,7 +304,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "bt.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
                 }
             ],
             "fuzzy": true
@@ -297,15 +321,17 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "bt.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
                 }
             ],
             "fuzzy": true
         },
         {
-            "id": "Retry",
-            "message": "Retry",
-            "translation": "Retry"
+            "id": "Reconnect",
+            "message": "Reconnect",
+            "translation": "Reconnect",
+            "translatorComment": "Copied from source.",
+            "fuzzy": true
         },
         {
             "id": "{ApplicationName} blocking internet",
@@ -319,7 +345,7 @@
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "bt.conf.ApplicationName"
+                    "expr": "config.ApplicationName"
                 }
             ],
             "fuzzy": true