From ff36a0359c4a1e0053ff43c6f0efbe075894612a Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Wed, 10 Oct 2018 14:15:55 -0500 Subject: [feat] improve readability of errors Let's not report 'bitmaskd is not running' in standalone mode. - Resolves: #35 --- locales/en-US/messages.gotext.json | 48 +++++++++++++++++++++++++------------- locales/es-ES/messages.gotext.json | 42 ++++++++++++++++++++++----------- locales/pt-BR/messages.gotext.json | 22 ++++++++--------- 3 files changed, 72 insertions(+), 40 deletions(-) (limited to 'locales') diff --git a/locales/en-US/messages.gotext.json b/locales/en-US/messages.gotext.json index f8e5f0b..64b812f 100644 --- a/locales/en-US/messages.gotext.json +++ b/locales/en-US/messages.gotext.json @@ -1,6 +1,16 @@ { "language": "en-US", "messages": [ + { + "id": [ + "notRunning", + "Is bitmaskd running? Start bitmask and try again." + ], + "message": "Is bitmaskd running? Start bitmask and try again.", + "translation": "Is bitmaskd running? Start bitmask and try again.", + "translatorComment": "Copied from source.", + "fuzzy": true + }, { "id": [ "donationText", @@ -31,9 +41,9 @@ { "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 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} version: {Version}" + "{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 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 riseup.net. {ApplicationName} does not require a user account, keep logs, or track you in any way.\n\t \nThis service 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} 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 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 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} version: {Version}", "translatorComment": "Copied from source.", "placeholders": [ @@ -45,6 +55,22 @@ "argNum": 1, "expr": "applicationName" }, + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "applicationName" + }, + { + "id": "ApplicationName_1", + "string": "%[1]v", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "applicationName" + }, { "id": "Version", "string": "%[2]s", @@ -64,19 +90,9 @@ "fuzzy": true }, { - "id": [ - "notRunning", - "Is bitmaskd running? Start bitmask and try again." - ], - "message": "Is bitmaskd running? Start bitmask and try again.", - "translation": "Is bitmaskd running? Start bitmask and try again.", - "translatorComment": "Copied from source.", - "fuzzy": true - }, - { - "id": "Can't contact bitmask", - "message": "Can't contact bitmask", - "translation": "Can't contact bitmask", + "id": "Initialize error", + "message": "Initialize error", + "translation": "Initialize error", "translatorComment": "Copied from source.", "fuzzy": true }, @@ -316,4 +332,4 @@ "fuzzy": true } ] -} +} \ No newline at end of file diff --git a/locales/es-ES/messages.gotext.json b/locales/es-ES/messages.gotext.json index 3733962..d227fba 100644 --- a/locales/es-ES/messages.gotext.json +++ b/locales/es-ES/messages.gotext.json @@ -1,6 +1,14 @@ { "language": "es-ES", "messages": [ + { + "id": [ + "notRunning", + "Is bitmaskd running? Start bitmask and try again." + ], + "message": "Is bitmaskd running? Start bitmask and try again.", + "translation": "¿Está corriendo bitmaskd? Arranca bitmask y prueba de nuevo." + }, { "id": [ "donationText", @@ -27,9 +35,9 @@ { "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 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} version: {Version}" + "{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 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 riseup.net. {ApplicationName} does not require a user account, keep logs, or track you in any way.\n\t \nThis service 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} 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 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 facil, rapido y seguro de riseup.net. {ApplicationName} no requiere registrar una cuenta, recoge logs ni te rastrea de ninguna manera.\n\t \nEste servicio se paga completamente por donaciones de gente como tu. Por favor dona a https://riseup.net/vpn/donate.\n\t\t\nAl usar este programa estas aceptando los Terminos de servicio disponibles en https://riseup.net/tos. Este servicio se ofrece tal cual, sin garantia y con la intencion de la gente que trabaja en el de hacer el mundo un mejor lugar.\n\n\n{ApplicationName} version: {Version}", "placeholders": [ { @@ -40,6 +48,22 @@ "argNum": 1, "expr": "applicationName" }, + { + "id": "ApplicationName", + "string": "%[1]s", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "applicationName" + }, + { + "id": "ApplicationName_1", + "string": "%[1]v", + "type": "string", + "underlyingType": "string", + "argNum": 1, + "expr": "applicationName" + }, { "id": "Version", "string": "%[2]s", @@ -56,17 +80,9 @@ "translation": "Acerca de" }, { - "id": [ - "notRunning", - "Is bitmaskd running? Start bitmask and try again." - ], - "message": "Is bitmaskd running? Start bitmask and try again.", - "translation": "¿Está corriendo bitmaskd? Arranca bitmask y prueba de nuevo." - }, - { - "id": "Can't contact bitmask", - "message": "Can't contact bitmask", - "translation": "No se pudo contactar con bitmask" + "id": "Initialize error", + "message": "Initialize error", + "translation": "Problema arrancando" }, { "id": [ diff --git a/locales/pt-BR/messages.gotext.json b/locales/pt-BR/messages.gotext.json index 3f6359c..7a0428f 100644 --- a/locales/pt-BR/messages.gotext.json +++ b/locales/pt-BR/messages.gotext.json @@ -1,6 +1,14 @@ { "language": "pt-BR", "messages": [ + { + "id": [ + "notRunning", + "Is bitmaskd running? Start bitmask and try again." + ], + "message": "Is bitmaskd running? Start bitmask and try again.", + "translation": "Você tem certeza que bitmaskd está sendo executado? Inicie o bitmask e tente novamente." + }, { "id": [ "donationText", @@ -72,17 +80,9 @@ "translation": "" }, { - "id": [ - "notRunning", - "Is bitmaskd running? Start bitmask and try again." - ], - "message": "Is bitmaskd running? Start bitmask and try again.", - "translation": "Você tem certeza que bitmaskd está sendo executado? Inicie o bitmask e tente novamente." - }, - { - "id": "Can't contact bitmask", - "message": "Can't contact bitmask", - "translation": "Não foi possível se comunicar com bitmask" + "id": "Initialize error", + "message": "Initialize error", + "translation": "" }, { "id": [ -- cgit v1.2.3