diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2019-01-31 17:51:57 +0100 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2019-01-31 17:51:57 +0100 |
| commit | 6264cdf8a95c8d924db39168093af78e6b273b80 (patch) | |
| tree | 78a4f1712dbb09f9f65729984199c0c4acf8f823 | |
| parent | 0d4ef9c4cb4fd10734d87dd523b790b1fe4bb5c4 (diff) | |
[bug] don't initialize the gateway selection before bitmask is ready
- Resolves: #110
| -rw-r--r-- | locales/bn/messages.gotext.json | 64 | ||||
| -rw-r--r-- | locales/en-GB/messages.gotext.json | 64 | ||||
| -rw-r--r-- | locales/en-US/messages.gotext.json | 66 | ||||
| -rw-r--r-- | locales/es-ES/messages.gotext.json | 64 | ||||
| -rw-r--r-- | locales/es/messages.gotext.json | 64 | ||||
| -rw-r--r-- | locales/fr/messages.gotext.json | 64 | ||||
| -rw-r--r-- | locales/lt/messages.gotext.json | 62 | ||||
| -rw-r--r-- | locales/nl/messages.gotext.json | 64 | ||||
| -rw-r--r-- | locales/pt-BR/messages.gotext.json | 64 | ||||
| -rw-r--r-- | locales/ru/messages.gotext.json | 314 | ||||
| -rw-r--r-- | pkg/systray/systray.go | 7 |
11 files changed, 717 insertions, 180 deletions
diff --git a/locales/bn/messages.gotext.json b/locales/bn/messages.gotext.json index 9bcbb29..582f92a 100644 --- a/locales/bn/messages.gotext.json +++ b/locales/bn/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}", "placeholders": [ { "id": "Err", @@ -33,7 +33,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -45,10 +45,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}", "placeholders": [ { "id": "ApplicationName", @@ -56,7 +56,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", @@ -64,7 +72,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", @@ -72,14 +96,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" } ] @@ -121,7 +145,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "Err", @@ -189,7 +213,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "City", @@ -212,7 +236,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -227,7 +251,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -247,7 +271,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -262,14 +286,14 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, { - "id": "Retry", - "message": "Retry", - "translation": "পূনরায় চেষ্টা করুন" + "id": "Reconnect", + "message": "Reconnect", + "translation": "Reconnect" }, { "id": "{ApplicationName} blocking internet", @@ -282,7 +306,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] } diff --git a/locales/en-GB/messages.gotext.json b/locales/en-GB/messages.gotext.json index b4cacaa..9e41945 100644 --- a/locales/en-GB/messages.gotext.json +++ b/locales/en-GB/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 occurred initialising VPN: {Err}", + "translation": "An error has ocurred initializing the VPN: {Err}", "placeholders": [ { "id": "Err", @@ -33,7 +33,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -45,10 +45,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}", "placeholders": [ { "id": "ApplicationName", @@ -56,7 +56,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", @@ -64,7 +72,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", @@ -72,14 +96,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" } ] @@ -121,7 +145,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "Err", @@ -189,7 +213,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "City", @@ -212,7 +236,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -227,7 +251,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -247,7 +271,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -262,14 +286,14 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, { - "id": "Retry", - "message": "Retry", - "translation": "Retry" + "id": "Reconnect", + "message": "Reconnect", + "translation": "Reconnect" }, { "id": "{ApplicationName} blocking internet", @@ -282,7 +306,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] } 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 diff --git a/locales/es-ES/messages.gotext.json b/locales/es-ES/messages.gotext.json index 0cf3e1e..432994e 100644 --- a/locales/es-ES/messages.gotext.json +++ b/locales/es-ES/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": "Ha ocurrido un error inicializando VPN: {Err}", + "translation": "An error has ocurred initializing the VPN: {Err}", "placeholders": [ { "id": "Err", @@ -33,7 +33,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -45,10 +45,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} es un servicio de VPN fácil, rápido y seguro de riseup.net. {ApplicationName} no requiere una cuenta de usuario, no mantiene bitácoras, o te rastrea de cualquier manera.\n\t \nEl costo de este servicio está cubierto por completo por donaciones de usuarios como tú. Por favor dona a https://riseup.net/vpn/donate.\n\t\t\nAl usar esta aplicación, estás de acuerdo con los Términos del Servicio disponibles en https://riseup.net/tos. Este servicio se provee como está, sin ninguna garantía, y está apuntado a personas que trabajan para hacer del mundo un mejor lugar.\n\n\nVersión de {ApplicationName_1}: {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}", "placeholders": [ { "id": "ApplicationName", @@ -56,7 +56,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", @@ -64,7 +72,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", @@ -72,14 +96,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" } ] @@ -121,7 +145,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "Err", @@ -189,7 +213,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "City", @@ -212,7 +236,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -227,7 +251,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -247,7 +271,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -262,14 +286,14 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, { - "id": "Retry", - "message": "Retry", - "translation": "Reintentar" + "id": "Reconnect", + "message": "Reconnect", + "translation": "Reconnect" }, { "id": "{ApplicationName} blocking internet", @@ -282,7 +306,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] } diff --git a/locales/es/messages.gotext.json b/locales/es/messages.gotext.json index dc4f16f..204aad1 100644 --- a/locales/es/messages.gotext.json +++ b/locales/es/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": "Un error ha ocurrido inicializando VPN: {Err}", + "translation": "Ha ocurrido un error inicializando la VPN: {Err}", "placeholders": [ { "id": "Err", @@ -33,7 +33,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -45,10 +45,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} es un servicio de VPN fácil, rápido, y seguro de riseup.net. {ApplicationName} no requiere una cuenta de usuario, no mantiene registros, ni te rastrea de ninguna manera.\n\t \nEste servicio se paga en su totalidad por donaciones de usuarios como tú. Por favor dona ingresando a https://riseup.net/vpn/donate.\n\t\t\nAl usar ésta aplicación, acuerdas con los Términos del Servicio disponibles en https://riseup.net/tos. Este servicio es provisto como viene, sin garantía alguna, y está destinado a gente que trabaja para hacer del mundo un lugar mejor.\n\n\nVersión de {ApplicationName_1}: {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} es un servicio de VPN fácil, rápido, y seguro de {Provider}. {ApplicationName} no requiere una cuenta de usuario, no mantiene registros, ni te rastrea de ninguna manera.\n\t \nEste servicio se paga en su totalidad por donaciones de usuarios como tú. Por favor dona ingresando a {DonateURL}.\n\t\t\nAl usar ésta aplicación, acuerdas con los Términos del Servicio disponibles en {TosURL}. Este servicio es provisto como viene, sin garantía alguna, y está destinado a gente que trabaja para hacer del mundo un lugar mejor.\n\n\nVersión de {ApplicationName_1}: {Version}", "placeholders": [ { "id": "ApplicationName", @@ -56,7 +56,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", @@ -64,7 +72,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", @@ -72,14 +96,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" } ] @@ -121,7 +145,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "Err", @@ -189,7 +213,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "City", @@ -212,7 +236,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -227,7 +251,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -247,7 +271,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -262,14 +286,14 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, { - "id": "Retry", - "message": "Retry", - "translation": "Reintentar" + "id": "Reconnect", + "message": "Reconnect", + "translation": "Reconnect" }, { "id": "{ApplicationName} blocking internet", @@ -282,7 +306,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] } diff --git a/locales/fr/messages.gotext.json b/locales/fr/messages.gotext.json index 718898d..877baf9 100644 --- a/locales/fr/messages.gotext.json +++ b/locales/fr/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": "Une erreur est survenue lors de l'initialisation de VPN: {Err}", + "translation": "Une erreur est survenue lors de l’\ninitialisation du RPV : {Err}", "placeholders": [ { "id": "Err", @@ -33,7 +33,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -45,10 +45,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} est un service de RPV simple, rapide et sécurisé offert par riseup.net. {ApplicationName} ne demande pas de compte utilisateur, ne conserve pas de journaux, ni ne vous suit à la trace d’aucune façon.\n\t \nCe service est entièrement financé par les dons d’utilisateurs comme vous. Veuillez faire un don à https://riseup.net/vpn/donate.\n\t\t\nEn utilisant cette application, vous acceptez les conditions générales d’utilisation qui se trouvent sur https://riseup.net/tos. Ce service est fourni tel quel, sans aucune garantie, et s’adresse aux personnes qui œuvrent à rendre le monde meilleur.\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} est un service de RPV simple, rapide et sécurisé offert par {Provider}. {ApplicationName} ne demande pas de compte utilisateur, ne conserve pas de journaux, ni ne vous suit à la trace d’aucune façon.\n\t \nCe service est entièrement financé par les dons d’utilisateurs comme vous. Veuillez faire un don sur {DonateURL}.\n\t\t\nEn utilisant cette application, vous acceptez les conditions générales d’utilisation qui se trouvent sur {TosURL}. Ce service est fourni tel quel, sans aucune garantie, et s’adresse aux personnes qui œuvrent à rendre le monde meilleur.\n\n\n{ApplicationName_1} version : {Version}", "placeholders": [ { "id": "ApplicationName", @@ -56,7 +56,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", @@ -64,7 +72,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", @@ -72,14 +96,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" } ] @@ -121,7 +145,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "Err", @@ -189,7 +213,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "City", @@ -212,7 +236,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -227,7 +251,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -247,7 +271,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -262,14 +286,14 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, { - "id": "Retry", - "message": "Retry", - "translation": "Ressayer" + "id": "Reconnect", + "message": "Reconnect", + "translation": "Se reconnecter" }, { "id": "{ApplicationName} blocking internet", @@ -282,7 +306,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] } diff --git a/locales/lt/messages.gotext.json b/locales/lt/messages.gotext.json index 601ba13..44b336e 100644 --- a/locales/lt/messages.gotext.json +++ b/locales/lt/messages.gotext.json @@ -33,7 +33,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -45,10 +45,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} yra lengva naudoti, greita ir saugi VPN paslauga iš riseup.net. {ApplicationName} nereikalauja naudotojo paskyros, nesaugo žurnalų ir jokiu kitu būdu jūsų neseka.\n\t \nŠi paslauga yra apmokama tik iš, tokių pačių naudotojų kaip jūs, paaukojimų. Prašome paaukokite, adresu https://riseup.net/vpn/donate.\n\t\t\nNaudodami šią programą, sutinkate su Naudojimosi Sąlygomis, kurias galite rasti adresu https://riseup.net/tos. Ši paslauga yra teikiama esamu pavidalu, be jokių garantijų ir yra skirta žmonėms, kurie dirba, kad padarytų pasaulį geresnį.\n\n\n{ApplicationName_1} versija: {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} yra lengva naudoti, greita ir saugi VPN paslauga iš {Provider}. {ApplicationName} nereikalauja naudotojo paskyros, nesaugo žurnalų ir jokiu kitu būdu jūsų neseka.\n\t \nŠi paslauga yra apmokama tik iš, tokių pačių naudotojų kaip jūs, paaukojimų. Prašome paaukokite, adresu {DonateURL}.\n\t\t\nNaudodami šią programą, sutinkate su Naudojimosi Sąlygomis, kurias galite rasti adresu {TosURL}. Ši paslauga yra teikiama esamu pavidalu, be jokių garantijų ir yra skirta žmonėms, kurie dirba, kad padarytų pasaulį geresnį.\n\n\n{ApplicationName_1} versija: {Version}", "placeholders": [ { "id": "ApplicationName", @@ -56,7 +56,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", @@ -64,7 +72,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", @@ -72,14 +96,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" } ] @@ -121,7 +145,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "Err", @@ -189,7 +213,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "City", @@ -212,7 +236,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -227,7 +251,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -247,7 +271,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -262,14 +286,14 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, { - "id": "Retry", - "message": "Retry", - "translation": "Bandyti iš naujo" + "id": "Reconnect", + "message": "Reconnect", + "translation": "Prisijungti iš naujo" }, { "id": "{ApplicationName} blocking internet", @@ -282,7 +306,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] } diff --git a/locales/nl/messages.gotext.json b/locales/nl/messages.gotext.json index 296f77e..56712fe 100644 --- a/locales/nl/messages.gotext.json +++ b/locales/nl/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": "Er heeft zich een fout voorgedaan bij het initialiseren van VPN: {Err}", + "translation": "Er heeft zich een fout voorgedaan bij het initialiseren van de VPN: {Err}", "placeholders": [ { "id": "Err", @@ -33,7 +33,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -45,10 +45,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 een gemakkelijke, snelle, en veilige VPN-dienst van riseup.net. {ApplicationName} vereist geen gebruikersaccount, houdt geen logboek bij en volgt u niet op wat voor manier dan ook.\n\t\nDeze dienst wordt volledig gefinancierd door donaties van gebruikers zoals u. Overweeg bij te dragen op https://riseup.net/vpn/donate.\n\t\t\nDoor deze applicatie te gebruiken gaat u akkoord met onze gebruikersvoorwaarden die beschikbaar zijn op https://riseup.net/tos. Deze dienst wordt geleverd zonder enige garantie, en is bedoeld voor mensen die werken aan een betere wereld.\n\n\n{ApplicationName_1} versie: {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 een gemakkelijke, snelle en veilige VPN-dienst van {Provider}. {ApplicationName} vereist geen gebruikersaccount, houdt geen logboek bij en volgt u niet op wat voor manier dan ook.\n\t \nDeze dienst wordt volledig gefinancierd door donaties van gebruikers zoals u. Gelieve bij te dragen op {DonateURL}.\n\t\t\nDoor deze applicatie te gebruiken, gaat u akkoord met onze gebruikersvoorwaarden die beschikbaar zijn op {TosURL}. Deze dienst wordt geleverd zonder enige garantie en is bedoeld voor mensen die werken aan een betere wereld. \n\n\n{ApplicationName_1} version: {Version}", "placeholders": [ { "id": "ApplicationName", @@ -56,7 +56,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", @@ -64,7 +72,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", @@ -72,14 +96,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" } ] @@ -121,7 +145,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "Err", @@ -189,7 +213,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "City", @@ -212,7 +236,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -227,7 +251,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -247,7 +271,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -262,14 +286,14 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, { - "id": "Retry", - "message": "Retry", - "translation": "Opnieuw proberen" + "id": "Reconnect", + "message": "Reconnect", + "translation": "Reconnect" }, { "id": "{ApplicationName} blocking internet", @@ -282,7 +306,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] } diff --git a/locales/pt-BR/messages.gotext.json b/locales/pt-BR/messages.gotext.json index b83033c..18c8457 100644 --- a/locales/pt-BR/messages.gotext.json +++ b/locales/pt-BR/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": "Um erro ocorreu na inicialização de VPN: {Err}", + "translation": "An error has ocurred initializing the VPN: {Err}", "placeholders": [ { "id": "Err", @@ -33,7 +33,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -45,10 +45,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} é um serviço de VPN fácil, rápido e seguro mantido por riseup.net. {ApplicationName} não precisa de uma conta de usuário, não mantém logs, e não te rastreia de forma alguma.\n\nO serviço é financiado inteiramente através de doações de pessoas como você. Por favor faça uma doação acessando https://riseup.net/vpn/donate.\n\nAo usar este aplicativo, você concorda com os Termos de Serviço disponíveis em https://riseup.net/tos. Este serviço é provido \"no estado\", sem nenhuma garantia, e é direcionado a pessoas que trabalham para tornar o mundo um lugar melhor.\n\n\n{ApplicationName_1} versão: {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}", "placeholders": [ { "id": "ApplicationName", @@ -56,7 +56,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", @@ -64,7 +72,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", @@ -72,14 +96,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" } ] @@ -121,7 +145,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "n.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "Err", @@ -189,7 +213,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" }, { "id": "City", @@ -212,7 +236,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -227,7 +251,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -247,7 +271,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, @@ -262,14 +286,14 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] }, { - "id": "Retry", - "message": "Retry", - "translation": "Tentar novamente" + "id": "Reconnect", + "message": "Reconnect", + "translation": "Reconnect" }, { "id": "{ApplicationName} blocking internet", @@ -282,7 +306,7 @@ "type": "string", "underlyingType": "string", "argNum": 1, - "expr": "bt.conf.ApplicationName" + "expr": "config.ApplicationName" } ] } diff --git a/locales/ru/messages.gotext.json b/locales/ru/messages.gotext.json new file mode 100644 index 0000000..70901ab --- /dev/null +++ b/locales/ru/messages.gotext.json @@ -0,0 +1,314 @@ +{ + "language": "ru", + "messages": [ + { + "id": [ + "errorMsg", + "An error has ocurred initializing the VPN: {Err}" + ], + "message": "An error has ocurred initializing the VPN: {Err}", + "translation": "Произошла ошибка при инициализации VPN: {Err}", + "placeholders": [ + { + "id": "Err", + "string": "%[1]v", + "type": "error", + "underlyingType": "interface{Error() string}", + "argNum": 1, + "expr": "err" + } + ] + }, + { + "id": [ + "donationText", + "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?" + ], + "message": "The {ApplicationName} service is expensive to run. Because we don't want to store personal information about you, there is no accounts or billing for this service. But if you want the service to continue, donate at least $5 each month.\n\t\nDo you want to donate now?", + "translation": "Сервис {ApplicationName} требует значительных затрат. Поскольку мы не хотим хранить личную информацию о вас, в этом сервисе нет ни аккаунтов, ни счетов. Если вы хотите, чтобы мы продолжали свою работу, мы убедительно просим вас жертвовать не менее 5 долларов в месяц.\n\t\nВы хотите пожертвовать сейчас?", + "placeholders": [ + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "config.ApplicationName" + } + ] + }, + { + "id": "Donate", + "message": "Donate", + "translation": "Сделать пожертвование" + }, + { + "id": [ + "aboutText", + "{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 {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} это простой, быстрый и безопасный VPN-сервис от {Provider}. {ApplicationName} не требует регистрации, не ведет журналы или каким-либо другим способом не отслеживает вас.\n\t \nНаш сервис существует только на пожертвования от таких пользователей, как вы. Пожалуйста, поддержите нас тут {DonateURL}.\n\t\t\nИспользуя это приложение, вы соглашаетесь с Условиями использования, доступными по адресу {TosURL}. Этот сервис предоставляется как есть, без каких-либо гарантий и предназначен для людей, которые работают, чтобы сделать этот мир лучше.\n\n\n{ApplicationName_1} версия: {Version}", + "placeholders": [ + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "config.ApplicationName" + }, + { + "id": "Provider", + "string": "%[2]s", + "type": "string", + "underlyingType": "string", + "argNum": 2, + "expr": "config.Provider" + }, + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "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", + "string": "%[1]v", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "config.ApplicationName" + }, + { + "id": "Version", + "string": "%[5]s", + "type": "string", + "underlyingType": "string", + "argNum": 5, + "expr": "version" + } + ] + }, + { + "id": "About", + "message": "About", + "translation": "О приложении" + }, + { + "id": "Initialization error", + "message": "Initialization error", + "translation": "Ошибка инициализации" + }, + { + "id": [ + "missingAuthAgent", + "Could not find a polkit authentication agent. Please run one and try again." + ], + "message": "Could not find a polkit authentication agent. Please run one and try again.", + "translation": "Не удалось найти агент проверки подлинности polkit. Пожалуйста, запустите один и попробуйте снова." + }, + { + "id": "Missing authentication agent", + "message": "Missing authentication agent", + "translation": "Отсутствует агент аутентификации" + }, + { + "id": [ + "errorStartingVPN", + "Can't connect to {ApplicationName}: {Err}" + ], + "message": "Can't connect to {ApplicationName}: {Err}", + "translation": "Не удается подключиться к {ApplicationName}: {Err}", + "placeholders": [ + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "config.ApplicationName" + }, + { + "id": "Err", + "string": "%[2]v", + "type": "error", + "underlyingType": "interface{Error() string}", + "argNum": 2, + "expr": "err" + } + ] + }, + { + "id": "Error starting VPN", + "message": "Error starting VPN", + "translation": "Ошибка запуска VPN" + }, + { + "id": "Checking status...", + "message": "Checking status...", + "translation": "Проверка статуса..." + }, + { + "id": "Turn on", + "message": "Turn on", + "translation": "Включить" + }, + { + "id": "Turn off", + "message": "Turn off", + "translation": "Выключить" + }, + { + "id": "Help...", + "message": "Help...", + "translation": "Помощь..." + }, + { + "id": "Donate...", + "message": "Donate...", + "translation": "Сделать пожертвование..." + }, + { + "id": "About...", + "message": "About...", + "translation": "О приложении..." + }, + { + "id": "Quit", + "message": "Quit", + "translation": "Выход" + }, + { + "id": "Route traffic through", + "message": "Route traffic through", + "translation": "Маршрут трафика через" + }, + { + "id": "Use {ApplicationName} {City} gateway", + "message": "Use {ApplicationName} {City} gateway", + "translation": "Используется шлюз {ApplicationName} {City}", + "placeholders": [ + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "config.ApplicationName" + }, + { + "id": "City", + "string": "%[2]v", + "type": "string", + "underlyingType": "string", + "argNum": 2, + "expr": "city" + } + ] + }, + { + "id": "{ApplicationName} on", + "message": "{ApplicationName} on", + "translation": "{ApplicationName} вкл.", + "placeholders": [ + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "config.ApplicationName" + } + ] + }, + { + "id": "{ApplicationName} off", + "message": "{ApplicationName} off", + "translation": "{ApplicationName} выкл.", + "placeholders": [ + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "config.ApplicationName" + } + ] + }, + { + "id": "Cancel", + "message": "Cancel", + "translation": "Отменить" + }, + { + "id": "Connecting to {ApplicationName}", + "message": "Connecting to {ApplicationName}", + "translation": "Подключение к {ApplicationName}", + "placeholders": [ + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "config.ApplicationName" + } + ] + }, + { + "id": "Stopping {ApplicationName}", + "message": "Stopping {ApplicationName}", + "translation": "Остановка {ApplicationName}", + "placeholders": [ + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "config.ApplicationName" + } + ] + }, + { + "id": "Reconnect", + "message": "Reconnect", + "translation": "Переподключить" + }, + { + "id": "{ApplicationName} blocking internet", + "message": "{ApplicationName} blocking internet", + "translation": "{ApplicationName} блокировка интернета", + "placeholders": [ + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "config.ApplicationName" + } + ] + } + ] +} diff --git a/pkg/systray/systray.go b/pkg/systray/systray.go index 20cee44..a575568 100644 --- a/pkg/systray/systray.go +++ b/pkg/systray/systray.go @@ -67,6 +67,11 @@ func (bt *bmTray) onReady() { bt.mStatus = systray.AddMenuItem(printer.Sprintf("Checking status..."), "") bt.mStatus.Disable() + bt.waitCh <- true +} + +func (bt *bmTray) setUpSystray() { + printer := bt.conf.Printer bt.mTurnOn = systray.AddMenuItem(printer.Sprintf("Turn on"), "") bt.mTurnOn.Hide() bt.mTurnOff = systray.AddMenuItem(printer.Sprintf("Turn off"), "") @@ -83,7 +88,6 @@ func (bt *bmTray) onReady() { systray.AddSeparator() bt.mQuit = systray.AddMenuItem(printer.Sprintf("Quit"), "") - bt.waitCh <- true } func (bt *bmTray) loop(bm bitmask.Bitmask, notify *notificator, as bitmask.Autostart) { @@ -93,6 +97,7 @@ func (bt *bmTray) loop(bm bitmask.Bitmask, notify *notificator, as bitmask.Autos bt.bm = bm bt.notify = notify bt.autostart = as + bt.setUpSystray() signalCh := make(chan os.Signal, 1) signal.Notify(signalCh, os.Interrupt) |