diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/localization/de_CH/labels.inc | 7 | ||||
| -rw-r--r-- | program/localization/de_DE/labels.inc | 8 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 2 |
5 files changed, 22 insertions, 3 deletions
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc index 361d9ea56..e734b0a33 100644 --- a/program/localization/de_CH/labels.inc +++ b/program/localization/de_CH/labels.inc @@ -98,9 +98,16 @@ $labels['replytoallmessage'] = 'Antwort an Absender und alle Empfänger'; $labels['forwardmessage'] = 'Nachricht weiterleiten'; $labels['deletemessage'] = 'In den Papierkorb verschieben'; $labels['printmessage'] = 'Diese Nachricht drucken'; +$labels['previousmessage'] = 'Vorherige Nachricht anzeigen'; $labels['previousmessages'] = 'Vorherige Nachrichten anzeigen'; +$labels['firstmessage'] = 'Die erste Nachricht anzeigen'; +$labels['firstmessages'] = 'Die ersten Nachrichten anzeigen'; +$labels['nextmessage'] = 'Nächste Nachricht anzeigen'; $labels['nextmessages'] = 'Weitere Nachrichten anzeigen'; +$labels['lastmessage'] = 'Die letzte Nachricht anzeigen'; +$labels['lastmessages'] = 'Die letzten Nachrichten anzeigen'; $labels['backtolist'] = 'Zurück zur Liste'; +$labels['viewsource'] = 'Quelltext anzeigen'; $labels['select'] = 'Auswählen'; $labels['all'] = 'Alle'; diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc index ce19c98f1..87c8ce009 100644 --- a/program/localization/de_DE/labels.inc +++ b/program/localization/de_DE/labels.inc @@ -99,9 +99,17 @@ $labels['replytoallmessage'] = 'Antwort an Absender und alle Empfänger'; $labels['forwardmessage'] = 'Nachricht weiterleiten'; $labels['deletemessage'] = 'In den Papierkorb verschieben'; $labels['printmessage'] = 'Diese Nachricht drucken'; +$labels['previousmessage'] = 'Vorherige Nachricht anzeigen'; $labels['previousmessages'] = 'Vorherige Nachrichten anzeigen'; +$labels['firstmessage'] = 'Die erste Nachricht anzeigen'; +$labels['firstmessages'] = 'Die ersten Nachrichten anzeigen'; +$labels['nextmessage'] = 'Nächste Nachricht anzeigen'; $labels['nextmessages'] = 'Weitere Nachrichten anzeigen'; +$labels['lastmessage'] = 'Die letzte Nachricht anzeigen'; +$labels['lastmessages'] = 'Die letzten Nachrichten anzeigen'; $labels['backtolist'] = 'Zurück zur Liste'; +$labels['viewsource'] = 'Quelltext anzeigen'; + $labels['select'] = 'Auswählen'; $labels['all'] = 'Alle'; diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 542cca95d..ae5243ba5 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -97,9 +97,13 @@ $labels['replytoallmessage'] = 'Reply to sender and all recipients'; $labels['forwardmessage'] = 'Forward the message'; $labels['deletemessage'] = 'Move message to trash'; $labels['printmessage'] = 'Print this message'; +$labels['previousmessage'] = 'Show the previous message'; $labels['previousmessages'] = 'Show previous set of messages'; +$labels['firstmessage'] = 'Show the first message'; $labels['firstmessages'] = 'Show first set of messages'; +$labels['nextmessage'] = 'Show the next message'; $labels['nextmessages'] = 'Show next set of messages'; +$labels['lastmessage'] = 'Show the last messages'; $labels['lastmessages'] = 'Show last set of messages'; $labels['backtolist'] = 'Back to message list'; $labels['viewsource'] = 'Show source'; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index d655a3316..9bda8906d 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -513,8 +513,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE) $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject'); // show 'to' instead of from in sent messages - if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols)) - && !array_search('to', $a_show_cols)) + if (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox']) + && ($f = array_search('from', $a_show_cols)) && !array_search('to', $a_show_cols)) $a_show_cols[$f] = 'to'; $commands .= sprintf("this.set_message_coltypes(%s);\n", array2js($a_show_cols)); diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index c3e0170fe..41735881c 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -166,7 +166,7 @@ if (empty($identity_arr['string'])) $identity_arr['string'] = $from; // compose headers array -$headers = array('Date' => date('D, j M Y G:i:s O'), +$headers = array('Date' => date('D, j M Y H:i:s O'), 'From' => $identity_arr['string'], 'To' => rcube_charset_convert($mailto, $input_charset, $message_charset)); |