Merge remote-tracking branch 'upstream/master'

README.md

@@ -30,6 +30,7 @@ Depending on how you have configured your system and Docker you may need to prep
 * Download Mailtrain files using git: `git clone git://github.com/Mailtrain-org/mailtrain.git` (or download [zipped repo](https://github.com/Mailtrain-org/mailtrain/archive/master.zip)) and open Mailtrain folder `cd mailtrain`
 * Copy the file `docker-compose.override.yml.tmpl` to `docker-compose.override.yml` and modify it if you need to.
 * Bring up the stack with: `docker-compose up -d`
+* Start: `docker-compose start`
 * Open [http://localhost:3000/](http://localhost:3000/) (change the host name `localhost` to the name of the host where you are deploying the system).
 * Authenticate as user `admin` with password `test`
 * Navigate to [http://localhost:3000/settings](http://localhost:3000/settings) and update service configuration.
@@ -58,4 +59,4 @@ For more information, please [read the docs](http://docs.mailtrain.org/).
   * Versions 1.22.0 and up **GPL-V3.0**
   * Versions 1.21.0 and up: **EUPL-1.1**
   * Versions 1.19.0 and up: **MIT**
-  * Up to versions 1.18.0 **GPL-V3.0**
+  * Up to versions 1.18.0 **GPL-V3.0**

languages/de_DE.po

@@ -3488,11 +3488,11 @@ msgid "Could not save subscription"
 msgstr "Abonnement konnte nicht gespeichert werden"
 
 #: lib/models/subscriptions.js:441 lib/models/subscriptions.js:471
-msgid "Missing Subbscription ID"
+msgid "Missing Subscription ID"
 msgstr "Abonnement-ID fehlt"
 
 #: lib/models/subscriptions.js:499
-msgid "Missing Subbscription email address"
+msgid "Missing Subscription email address"
 msgstr "Abonnement-E-Mail-Adresse fehlt"
 
 #: lib/models/subscriptions.js:578 lib/models/subscriptions.js:827

languages/es_ES.po

@@ -3614,18 +3614,14 @@ msgstr "El segmento especificado no se encontra"
 msgid "Selected rule not found"
 msgstr "La regla seleccionada no se encontra"
 
-#: lib/models/subscriptions.js:254 lib/models/subscriptions.js:284
+#: lib/models/subscriptions.js:254 lib/models/subscriptions.js:284 lib/models/subscriptions.js:391
-msgid "Missing Subbscription ID"
+msgid "Missing Subscription ID"
 msgstr "Falta el ID de Suscripción"
 
 #: lib/models/subscriptions.js:312
-msgid "Missing Subbscription email address"
+msgid "Missing Subscription email address"
 msgstr "Falta el correo electrónico de suscripción"
 
-#: lib/models/subscriptions.js:391
-msgid "Missing Subscription ID"
-msgstr "Falta el ID de suscripción"
-
 #: lib/models/subscriptions.js:567 lib/models/subscriptions.js:817
 msgid "Missing subscription ID"
 msgstr "Falta el ID de suscripción"

languages/et.po

@@ -2770,11 +2770,11 @@ msgid "Could not save subscription"
 msgstr ""
 
 #: lib/models/subscriptions.js:507 lib/models/subscriptions.js:537
-msgid "Missing Subbscription ID"
+msgid "Missing Subscription ID"
 msgstr ""
 
 #: lib/models/subscriptions.js:565
-msgid "Missing Subbscription email address"
+msgid "Missing Subscription email address"
 msgstr ""
 
 #: lib/models/subscriptions.js:644 lib/models/subscriptions.js:893

lib/models/subscriptions.js

@@ -254,7 +254,7 @@ module.exports.get = (listId, cid, callback) => {
     cid = (cid || '').toString().trim();
 
     if (!cid) {
-        return callback(new Error(_('Missing Subbscription ID')));
+        return callback(new Error(_('Missing Subscription ID')));
     }
 
     db.getConnection((err, connection) => {
@@ -284,7 +284,7 @@ module.exports.getById = (listId, id, callback) => {
     id = Number(id) || 0;
 
     if (!id) {
-        return callback(new Error(_('Missing Subbscription ID')));
+        return callback(new Error(_('Missing Subscription ID')));
     }
 
     db.getConnection((err, connection) => {
@@ -312,7 +312,7 @@ module.exports.getById = (listId, id, callback) => {
 
 module.exports.getByEmail = (listId, email, callback) => {
     if (!email) {
-        return callback(new Error(_('Missing Subbscription email address')));
+        return callback(new Error(_('Missing Subscription email address')));
     }
 
     db.getConnection((err, connection) => {