Merge branch '2023.11' into 2024.11

tine-groupware · Jan 29, 2024 · 4c4ae99 · 4c4ae99
2 parents 5199104 + 420a89d
commit 4c4ae99
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/tine20/Felamimail/js/sieve/RuleConditionsPanel.js b/tine20/Felamimail/js/sieve/RuleConditionsPanel.js
@@ -75,7 +75,7 @@ Tine.Felamimail.sieve.RuleConditionsPanel.getFilterModel = function(app) {
         {sort: 30, label: app.i18n._('To (Email)'),       field: 'to',       operators: ['contains', 'regex'], emptyText: '[email protected]'},
         {sort: 40, label: app.i18n._('To (Email CC)'),    field: 'cc',       operators: ['contains', 'regex'], emptyText: '[email protected]'},
         {sort: 50, label: app.i18n._('Subject'),          field: 'subject',  operators: ['contains', 'regex'], emptyText: app.i18n._('Subject')},
-        {sort: 60, label: app.i18n._('Size'),             field: 'size',     operators: ['greater', 'less'], valueType: 'number', defaultOperator: 'greater'},
+        {sort: 60, label: app.i18n._('Size (in byte)'),   field: 'size',     operators: ['greater', 'less'], valueType: 'number', defaultOperator: 'greater'},
         {sort: 70, label: app.i18n._('Header contains'),  field: 'header',   operators: ['freeform'], defaultOperator: 'freeform', 
             emptyTextOperator: app.i18n._('Header name'), emptyText: app.i18n._('Header value')},
         {sort: 80, label: app.i18n._('Header regex'),     field: 'headerregex',   operators: ['freeform'], defaultOperator: 'freeform',

diff --git a/tine20/Felamimail/translations/de.po b/tine20/Felamimail/translations/de.po
@@ -382,9 +382,11 @@ msgstr "Anzeigeformat"
 
 #: Model/Account.php:264 js/AccountEditDialog.js:534
 msgid "Compose Format"
-msgstr "Schreibformat"
+msgstr "Textformat"
 
 #: Model/Account.php:275 js/AccountEditDialog.js:549
+msgid "Preserve Format"
+msgstr "Format beibehalten"
 
 #: Model/Account.php:286
 msgid "Reply-To"
@@ -1284,8 +1286,8 @@ msgid "Plain Text"
 msgstr "Nur Text"
 
 #: js/AccountEditDialog.js:531
-msgid "Depending on content format"
-msgstr "Abhängig vom Format"
+msgid "Depending on content type (experimental)"
+msgstr "Abhängig vom Content-Typ (experimentell)"
 
 #: js/AccountEditDialog.js:560
 msgid "No"
@@ -2125,8 +2127,8 @@ msgid ""
 "I hereby agree that this mailbox may be converted to a shared mailbox or "
 "transferred to another user."
 msgstr ""
-"Hiermit willige ich ein, dass dieses Postfach zu einem gemeinsamen "
-"Postfach umgewandelt oder einem anderen Benutzer übertragen werden darf."
+"Hiermit willige ich ein, dass dieses Postfach zu einem gemeinsamen Postfach "
+"umgewandelt oder einem anderen Benutzer übertragen werden darf."
 
 msgid "Forward and forwarded email as .eml in attachment"
 msgstr "Weiterleitung und weitergeleitete eMail als .eml im Anhang"
@@ -2142,3 +2144,9 @@ msgstr "Ablageort für gesendete Mails"
 
 msgid "E-mail usage"
 msgstr "E-Mail-Nutzung"
+
+msgid "Size (in byte)"
+msgstr "Größe (in Byte)"
+
+msgid "Depending on content format"
+msgstr "Abhängig vom Format"
diff --git a/tine20/Felamimail/translations/en.po b/tine20/Felamimail/translations/en.po
@@ -1986,3 +1986,6 @@ msgstr "Add email accounts"
 #: Acl/Rights.php:111
 msgid "Create new email accounts"
 msgstr "Create new email accounts"
+
+msgid "Size (in byte)"
+msgstr "Size (in byte)"