diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/localization/de/labels.inc | 1 | ||||
| -rw-r--r-- | program/localization/en/labels.inc | 3 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 6 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 7 |
4 files changed, 12 insertions, 5 deletions
diff --git a/program/localization/de/labels.inc b/program/localization/de/labels.inc index 8c50e1052..4e5a97b40 100644 --- a/program/localization/de/labels.inc +++ b/program/localization/de/labels.inc @@ -107,6 +107,7 @@ $labels['compose'] = 'Neue Nachricht verfassen'; $labels['sendmessage'] = 'Nachricht jetzt senden'; $labels['addattachment'] = 'Datei anfügen'; +$labels['attachments'] = 'Anhänge'; $labels['upload'] = 'Hochladen'; $labels['close'] = 'Schliessen'; diff --git a/program/localization/en/labels.inc b/program/localization/en/labels.inc index 7dd0fc1df..4b424136e 100644 --- a/program/localization/en/labels.inc +++ b/program/localization/en/labels.inc @@ -90,7 +90,7 @@ $labels['today'] = 'Today'; // toolbar buttons $labels['writenewmessage'] = 'Create a new message'; $labels['replytomessage'] = 'Reply to the message'; -$labels['forwardmessage'] = 'Forwad the message'; +$labels['forwardmessage'] = 'Forward the message'; $labels['deletemessage'] = 'Move message to trash'; $labels['printmessage'] = 'Print this message'; $labels['previousmessages'] = 'Show previous set of messages'; @@ -107,6 +107,7 @@ $labels['compose'] = 'Compose a message'; $labels['sendmessage'] = 'Send the message now'; $labels['addattachment'] = 'Attach a file'; +$labels['attachments'] = 'Attachments'; $labels['upload'] = 'Upload'; $labels['close'] = 'Close'; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 2109bed3a..d53b8b0c3 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -427,13 +427,13 @@ function rcmail_print_body($part, $safe=FALSE, $plain=FALSE) // $body, $ctype_pr $url_chars_within = '\?\.~,!'; $convert_patterns[] = "/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie"; - $convert_replaces[] = "rcmail_str_replacement('<a href=\"\\1://\\2\" target=\"_blank\">\\1://\\2</a>', &\$replace_strings)"; + $convert_replaces[] = "rcmail_str_replacement('<a href=\"\\1://\\2\" target=\"_blank\">\\1://\\2</a>', \$replace_strings)"; $convert_patterns[] = "/([^\/:]|\s)(www\.)([a-z0-9\-]{2,}[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie"; - $convert_replaces[] = "rcmail_str_replacement('\\1<a href=\"http://\\2\\3\" target=\"_blank\">\\2\\3</a>', &\$replace_strings)"; + $convert_replaces[] = "rcmail_str_replacement('\\1<a href=\"http://\\2\\3\" target=\"_blank\">\\2\\3</a>', \$replace_strings)"; $convert_patterns[] = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/ie'; - $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return $JS_OBJECT_NAME.command(\'compose\',\'\\1\',this)\">\\1</a>', &\$replace_strings)"; + $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return $JS_OBJECT_NAME.command(\'compose\',\'\\1\',this)\">\\1</a>', \$replace_strings)"; $body = wordwrap(trim($body), 80); $body = preg_replace($convert_patterns, $convert_replaces, $body); diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 826717fd9..c48f41c90 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -51,8 +51,13 @@ function rcmail_user_prefs_form($attrib) // show language selection $field_id = 'rcmfd_lang'; $select_lang = new select(array('name' => '_language', 'id' => $field_id)); - $select_lang->add('English', 'en'); + // $select_lang->add('Czech', 'cs'); + $select_lang->add('Dansk', 'da'); $select_lang->add('Deutsch', 'de'); + $select_lang->add('English', 'en'); + $select_lang->add('Espanol', 'es'); + $select_lang->add('Fran¨ais', 'fr'); + $select_lang->add('Italiano', 'it'); $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, |