[i18n] simplify i18n strings

Let's make the application name configurable.

3 files changed, 282 insertions, 219 deletions

diff --git a/locales/en-US/messages.gotext.json b/locales/en-US/messages.gotext.json
index bb021cf..2f960cd 100644
--- a/locales/en-US/messages.gotext.json
+++ b/locales/en-US/messages.gotext.json
@@ -46,29 +46,31 @@
             "translation": "Turn on"
         },
         {
-            "id": "Turn RiseupVPN on",
-            "message": "Turn RiseupVPN on",
-            "translation": "Turn RiseupVPN on"
-        },
-        {
             "id": "Turn off",
             "message": "Turn off",
             "translation": "Turn off"
         },
         {
-            "id": "Turn RiseupVPN off",
-            "message": "Turn RiseupVPN off",
-            "translation": "Turn RiseupVPN off"
-        },
-        {
             "id": "Cancel",
             "message": "Cancel",
             "translation": "Cancel"
         },
         {
-            "id": "Cancel connection to RiseupVPN",
-            "message": "Cancel connection to RiseupVPN",
-            "translation": "Cancel connection to RiseupVPN"
+            "id": "Cancel connection to {ApplicationName}",
+            "message": "Cancel connection to {ApplicationName}",
+            "translation": "Cancel connection to {ApplicationName}",
+            "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ],
+            "fuzzy": true
         },
         {
             "id": "Help ...",
@@ -78,12 +80,7 @@
         {
             "id": "Donate ...",
             "message": "Donate ...",
-            "translation": "Donate ...!!!!"
-        },
-        {
-            "id": "About ...",
-            "message": "About ...",
-            "translation": "About ..."
+            "translation": "Donate ..."
         },
         {
             "id": "Quit",
@@ -91,84 +88,101 @@
             "translation": "Quit"
         },
         {
-            "id": "Quit BitmaskVPN",
-            "message": "Quit BitmaskVPN",
-            "translation": "Quit BitmaskVPN"
-        },
-        {
             "id": "Route traffic through",
             "message": "Route traffic through",
             "translation": "Route traffic through"
         },
         {
-            "id": "Use RiseupVPN {Name} gateway",
-            "message": "Use RiseupVPN {Name} gateway",
-            "translation": "Use RiseupVPN {Name} gateway",
+            "id": "Use {ApplicationName} {City} gateway",
+            "message": "Use {ApplicationName} {City} gateway",
+            "translation": "Use {ApplicationName} {City} gateway",
+            "translatorComment": "Copied from source.",
             "placeholders": [
                 {
-                    "id": "Name",
-                    "string": "%[1]v",
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "name"
+                    "expr": "applicationName"
+                },
+                {
+                    "id": "City",
+                    "string": "%[2]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "city"
                 }
-            ]
-        },
-        {
-            "id": "RiseupVPN is on",
-            "message": "RiseupVPN is on",
-            "translation": "RiseupVPN is on",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "VPN is on",
-            "message": "VPN is on",
-            "translation": "VPN is on",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "RiseupVPN is off",
-            "message": "RiseupVPN is off",
-            "translation": "RiseupVPN is off",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "VPN is off",
-            "message": "VPN is off",
-            "translation": "VPN is off",
-            "translatorComment": "Copied from source.",
+            ],
             "fuzzy": true
         },
         {
-            "id": "RiseupVPN is starting",
-            "message": "RiseupVPN is starting",
-            "translation": "RiseupVPN is starting",
+            "id": "{ApplicationName} on",
+            "message": "{ApplicationName} on",
+            "translation": "{ApplicationName} on",
             "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ],
             "fuzzy": true
         },
         {
-            "id": "VPN is starting",
-            "message": "VPN is starting",
-            "translation": "VPN is starting",
+            "id": "{ApplicationName} off",
+            "message": "{ApplicationName} off",
+            "translation": "{ApplicationName} off",
             "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ],
             "fuzzy": true
         },
         {
-            "id": "RiseupVPN is stopping",
-            "message": "RiseupVPN is stopping",
-            "translation": "RiseupVPN is stopping",
+            "id": "Connecting to {ApplicationName}",
+            "message": "Connecting to {ApplicationName}",
+            "translation": "Connecting to {ApplicationName}",
             "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ],
             "fuzzy": true
         },
         {
-            "id": "VPN is stopping",
-            "message": "VPN is stopping",
-            "translation": "VPN is stopping",
+            "id": "Stopping {ApplicationName}",
+            "message": "Stopping {ApplicationName}",
+            "translation": "Stopping {ApplicationName}",
             "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ],
             "fuzzy": true
         },
         {
@@ -177,18 +191,21 @@
             "translation": "Retry"
         },
         {
-            "id": "RiseupVPN is blocking internet",
-            "message": "RiseupVPN is blocking internet",
-            "translation": "RiseupVPN is blocking internet",
-            "translatorComment": "Copied from source.",
-            "fuzzy": true
-        },
-        {
-            "id": "VPN is blocking internet",
-            "message": "VPN is blocking internet",
-            "translation": "VPN is blocking internet",
+            "id": "{ApplicationName} blocking internet",
+            "message": "{ApplicationName} blocking internet",
+            "translation": "{ApplicationName} blocking internet",
             "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ],
             "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 a140b78..bf16d01 100644
--- a/locales/es-ES/messages.gotext.json
+++ b/locales/es-ES/messages.gotext.json
@@ -38,29 +38,29 @@
             "translation": "Encender"
         },
         {
-            "id": "Turn RiseupVPN on",
-            "message": "Turn RiseupVPN on",
-            "translation": "Enciende RiseupVPN"
-        },
-        {
             "id": "Turn off",
             "message": "Turn off",
             "translation": "Apagar"
         },
         {
-            "id": "Turn RiseupVPN off",
-            "message": "Turn RiseupVPN off",
-            "translation": "Apaga RiseupVPN"
-        },
-        {
             "id": "Cancel",
             "message": "Cancel",
             "translation": "Cancelar"
         },
         {
-            "id": "Cancel connection to RiseupVPN",
-            "message": "Cancel connection to RiseupVPN",
-            "translation": "Cancela la conexión a RiseupVPN"
+            "id": "Cancel connection to {ApplicationName}",
+            "message": "Cancel connection to {ApplicationName}",
+            "translation": "Cancela la conexión a {ApplicationName}",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         },
         {
             "id": "Help ...",
@@ -73,79 +73,97 @@
             "translation": "Dona ..."
         },
         {
-            "id": "About ...",
-            "message": "About ...",
-            "translation": "Acerca de ..."
-        },
-        {
             "id": "Quit",
             "message": "Quit",
             "translation": "Cerrar"
         },
         {
-            "id": "Quit BitmaskVPN",
-            "message": "Quit BitmaskVPN",
-            "translation": "Cerrar BitmaskVPN"
-        },
-        {
             "id": "Route traffic through",
             "message": "Route traffic through",
             "translation": "Salir a través de"
         },
         {
-            "id": "Use RiseupVPN {Name} gateway",
-            "message": "Use RiseupVPN {Name} gateway",
-            "translation": "Usa la salida de RiseupVPN por {Name}",
+            "id": "Use {ApplicationName} {City} gateway",
+            "message": "Use {ApplicationName} {City} gateway",
+            "translation": "Usa la salida de {ApplicationName} por {City}",
             "placeholders": [
                 {
-                    "id": "Name",
-                    "string": "%[1]v",
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "name"
+                    "expr": "applicationName"
+                },
+                {
+                    "id": "City",
+                    "string": "%[2]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "city"
                 }
             ]
         },
         {
-            "id": "RiseupVPN is on",
-            "message": "RiseupVPN is on",
-            "translation": "RiseupVPN esta encendida"
-        },
-        {
-            "id": "VPN is on",
-            "message": "VPN is on",
-            "translation": "VPN encendida"
-        },
-        {
-            "id": "RiseupVPN is off",
-            "message": "RiseupVPN is off",
-            "translation": "RiseupVPN esta apagada"
-        },
-        {
-            "id": "VPN is off",
-            "message": "VPN is off",
-            "translation": "VPN apagada"
-        },
-        {
-            "id": "RiseupVPN is starting",
-            "message": "RiseupVPN is starting",
-            "translation": "RiseupVPN esta arrancando"
+            "id": "{ApplicationName} on",
+            "message": "{ApplicationName} on",
+            "translation": "{ApplicationName} encendida",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         },
         {
-            "id": "VPN is starting",
-            "message": "VPN is starting",
-            "translation": "VPN arrancando"
+            "id": "{ApplicationName} off",
+            "message": "{ApplicationName} off",
+            "translation": "{ApplicationName} apagada",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         },
         {
-            "id": "RiseupVPN is stopping",
-            "message": "RiseupVPN is stopping",
-            "translation": "RiseupVPN esta apagando"
+            "id": "Connecting to {ApplicationName}",
+            "message": "Connecting to {ApplicationName}",
+            "translation": "Connectando a {ApplicationName}",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         },
         {
-            "id": "VPN is stopping",
-            "message": "VPN is stopping",
-            "translation": "VPN apagando"
+            "id": "Stopping {ApplicationName}",
+            "message": "Stopping {ApplicationName}",
+            "translation": "Desconnectando de {ApplicationName}",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         },
         {
             "id": "Retry",
@@ -153,14 +171,19 @@
             "translation": "Reintentar"
         },
         {
-            "id": "RiseupVPN is blocking internet",
-            "message": "RiseupVPN is blocking internet",
-            "translation": "RiseupVPN esta bloqueando internet"
-        },
-        {
-            "id": "VPN is blocking internet",
-            "message": "VPN is blocking internet",
-            "translation": "VPN bloqueando internet"
+            "id": "{ApplicationName} blocking internet",
+            "message": "{ApplicationName} blocking internet",
+            "translation": "{ApplicationName} bloqueando internet",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         }
     ]
 }
