From ff36a0359c4a1e0053ff43c6f0efbe075894612a Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
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 +++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 16 deletions(-)

(limited to 'locales/en-US')

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
-- 
cgit v1.2.3