diff --git a/dev/Sieve/Model/Abstract.js b/dev/Sieve/Model/Abstract.js
index b34858a7d..70447413a 100644
--- a/dev/Sieve/Model/Abstract.js
+++ b/dev/Sieve/Model/Abstract.js
@@ -82,11 +82,9 @@ export class AbstractModel {
}
revivePropertiesFromJson(json) {
- let model = this.constructor;
- if (!model.validJson(json)) {
- return false;
- }
- forEachObjectEntry(json, (key, value) => {
+ const model = this.constructor,
+ valid = model.validJson(json);
+ valid && forEachObjectEntry(json, (key, value) => {
if ('@' !== key[0]) try {
key = key[0].toLowerCase() + key.slice(1);
switch (typeof this[key])
@@ -104,9 +102,12 @@ export class AbstractModel {
case 'string':
this[key] = typeCast(this[key], value);
break;
- // fall through
case 'undefined':
- default:
+ console.log(`Undefined ${model.name}.${key} not set`);
+// this[key] = value;
+ break;
+// default:
+// console.log((typeof this[key])+` ${model.name}.${key} not revived`);
// console.log((typeof this[key])+' '+(model.name)+'.'+key+' not revived');
}
} catch (e) {
@@ -114,7 +115,7 @@ export class AbstractModel {
console.error(e);
}
});
- return true;
+ return valid;
}
}
diff --git a/dev/Sieve/Model/Filter.js b/dev/Sieve/Model/Filter.js
index 7e5f48588..f5239405e 100644
--- a/dev/Sieve/Model/Filter.js
+++ b/dev/Sieve/Model/Filter.js
@@ -53,10 +53,10 @@ export class FilterModel extends AbstractModel {
actionValueFourth: '',
actionValueFourthError: false,
- actionMarkAsRead: false,
+ markAsRead: false,
- actionKeep: true,
- actionNoStop: false,
+ keep: true,
+ stop: true,
actionType: FilterAction.MoveTo
});
@@ -181,24 +181,24 @@ export class FilterModel extends AbstractModel {
return true;
}
- toJson() {
+ toJSON() {
return {
// '@Object': 'Object/Filter',
ID: this.id,
Enabled: this.enabled() ? 1 : 0,
- Name: this.name(),
- Conditions: this.conditions.map(item => item.toJson()),
- ConditionsType: this.conditionsType(),
+ Name: this.name,
+ Conditions: this.conditions,
+ ConditionsType: this.conditionsType,
ActionType: this.actionType(),
- ActionValue: this.actionValue(),
- ActionValueSecond: this.actionValueSecond(),
- ActionValueThird: this.actionValueThird(),
- ActionValueFourth: this.actionValueFourth(),
+ ActionValue: this.actionValue,
+ ActionValueSecond: this.actionValueSecond,
+ ActionValueThird: this.actionValueThird,
+ ActionValueFourth: this.actionValueFourth,
- Keep: this.actionKeep() ? 1 : 0,
- Stop: this.actionNoStop() ? 0 : 1,
- MarkAsRead: this.actionMarkAsRead() ? 1 : 0
+ Keep: this.keep() ? 1 : 0,
+ Stop: this.stop() ? 1 : 0,
+ MarkAsRead: this.markAsRead() ? 1 : 0
};
}
@@ -216,15 +216,14 @@ export class FilterModel extends AbstractModel {
* @returns {?FilterModel}
*/
static reviveFromJson(json) {
+ json.id = json.ID;
+ delete json.ID;
const filter = super.reviveFromJson(json);
if (filter) {
filter.id = '' + (filter.id || '');
filter.conditions(
(json.Conditions || []).map(aData => FilterConditionModel.reviveFromJson(aData)).filter(v => v)
);
- filter.actionKeep(0 != json.Keep);
- filter.actionNoStop(0 == json.Stop);
- filter.actionMarkAsRead(1 == json.MarkAsRead);
}
return filter;
}
@@ -241,7 +240,7 @@ export class FilterModel extends AbstractModel {
filter.conditionsType(this.conditionsType());
- filter.actionMarkAsRead(this.actionMarkAsRead());
+ filter.markAsRead(this.markAsRead());
filter.actionType(this.actionType());
@@ -252,8 +251,8 @@ export class FilterModel extends AbstractModel {
filter.actionValueThird(this.actionValueThird());
filter.actionValueFourth(this.actionValueFourth());
- filter.actionKeep(this.actionKeep());
- filter.actionNoStop(this.actionNoStop());
+ filter.keep(this.keep());
+ filter.stop(this.stop());
filter.conditions(this.conditions.map(item => item.cloneSelf()));
diff --git a/dev/Sieve/Model/FilterCondition.js b/dev/Sieve/Model/FilterCondition.js
index 5ee0806aa..8e54cff69 100644
--- a/dev/Sieve/Model/FilterCondition.js
+++ b/dev/Sieve/Model/FilterCondition.js
@@ -81,13 +81,13 @@ export class FilterConditionModel extends AbstractModel {
// static reviveFromJson(json) {}
- toJson() {
+ toJSON() {
return {
// '@Object': 'Object/FilterCondition',
- Field: this.field(),
- Type: this.type(),
- Value: this.value(),
- ValueSecond: this.valueSecond()
+ Field: this.field,
+ Type: this.type,
+ Value: this.value,
+ ValueSecond: this.valueSecond
};
}
diff --git a/dev/Sieve/Model/Script.js b/dev/Sieve/Model/Script.js
index ed559348a..abce7e1b2 100644
--- a/dev/Sieve/Model/Script.js
+++ b/dev/Sieve/Model/Script.js
@@ -125,7 +125,7 @@ function filtersToSieveScript(filters)
// actions
block ? result.push('{') : (sTab = '');
- if (filter.actionMarkAsRead() && ['None','MoveTo','Forward'].includes(filter.actionType())) {
+ if (filter.markAsRead() && ['None','MoveTo','Forward'].includes(filter.actionType())) {
require.imap4flags = 1;
result.push(sTab + 'addflag "\\\\Seen";');
}
@@ -182,7 +182,7 @@ function filtersToSieveScript(filters)
break; }
case 'Forward':
if (value) {
- if (filter.actionKeep()) {
+ if (filter.keep()) {
require.fileinto = 1;
result.push(sTab + 'fileinto "INBOX";');
}
@@ -201,7 +201,7 @@ function filtersToSieveScript(filters)
break;
}
- filter.actionNoStop() || result.push(sTab + 'stop;');
+ filter.stop() && result.push(sTab + 'stop;');
block && result.push('}');
@@ -213,7 +213,7 @@ function filtersToSieveScript(filters)
'/*',
'BEGIN:FILTER:' + filter.id,
'BEGIN:HEADER',
- btoa(unescape(encodeURIComponent(JSON.stringify(filter.toJson())))).match(split).join(eol) + 'END:HEADER',
+ btoa(unescape(encodeURIComponent(JSON.stringify(filter)))).match(split).join(eol) + 'END:HEADER',
'*/',
filter.enabled() ? '' : '/* @Filter is disabled ',
filterToString(filter, require),
@@ -290,13 +290,12 @@ export class SieveScriptModel extends AbstractModel
return !this.nameError();
}
- toJson() {
+ toJSON() {
return {
- name: this.name(),
- active: this.active() ? 1 : 0,
- body: this.body()
+ name: this.name,
+ active: this.active,
+ body: this.body
// body: this.allowFilters() ? this.body() : this.filtersToRaw()
-// filters: this.filters.map(item => item.toJson())
};
}
@@ -316,13 +315,7 @@ export class SieveScriptModel extends AbstractModel
const script = super.reviveFromJson(json);
if (script) {
if (script.allowFilters()) {
- script.filters(
- Array.isArray(json.filters) && json.filters.length
- ? json.filters.map(aData => FilterModel.reviveFromJson(aData)).filter(v => v)
- : sieveScriptToFilters(script.body())
- );
- } else {
- script.filters([]);
+ script.filters(sieveScriptToFilters(script.body()));
}
script.canBeDeleted(SIEVE_FILE_NAME !== json.name);
script.exists(true);
diff --git a/dev/Sieve/View/Script.js b/dev/Sieve/View/Script.js
index 615451b61..edae504a1 100644
--- a/dev/Sieve/View/Script.js
+++ b/dev/Sieve/View/Script.js
@@ -86,7 +86,7 @@ export class SieveScriptPopupView extends rl.pluginPopupView {
// this.close();
}
},
- script.toJson()
+ script.toJSON()
);
}
}
diff --git a/dev/Styles/Admin/Layout.less b/dev/Styles/Admin/Layout.less
index 383ade99a..351630c4d 100644
--- a/dev/Styles/Admin/Layout.less
+++ b/dev/Styles/Admin/Layout.less
@@ -95,6 +95,7 @@
@media screen and (max-width: 999px) {
#rl-settings-subscreen {
padding: 10px;
+ margin-right: 0;
}
#rl-right {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
index de141825c..2334c6910 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
@@ -66,8 +66,7 @@ class SieveStorage implements FiltersInterface
'@Object' => 'Object/SieveScript',
'name' => self::SIEVE_FILE_NAME,
'active' => false,
- 'body' => '',
- 'filters' => []
+ 'body' => ''
);
}
}
diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
index ac7d4445e..c2e1352cd 100644
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "تعليمها بـ مقروءة",
"REPLY_INTERVAL_LABEL": "فترة الرد (بلأيام)",
"KEEP_LABEL": "الإحتفاظ بها",
- "STOP_LABEL": "لاتتوقف عن المعالجة بالشروط",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "الموضوع (خياري)",
"VACATION_MESSAGE_LABEL": "الرسالة",
"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
index 6d7aa9196..c556e26c9 100644
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Отбележи като прочетено",
"REPLY_INTERVAL_LABEL": "За колко време (дни)",
"KEEP_LABEL": "Запази",
- "STOP_LABEL": "Да не спира да обработва правилата",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Тема (незадължително)",
"VACATION_MESSAGE_LABEL": "Съобщение",
"VACATION_RECIPIENTS_LABEL": "Получатели (разделени със запетая)",
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
index 8a7b70591..5d23d27a1 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Odznačit jako přečtené",
"REPLY_INTERVAL_LABEL": "Interval odpovědi (dny)",
"KEEP_LABEL": "Zachovat",
- "STOP_LABEL": "Neukončovat zpracování pravidel",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Předmět (volitelný)",
"VACATION_MESSAGE_LABEL": "Zpráva",
"VACATION_RECIPIENTS_LABEL": "Příjemci (odděleni čárkou)",
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json
index 8ccd48508..6e19c7fea 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Markér som læst",
"REPLY_INTERVAL_LABEL": "Svarinterval (dage)",
"KEEP_LABEL": "Behold",
- "STOP_LABEL": "Forsæt med at tjekke regler",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Emne (valgfrit)",
"VACATION_MESSAGE_LABEL": "Meddelelse",
"VACATION_RECIPIENTS_LABEL": "Modtagere (kommaseparerede)",
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json
index e34d8e410..950214cef 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Als Gelesen markieren",
"REPLY_INTERVAL_LABEL": "Antwortintervall (Tage)",
"KEEP_LABEL": "Behalten",
- "STOP_LABEL": "Weiterverarbeitung der Regeln nicht verhindern",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Betreff (optional)",
"VACATION_MESSAGE_LABEL": "Nachricht",
"VACATION_RECIPIENTS_LABEL": "Empfänger (durch Komma getrennt)",
diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json
index b32a71bde..1409889f8 100644
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Σήμανε σαν διαβασμένο",
"REPLY_INTERVAL_LABEL": "Μεσοδιάστημα απαντήσεων (σε ημέρες)",
"KEEP_LABEL": "Κράτησε",
- "STOP_LABEL": "Μην σταματάς να επεξεργάζεσαι κανόνες",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Θέμα (προαιρετικό)",
"VACATION_MESSAGE_LABEL": "Μήνυμα",
"VACATION_RECIPIENTS_LABEL": "Παραλήπτες (χωρισμένοι με κόμμα)",
diff --git a/snappymail/v/0.0.0/app/localization/en-GB/user.json b/snappymail/v/0.0.0/app/localization/en-GB/user.json
index 75adf45b6..ee7b552f5 100644
--- a/snappymail/v/0.0.0/app/localization/en-GB/user.json
+++ b/snappymail/v/0.0.0/app/localization/en-GB/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Mark as read",
"REPLY_INTERVAL_LABEL": "Reply interval (days)",
"KEEP_LABEL": "Keep",
- "STOP_LABEL": "Don't stop processing rules",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Subject (optional)",
"VACATION_MESSAGE_LABEL": "Message",
"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json
index f37651e18..acaccf816 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Mark as read",
"REPLY_INTERVAL_LABEL": "Reply interval (days)",
"KEEP_LABEL": "Keep",
- "STOP_LABEL": "Don't stop processing rules",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Subject (optional)",
"VACATION_MESSAGE_LABEL": "Message",
"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json
index 3630ea8ac..0296715b4 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Marcar como leído",
"REPLY_INTERVAL_LABEL": "Intervalo de respuesta (días)",
"KEEP_LABEL": "Mantener",
- "STOP_LABEL": "Don't stop processing rules",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Asunto (opcional)",
"VACATION_MESSAGE_LABEL": "Mensaje",
"VACATION_RECIPIENTS_LABEL": "Destinatarios (separados por coma)",
diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json
index 9d038263d..94aef2ee9 100644
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Märgi loetuks",
"REPLY_INTERVAL_LABEL": "Vastuse intervall (päevades)",
"KEEP_LABEL": "Salvesta",
- "STOP_LABEL": "Ära peata reeglite protsessimist",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Pealkiri (valikuline)",
"VACATION_MESSAGE_LABEL": "Sõnum",
"VACATION_RECIPIENTS_LABEL": "Saajad (eraldatud komaga)",
diff --git a/snappymail/v/0.0.0/app/localization/eu/user.json b/snappymail/v/0.0.0/app/localization/eu/user.json
index 68a2815e0..0231dca02 100644
--- a/snappymail/v/0.0.0/app/localization/eu/user.json
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Markatu irakurri bezala",
"REPLY_INTERVAL_LABEL": "Erantzuteko tartea (egunak)",
"KEEP_LABEL": "Mantenu",
- "STOP_LABEL": "Ez geratu arazoak prozesatzeaz",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Gaia (hautazkoa)",
"VACATION_MESSAGE_LABEL": "Mezua",
"VACATION_RECIPIENTS_LABEL": "Hartzaileak (komaz bananduta)",
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
index 99ed07385..bb6feb5bb 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "علامت بعنوان خوانده شده",
"REPLY_INTERVAL_LABEL": "دوره جواب (بر پایه روز)",
"KEEP_LABEL": "نگهداشتن",
- "STOP_LABEL": "پردازش قوانین را متوقف نکن",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "موضوع (اختیاری)",
"VACATION_MESSAGE_LABEL": "پیام",
"VACATION_RECIPIENTS_LABEL": "گیرندگان (جداسازی با , )",
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
index 934d29198..7c145c135 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Merkitse luetuksi",
"REPLY_INTERVAL_LABEL": "Vastaus intervalli (päivissä)",
"KEEP_LABEL": "Säästä",
- "STOP_LABEL": "Älä lopeta sääntöjen prosessointia",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Aihe (valinnainen)",
"VACATION_MESSAGE_LABEL": "Viesti",
"VACATION_RECIPIENTS_LABEL": "Vastaanottajat (erotettu pilkulla)",
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
index 67b8e577b..f4a83c0d1 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Marquer comme lu",
"REPLY_INTERVAL_LABEL": "Délai de réponse (jours)",
"KEEP_LABEL": "Garder",
- "STOP_LABEL": "Ne pas arrêter le traitement des règles",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Sujet (optionnel)",
"VACATION_MESSAGE_LABEL": "Message",
"VACATION_RECIPIENTS_LABEL": "Destinataires (séparés par des virgules)",
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
index 6877893c8..94343651c 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Megjelölés olvasottként",
"REPLY_INTERVAL_LABEL": "Válasz időköz (nap)",
"KEEP_LABEL": "Megtart",
- "STOP_LABEL": "Ne hagyja abba a szabályok feldolgozását",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Tárgy (nem kötelező)",
"VACATION_MESSAGE_LABEL": "Üzenet",
"VACATION_RECIPIENTS_LABEL": "Címzettek (vesszővel elválasztva)",
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json
index 1f9c15cd5..910e0733b 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Tandai sudah dibaca",
"REPLY_INTERVAL_LABEL": "Selang waktu balasan (hari)",
"KEEP_LABEL": "Tahan",
- "STOP_LABEL": "Jangan hentikan peraturan proses",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Subjek (opsional)",
"VACATION_MESSAGE_LABEL": "Pesan",
"VACATION_RECIPIENTS_LABEL": "Penerima (dipisahkan koma)",
diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json
index e181cc516..ce5553818 100644
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Merkja sem lesið",
"REPLY_INTERVAL_LABEL": "Bil milli svara (dagar)",
"KEEP_LABEL": "Halda",
- "STOP_LABEL": "Ekki hætta að vinna með reglur",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Viðfangsefni (valkvætt)",
"VACATION_MESSAGE_LABEL": "Skilaboð",
"VACATION_RECIPIENTS_LABEL": "Viðtakendur (aðgreindir með kommu)",
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json
index 793e7599e..fab768304 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Marca come letto",
"REPLY_INTERVAL_LABEL": "Intervallo di risposta (giorni)",
"KEEP_LABEL": "Mantieni",
- "STOP_LABEL": "Non interrompere l'elaborazione delle regole",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Oggetto (opzionale)",
"VACATION_MESSAGE_LABEL": "Messaggio",
"VACATION_RECIPIENTS_LABEL": "Destinatari (separati da virgola)",
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
index 05d6f01bf..7eb7dbfa4 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "既読にする",
"REPLY_INTERVAL_LABEL": "返信間隔(日)",
"KEEP_LABEL": "保持",
- "STOP_LABEL": "ルールの処理を止めない",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "件名(オプション)",
"VACATION_MESSAGE_LABEL": "メッセージ",
"VACATION_RECIPIENTS_LABEL": "受信者(カンマ区切り)",
diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
index afd366b42..83c3f6448 100644
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "읽음 표시",
"REPLY_INTERVAL_LABEL": "회신 주기 (일)",
"KEEP_LABEL": "Keep",
- "STOP_LABEL": "Don't stop processing rules",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "제목 (옵션)",
"VACATION_MESSAGE_LABEL": "메시지",
"VACATION_RECIPIENTS_LABEL": "수신인 (쉼표 분리)",
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
index 316b34a5a..2ecae82aa 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Žymėti skaitytu",
"REPLY_INTERVAL_LABEL": "Atsakymų intervalai (dienomis)",
"KEEP_LABEL": "laikyti",
- "STOP_LABEL": "Nesustoti vykdyti taisykles",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Tema (nebūtina)",
"VACATION_MESSAGE_LABEL": "Žinutė",
"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
index b42df35d0..e074418bd 100644
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Mark as read",
"REPLY_INTERVAL_LABEL": "Reply interval (days)",
"KEEP_LABEL": "Keep",
- "STOP_LABEL": "Don't stop processing rules",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Subject (optional)",
"VACATION_MESSAGE_LABEL": "Message",
"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
index db0bb23d5..b065b415d 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Merk som lest",
"REPLY_INTERVAL_LABEL": "Svar-intervall (dager)",
"KEEP_LABEL": "Behold",
- "STOP_LABEL": "Ikke slutt å bruke regler",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Emne (valgfritt)",
"VACATION_MESSAGE_LABEL": "Melding",
"VACATION_RECIPIENTS_LABEL": "Mottakere (adskilt med komma)",
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
index 9555aa6f9..b0258cf49 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Markeer als gelezen",
"REPLY_INTERVAL_LABEL": "Antwoord interval (dagen)",
"KEEP_LABEL": "Behoud",
- "STOP_LABEL": "Stop niet met uitvoeren van volgende filters",
+ "STOP_LABEL": "Stop met het uitvoeren van de volgende filters",
"VACATION_SUBJECT_LABEL": "Onderwerp (optioneel)",
"VACATION_MESSAGE_LABEL": "Bericht",
"VACATION_RECIPIENTS_LABEL": "Ontvangers (comma gescheiden)",
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
index 0821d60c4..b3326d2d2 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Oznacz jako przeczytane",
"REPLY_INTERVAL_LABEL": "Interwał odpowiedzi (dni)",
"KEEP_LABEL": "Zachowaj",
- "STOP_LABEL": "Nie zatrzymuj przetwarzania reguł",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Temat (opcjonalnie)",
"VACATION_MESSAGE_LABEL": "Wiadomość",
"VACATION_RECIPIENTS_LABEL": "Odbiorcy (rodzielone przecinkami)",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
index 3a2a1b137..eeb5d82cd 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Marcar como Lida",
"REPLY_INTERVAL_LABEL": "Responder intervalo (dias)",
"KEEP_LABEL": "Manter",
- "STOP_LABEL": "Não parar o processamento das regras",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Assunto (opcional)",
"VACATION_MESSAGE_LABEL": "Mensagem",
"VACATION_RECIPIENTS_LABEL": "Destinatários (separados por vírgulas)",
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
index ff64bb47e..d33b6c8f3 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Marcar como lida",
"REPLY_INTERVAL_LABEL": "Intervalo de resposta (dias)",
"KEEP_LABEL": "Manter",
- "STOP_LABEL": "Não parar de processar as regras",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Assunto (opcional)",
"VACATION_MESSAGE_LABEL": "Mensagem",
"VACATION_RECIPIENTS_LABEL": "Destinatários (separados por vírgula)",
diff --git a/snappymail/v/0.0.0/app/localization/pt/user.json b/snappymail/v/0.0.0/app/localization/pt/user.json
index 5404c1ae3..f259daa7a 100644
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Marcar como lida",
"REPLY_INTERVAL_LABEL": "Intervalo de resposta (dias)",
"KEEP_LABEL": "Manter",
- "STOP_LABEL": "Não parar de processar as regras",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Assunto (opcional)",
"VACATION_MESSAGE_LABEL": "Mensagem",
"VACATION_RECIPIENTS_LABEL": "Destinatários (separados por vírgula)",
diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
index 6bf64b433..acc189609 100644
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Mark as read",
"REPLY_INTERVAL_LABEL": "Reply interval (days)",
"KEEP_LABEL": "Keep",
- "STOP_LABEL": "Don't stop processing rules",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Subject (optional)",
"VACATION_MESSAGE_LABEL": "Message",
"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
index ab1d0ec7b..6e4ed74b1 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Отметить как прочитанное",
"REPLY_INTERVAL_LABEL": "Отвечать каждые (в днях)",
"KEEP_LABEL": "Сохранить копию",
- "STOP_LABEL": "Не преращать обработку правил",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Тема (необязательно)",
"VACATION_MESSAGE_LABEL": "Сообщение",
"VACATION_RECIPIENTS_LABEL": "Получатели (через запятую)",
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
index 14c2bfa2f..757f2cb45 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Označiť ako prečítané",
"REPLY_INTERVAL_LABEL": "Interval odpovede (v dňoch)",
"KEEP_LABEL": "Ponechať",
- "STOP_LABEL": "Pokračovať vo vykonávaní pravidiel",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Predmet (voliteľne)",
"VACATION_MESSAGE_LABEL": "Správa",
"VACATION_RECIPIENTS_LABEL": "Adresáti (oddelení čiarkou)",
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
index 246268535..d53e30462 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Označi kot prebrano",
"REPLY_INTERVAL_LABEL": "Interval odgovorov (dnevi)",
"KEEP_LABEL": "Obdrži",
- "STOP_LABEL": "Ne prenehaj z obdelovanjem pravil",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Zadeva (izbirno)",
"VACATION_MESSAGE_LABEL": "Sporočilo",
"VACATION_RECIPIENTS_LABEL": "Prejemniki (ločeni z vejico)",
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
index 18e1cc456..6a56eddec 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Markera som läst",
"REPLY_INTERVAL_LABEL": "Svarsintervall (dagar)",
"KEEP_LABEL": "Behåll",
- "STOP_LABEL": "Sluta inte bearbeta andra regler",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Ämne (valfritt)",
"VACATION_MESSAGE_LABEL": "Meddelande",
"VACATION_RECIPIENTS_LABEL": "Mottagare (kommaseparerade)",
diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
index cceb73ebc..3992c4144 100644
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Okundu olarak işaretle",
"REPLY_INTERVAL_LABEL": "Reply interval (days)",
"KEEP_LABEL": "Keep",
- "STOP_LABEL": "Don't stop processing rules",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Konu (Opsiyonel)",
"VACATION_MESSAGE_LABEL": "Mesaj",
"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
index ec1d2a420..0f3bc47fd 100644
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Mark as read",
"REPLY_INTERVAL_LABEL": "Reply interval (days)",
"KEEP_LABEL": "Keep",
- "STOP_LABEL": "Don't stop processing rules",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Тема (не обов'язково)",
"VACATION_MESSAGE_LABEL": "Повідомлення",
"VACATION_RECIPIENTS_LABEL": "Отримувачі (розділяти комами)",
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/user.json b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
index 45172428b..a623ec44d 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Đánh dấu đã đọc",
"REPLY_INTERVAL_LABEL": "Khoảng cách phản hồi (ngày)",
"KEEP_LABEL": "Giữ lại",
- "STOP_LABEL": "Không dừng những quy định xử lý thư này",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Tiêu đề thư (không bắt buộc)",
"VACATION_MESSAGE_LABEL": "Nội dung thư thông báo bạn đang nghỉ lễ",
"VACATION_RECIPIENTS_LABEL": "Người nhận (phân ra bởi dấu phẩy)",
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
index 2564a7096..ff2599e22 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "标记为已读",
"REPLY_INTERVAL_LABEL": "答复间隔 (天) ",
"KEEP_LABEL": "保留邮件",
- "STOP_LABEL": "继续匹配其他规则",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "主题 (可选)",
"VACATION_MESSAGE_LABEL": "内容",
"VACATION_RECIPIENTS_LABEL": "收件人 (半角逗号“,”分隔)",
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
index 5a38a4186..a1c0222cd 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@@ -315,7 +315,7 @@
"MARK_AS_READ_LABEL": "Mark as read",
"REPLY_INTERVAL_LABEL": "Reply interval (days)",
"KEEP_LABEL": "Keep",
- "STOP_LABEL": "Don't stop processing rules",
+ "STOP_LABEL": "Stop further processing of rules",
"VACATION_SUBJECT_LABEL": "Subject (optional)",
"VACATION_MESSAGE_LABEL": "Message",
"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html
index a9992de2e..ad5a4ca84 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html
@@ -3,7 +3,7 @@
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/STOP_LABEL',
- value: actionNoStop
+ value: stop
}
}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
index de2297a29..5d8b2392f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
@@ -8,21 +8,21 @@
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/KEEP_LABEL',
- value: actionKeep
+ value: keep
}
}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
index dc0fa8b31..2493b15e7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
@@ -8,14 +8,14 @@
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/MARK_AS_READ_LABEL',
- value: actionMarkAsRead
+ value: markAsRead
}
}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html
index a9992de2e..ad5a4ca84 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html
@@ -3,7 +3,7 @@
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/STOP_LABEL',
- value: actionNoStop
+ value: stop
}
}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
index f3783c4bb..d96367be2 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
@@ -6,7 +6,7 @@
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/STOP_LABEL',
- value: actionNoStop
+ value: stop
}
}">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
index 1a2275c23..1c84affd4 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
@@ -28,7 +28,7 @@
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/STOP_LABEL',
- value: actionNoStop
+ value: stop
}
}">