diff --git a/locales/pt-BR/messages.gotext.json b/locales/pt-BR/messages.gotext.json
index 460ef73..5ff8d9e 100644
--- a/locales/pt-BR/messages.gotext.json
+++ b/locales/pt-BR/messages.gotext.json
@@ -38,29 +38,29 @@
             "translation": "Ligar"
         },
         {
-            "id": "Turn RiseupVPN on",
-            "message": "Turn RiseupVPN on",
-            "translation": "Ligar a RiseupVPN"
-        },
-        {
             "id": "Turn off",
             "message": "Turn off",
             "translation": "Desligar"
         },
         {
-            "id": "Turn RiseupVPN off",
-            "message": "Turn RiseupVPN off",
-            "translation": "Desligar a RiseupVPN"
-        },
-        {
             "id": "Cancel",
             "message": "Cancel",
             "translation": "Cancelar"
         },
         {
-            "id": "Cancel connection to RiseupVPN",
-            "message": "Cancel connection to RiseupVPN",
-            "translation": "Cancelar a conexão à RiseupVPN"
+            "id": "Cancel connection to {ApplicationName}",
+            "message": "Cancel connection to {ApplicationName}",
+            "translation": "Cancelar a conexão à {ApplicationName}",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         },
         {
             "id": "Help ...",
@@ -73,79 +73,97 @@
             "translation": "Fazer uma doação ..."
         },
         {
-            "id": "About ...",
-            "message": "About ...",
-            "translation": "Sobre ..."
-        },
-        {
             "id": "Quit",
             "message": "Quit",
             "translation": "Fechar"
         },
         {
-            "id": "Quit BitmaskVPN",
-            "message": "Quit BitmaskVPN",
-            "translation": "Fechar BitmaskVPN"
-        },
-        {
             "id": "Route traffic through",
             "message": "Route traffic through",
             "translation": "Rotear o tráfego através de"
         },
         {
-            "id": "Use RiseupVPN {Name} gateway",
-            "message": "Use RiseupVPN {Name} gateway",
-            "translation": "Usar o gateway {Name} da RiseupVPN",
+            "id": "Use {ApplicationName} {City} gateway",
+            "message": "Use {ApplicationName} {City} gateway",
+            "translation": "Usar o gateway {City} da {ApplicationName}",
             "placeholders": [
                 {
-                    "id": "Name",
-                    "string": "%[1]v",
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
                     "type": "string",
                     "underlyingType": "string",
                     "argNum": 1,
-                    "expr": "name"
+                    "expr": "applicationName"
+                },
+                {
+                    "id": "City",
+                    "string": "%[2]v",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 2,
+                    "expr": "city"
                 }
             ]
         },
         {
-            "id": "RiseupVPN is on",
-            "message": "RiseupVPN is on",
-            "translation": "RiseupVPN está ligada"
-        },
-        {
-            "id": "VPN is on",
-            "message": "VPN is on",
-            "translation": "A VPN está ligada"
-        },
-        {
-            "id": "RiseupVPN is off",
-            "message": "RiseupVPN is off",
-            "translation": "RiseupVPN está desligada"
-        },
-        {
-            "id": "VPN is off",
-            "message": "VPN is off",
-            "translation": "A VPN está desligada"
-        },
-        {
-            "id": "RiseupVPN is starting",
-            "message": "RiseupVPN is starting",
-            "translation": "RiseupVPN está sendo iniciada"
+            "id": "{ApplicationName} on",
+            "message": "{ApplicationName} on",
+            "translation": "{ApplicationName} está ligada",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         },
         {
-            "id": "VPN is starting",
-            "message": "VPN is starting",
-            "translation": "A VPN está sendo iniciada"
+            "id": "{ApplicationName} off",
+            "message": "{ApplicationName} off",
+            "translation": "{ApplicationName} está desligada",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         },
         {
-            "id": "RiseupVPN is stopping",
-            "message": "RiseupVPN is stopping",
-            "translation": "RiseupVPN está sendo parada"
+            "id": "Connecting to {ApplicationName}",
+            "message": "Connecting to {ApplicationName}",
+            "translation": "A {ApplicationName} está sendo iniciada",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         },
         {
-            "id": "VPN is stopping",
-            "message": "VPN is stopping",
-            "translation": "A VPN está sendo parada"
+            "id": "Stopping {ApplicationName}",
+            "message": "Stopping {ApplicationName}",
+            "translation": "A {ApplicationName} está sendo parada",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         },
         {
             "id": "Retry",
@@ -153,14 +171,19 @@
             "translation": "Tentar novamente"
         },
         {
-            "id": "RiseupVPN is blocking internet",
-            "message": "RiseupVPN is blocking internet",
-            "translation": "RiseupVPN está bloqueando a Internet"
-        },
-        {
-            "id": "VPN is blocking internet",
-            "message": "VPN is blocking internet",
-            "translation": "A VPN está bloqueando a Internet"
+            "id": "{ApplicationName} blocking internet",
+            "message": "{ApplicationName} blocking internet",
+            "translation": "{ApplicationName} está bloqueando a Internet",
+            "placeholders": [
+                {
+                    "id": "ApplicationName",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "applicationName"
+                }
+            ]
         }
     ]
 }