From 030d43d9603d62f6e10790653942f8f532225efa Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 11 Nov 2015 15:00:11 +0000 Subject: [PATCH] * Mail: allow to disable use of RFC3676 flowed lines in plain text mails, as some clients have trouble to detect correct charset --- mail/lang/egw_de.lang | 3 +++ mail/lang/egw_en.lang | 4 +++- mail/templates/default/config.tpl | 39 ++++++++++++++++++++++--------- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang index 2747fe35b8..aee37dcb7b 100644 --- a/mail/lang/egw_de.lang +++ b/mail/lang/egw_de.lang @@ -99,6 +99,7 @@ deny certain groups access to following features mail de Den Zugriff auf bestimm directories have to be shared. mail de Verzeichnisse müssen freigegeben werden. disable mail de Deaktivieren disable ruler for separation of mailbody and signature mail de Signatur-Trennzeichen ausblenden +disable use of flowed lines in plain text mails (rfc3676) mail de Variablen Zeilenumbruch in text Mails (RFC3676) abschalten disabled! mail de deaktiviert discard mail de verwerfen discard message mail de Nachricht verwerfen @@ -280,6 +281,7 @@ message preview area mail de Vorschaubereich message saved successfully. mail de Nachricht wurde erfolgreich gespeichert. message send failed: %1 mail de Nachricht konnte nicht versendet werden: %1 message send successfully. mail de Nachricht wurde erfolgreich versendet. +miscellaneous mail de Verschiedenes move selected to mail de Verschiebe ausgewählte nach move to mail de verschieben move to trash mail de in den Papierkorb verschieben @@ -438,6 +440,7 @@ size(...->0) mail de Größe(...->0) size(0->...) mail de Größe(0->...) small view mail de schmale Ansicht smtp mail de Postausgang-Server +some clients fail to detect correct charset, if flowed lines are enabled. mail de Einige Mailprogramme haben Probleme den Zeichensatz zu erkennen, wenn variabler Zeilenumbruch verwendet wird. sort order mail de Sortierreihenfolge source mail de Quelltext sources mail de HTML Quellcode diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang index 4ec6f56e7f..ed5a12662e 100644 --- a/mail/lang/egw_en.lang +++ b/mail/lang/egw_en.lang @@ -99,6 +99,7 @@ deny certain groups access to following features mail en Deny certain groups acc directories have to be shared. mail en Directories have to be shared. disable mail en Disable disable ruler for separation of mailbody and signature mail en disable Ruler for separation of mailbody and signature +disable use of flowed lines in plain text mails (rfc3676) mail en Disable use of flowed lines in plain text mails (RFC3676) disabled! mail en disabled! discard mail en discard discard message mail en Discard message @@ -165,7 +166,6 @@ error:could not save the acl! because some names are empty! mail en Error:Could esync will fail without a working email configuration! mail en eSync will FAIL without a working eMail configuration! event details follow mail en Event Details follow everyone mail en Everyone -examine namespace to retrieve folders in others and shared mail en Examine Namespace to retrieve Folders in OTHERS and SHARED extended mail en Extended extra sent folders mail en Extra sent folders failed to delete %1 mail en Failed to delete %1 @@ -280,6 +280,7 @@ message preview area mail en Message preview area message saved successfully. mail en Message saved successfully. message send failed: %1 mail en Message send failed: %1 message send successfully. mail en Message send successfully. +miscellaneous mail en Miscellaneous move selected to mail en Move selected to move to mail en Move to move to trash mail en move to trash @@ -438,6 +439,7 @@ size(...->0) mail en size(...->0) size(0->...) mail en size(0->...) small view mail en small view smtp mail en SMTP +some clients fail to detect correct charset, if flowed lines are enabled. mail en Some clients fail to detect correct charset, if flowed lines are enabled. sort order mail en Sort order source mail en Source sources mail en Sources diff --git a/mail/templates/default/config.tpl b/mail/templates/default/config.tpl index 51bfeef039..12220d0cf8 100755 --- a/mail/templates/default/config.tpl +++ b/mail/templates/default/config.tpl @@ -13,17 +13,6 @@ {lang_Deny_certain_groups_access_to_following_features} - - {lang_examine_namespace_to_retrieve_folders_in_others_and_shared}
- {lang_only_needed_for_some_servers,_that_do_not_return_all_folders_on_root_level_queries_to_retrieve_all_folders_for_that_level} - - - - - {lang_Create_new_account} @@ -74,6 +63,34 @@ {lang_provide_a_default_vacation_text,_(used_on_new_vacation_messages_when_there_was_no_message_set_up_previously)} + + + {lang_Miscellaneous} + + + {lang_examine_namespace_to_retrieve_folders_in_others_and_shared}
+ {lang_only_needed_for_some_servers,_that_do_not_return_all_folders_on_root_level_queries_to_retrieve_all_folders_for_that_level} + + + + + + + + {lang_Disable_use_of_flowed_lines_in_plain_text_mails_(RFC3676)}
+ {lang_Some_clients_fail_to_detect_correct_charset,_if_flowed_lines_are_enabled.} + + + + + +