diff --git a/locales/bn/messages.gotext.json b/locales/bn/messages.gotext.json
index 9bcbb297e9f95d2515d20193b22002b69fb721f7..582f92a3d2eeb43d64ce6a778e78b61911c2e9fd 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 b4cacaab8ab08feb08c56ccde4a21aaae1ebf48a..9e419459f7713213f296dea0f656d0ed4e2a9515 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 d8e72cc4954d57a5f6071350ca82b5072e53aded..aa6dbd4e9459ddd6347bb98c69c55b3cae88db47 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 0cf3e1ee1bd6541df51a0cc3443226ff51c33d36..432994e195d42e56449a46559802d22745e4e1d0 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 dc4f16fbbd6ce49fc556163e327da6d607d158e2..204aad1c7e378ea5bfbdbbd17942db4d33a1adb4 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 718898d1630f721ff43aaa775fc1a6e2f7080010..877baf98be02e639b286405aa3df9139518055da 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 601ba138fab9fa7b62a321a26592444020b50422..44b336e7c5bc1393fed016c0b0e67fd2e3130de8 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 296f77e321c11b57af5903cecd784e9504940301..56712fe2e06a7c754cfe8ef10031b2ff4a8d1062 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 b83033cabe456e27039efd4fcc10c5e7fe29d6cd..18c84571dd5221f3ce42c2dc7268ee26f1725796 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 0000000000000000000000000000000000000000..70901abffa85a4990e7bf7412d16d7dd8f5e78a3
--- /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 20cee440db2823cf27c8d54fccbbccbc7b78ef4d..a57556870805b9468dbacd78a7f05af3fc3c5ea6 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)