From d79e01f57042179bb540361915780eaeb0064e87 Mon Sep 17 00:00:00 2001 From: philippe_mingo Date: Mon, 24 Dec 2001 13:49:42 +0000 Subject: [PATCH] Many last minute fixes git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1913 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/bug_report/bug_report.php | 264 ++++---- plugins/bug_report/setup.php | 82 ++- plugins/sent_subfolders/setup.php | 39 +- po/squirrelmail.po | 1008 +++++++++++++++-------------- po/xgetpo | 4 + src/options_highlight.php | 618 +++++++++--------- 6 files changed, 1032 insertions(+), 983 deletions(-) diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php index f7186375..0c85c8c9 100644 --- a/plugins/bug_report/bug_report.php +++ b/plugins/bug_report/bug_report.php @@ -15,145 +15,121 @@ * * $Id$ */ - - chdir(".."); - - session_start(); - - if (!isset($config_php)) - /* '_once' Added by ri_once */ include_once("../config/config.php"); - if (!isset($strings_php)) - /* '_once' Added by ri_once */ include_once("../functions/strings.php"); - if (!isset($page_header_php)) - /* '_once' Added by ri_once */ include_once("../functions/page_header.php"); - if (!isset($display_messages_php)) - /* '_once' Added by ri_once */ include_once("../functions/display_messages.php"); - if (!isset($imap_php)) - /* '_once' Added by ri_once */ include_once("../functions/imap.php"); - if (!isset($array_php)) - /* '_once' Added by ri_once */ include_once("../functions/array.php"); - if (!isset($i18n_php)) - /* '_once' Added by ri_once */ include_once("../functions/i18n.php"); - - - /* '_once' Added by ri_once */ include_once("../src/load_prefs.php"); - displayPageHeader($color, "None"); - - - function Show_Array($array) - { - foreach ($array as $key => $value) - { - if ($key != 0 || $value != '') - { - $str .= " * $key = $value\n"; - } - } - if ($str == '') - return " * Nothing listed\n"; - return $str; - } - - $body_top .= "I subscribe to the squirrelmail-list mailing list.\n"; - $body_top .= " [ ] True - No need to CC me when replying\n"; - $body_top .= " [ ] False - Please CC me when replying\n"; - $body_top .= "\n"; - $body_top .= "This bug occurs when I ...\n"; - $body_top .= " ... view a particular message\n"; - $body_top .= " ... use a specific plugin/function\n"; - $body_top .= " ... try to do/view/use ....\n"; - $body_top .= "\n\n\n"; - $body_top .= "The description of the bug:\n\n\n"; - $body_top .= "I can reproduce the bug by:\n\n\n"; - $body_top .= "(Optional) I got bored and found the bug occurs in:\n\n\n"; - $body_top .= "(Optional) I got really bored and here's a fix:\n\n\n"; - $body_top .= "----------------------------------------------\n"; - - - $body .= "\nMy browser information:\n"; - $body .= " $HTTP_USER_AGENT\n"; - $body .= " get_browser() information (List)\n"; - $browser = get_browser(); - $body .= Show_Array((array) $browser); - - $body .= "\nMy web server information:\n"; - $body .= " PHP Version " . phpversion() . "\n"; - $body .= " PHP Extensions (List)\n"; - $body .= Show_Array(get_loaded_extensions()); - // Apache version? - - $body .= "\nSquirrelMail-specific information:\n"; - $body .= " Version: $version\n"; - $body .= " Plugins (List)\n"; - $body .= Show_Array($plugins); - if ($ldap_server[0] && ! extension_loaded('ldap')) - { - $warning = 1; - $warnings['ldap'] = "LDAP server defined in SquirrelMail config, " . - "but the module is not loaded in PHP"; - $corrections['ldap'][] = "Reconfigure PHP with the option '--with-ldap'"; - $corrections['ldap'][] = "Then recompile PHP and reinstall"; - $corrections['ldap'][] = "-- OR --"; - $corrections['ldap'][] = "Reconfigure SquirrelMail to not use LDAP"; - } - - $body .= "\nMy IMAP server information:\n"; - $body .= " Server type: $imap_server_type\n"; - $imap_stream = fsockopen ($imapServerAddress, $imapPort, &$error_number, &$error_string); - $server_info = fgets ($imap_stream, 1024); - if ($imap_stream) - { - // SUPRESS HOST NAME - $list = explode(' ', $server_info); - $list[2] = '[HIDDEN]'; - $server_info = implode(' ', $list); - $body .= " Server info: $server_info"; - fputs ($imap_stream, "a001 CAPABILITY\r\n"); - $read = fgets($imap_stream, 1024); - $list = explode(' ', $read); - array_shift($list); - array_shift($list); - $read = implode(' ', $list); - $body .= " Cabailities: $read"; - fputs ($imap_stream, "a002 LOGOUT\r\n"); - fclose($imap_stream); - } - else - { - $body .= " Unable to connect to IMAP server to get information.\n"; - $warning = 1; - $warnings['imap'] = "Unable to connect to IMAP server"; - $corrections['imap'][] = "Make sure you specified the correct mail server"; - $corrections['imap'][] = "Make sure the mail server is running IMAP, not POP"; - $corrections['imap'][] = "Make sure the server responds to port $imapPort"; - } - - $warning_num = 0; - if ($warning) - { - foreach ($warnings as $key => $value) - { - if ($warning_num == 0) - { - $body_top .= "WARNINGS WERE REPORTED WITH YOUR SETUP:\n"; - $body_top = "WARNINGS WERE REPORTED WITH YOUR SETUP -- SEE BELOW\n\n$body_top"; - $warning_html = "

Warnings were reported with your setup:

\n
\n"; - } - $warning_num ++; - $warning_html .= "
$value
\n"; - $body_top .= "\n$value\n"; - foreach ($corrections[$key] as $corr_val) - { - $body_top .= " * $corr_val\n"; - $warning_html .= "
* $corr_val
\n"; - } - } - $warning_html .= "
\n

$warning_num warning(s) reported.

\n
\n"; - $body_top .= "\n$warning_num warning(s) reported.\n"; - $body_top .= "----------------------------------------------\n"; - } - - $body = htmlspecialchars($body_top . $body); + +chdir('..'); + +session_start(); + +require_once('../config/config.php'); +require_once('../functions/strings.php'); +require_once('../functions/page_header.php'); +require_once('../functions/display_messages.php'); +require_once('../functions/imap.php'); +require_once('../functions/array.php'); +require_once('../functions/i18n.php'); +require_once('../src/load_prefs.php'); +displayPageHeader($color, "None"); + + +function Show_Array($array) { + foreach ($array as $key => $value) { + if ($key != 0 || $value != '') { + $str .= " * $key = $value\n"; + } + } + if ($str == '') { + return " * Nothing listed\n"; + } + return $str; +} + +$browser = get_browser(); +$body_top .= "I subscribe to the squirrelmail-list mailing list.\n" . + " [ ] True - No need to CC me when replying\n" . + " [ ] False - Please CC me when replying\n" . + "\n" . + "This bug occurs when I ...\n" . + " ... view a particular message\n" . + " ... use a specific plugin/function\n" . + " ... try to do/view/use ....\n" . + "\n\n\n" . + "The description of the bug:\n\n\n" . + "I can reproduce the bug by:\n\n\n" . + "(Optional) I got bored and found the bug occurs in:\n\n\n" . + "(Optional) I got really bored and here's a fix:\n\n\n" . + "----------------------------------------------\n" . + "\nMy browser information:\n" . + " $HTTP_USER_AGENT\n" . + " get_browser() information (List)\n" . + Show_Array((array) $browser) . + "\nMy web server information:\n" . + " PHP Version " . phpversion() . "\n" . + " PHP Extensions (List)\n" . + Show_Array(get_loaded_extensions()) . + "\nSquirrelMail-specific information:\n" . + " Version: $version\n" . + " Plugins (List)\n" . + Show_Array($plugins); +if ($ldap_server[0] && ! extension_loaded('ldap')) { + $warning = 1; + $warnings['ldap'] = "LDAP server defined in SquirrelMail config, " . + "but the module is not loaded in PHP"; + $corrections['ldap'][] = "Reconfigure PHP with the option '--with-ldap'"; + $corrections['ldap'][] = "Then recompile PHP and reinstall"; + $corrections['ldap'][] = "-- OR --"; + $corrections['ldap'][] = "Reconfigure SquirrelMail to not use LDAP"; +} + +$body .= "\nMy IMAP server information:\n" . + " Server type: $imap_server_type\n"; +$imap_stream = fsockopen ($imapServerAddress, $imapPort, &$error_number, &$error_string); +$server_info = fgets ($imap_stream, 1024); +if ($imap_stream) { + // SUPRESS HOST NAME + $list = explode(' ', $server_info); + $list[2] = '[HIDDEN]'; + $server_info = implode(' ', $list); + $body .= " Server info: $server_info"; + fputs ($imap_stream, "a001 CAPABILITY\r\n"); + $read = fgets($imap_stream, 1024); + $list = explode(' ', $read); + array_shift($list); + array_shift($list); + $read = implode(' ', $list); + $body .= " Cabailities: $read"; + fputs ($imap_stream, "a002 LOGOUT\r\n"); + fclose($imap_stream); +} else { + $body .= " Unable to connect to IMAP server to get information.\n"; + $warning = 1; + $warnings['imap'] = "Unable to connect to IMAP server"; + $corrections['imap'][] = "Make sure you specified the correct mail server"; + $corrections['imap'][] = "Make sure the mail server is running IMAP, not POP"; + $corrections['imap'][] = "Make sure the server responds to port $imapPort"; +} + +$warning_num = 0; +if ($warning) { + foreach ($warnings as $key => $value) { + if ($warning_num == 0) { + $body_top .= "WARNINGS WERE REPORTED WITH YOUR SETUP:\n"; + $body_top = "WARNINGS WERE REPORTED WITH YOUR SETUP -- SEE BELOW\n\n$body_top"; + $warning_html = "

Warnings were reported with your setup:

\n
\n"; + } + $warning_num ++; + $warning_html .= "
$value
\n"; + $body_top .= "\n$value\n"; + foreach ($corrections[$key] as $corr_val) { + $body_top .= " * $corr_val\n"; + $warning_html .= "
* $corr_val
\n"; + } + } + $warning_html .= "
\n

$warning_num warning(s) reported.

\n
\n"; + $body_top .= "\n$warning_num warning(s) reported.\n"; + $body_top .= "----------------------------------------------\n"; +} + +$body = htmlspecialchars($body_top . $body); ?>
@@ -165,9 +141,9 @@

Before you send your bug report, please make sure to check this checklist for any common problems.

- + - +

Pressing the button below will start a mail message to the developers of SquirrelMail that will contain a lot of information about your system, your browser, how SquirrelMail is set up, and your IMAP server. It will also prompt you for information. Just fill out the sections at the top. If you like, you can scroll down in the message to see what else is being sent.

- +

Please make sure to fill out as much information as you possibly can to give everyone a good chance of finding and removing the bug. Submitting your bug like this will not have it automatically added to the bug list on diff --git a/plugins/bug_report/setup.php b/plugins/bug_report/setup.php index a9eb570c..fcdda93e 100644 --- a/plugins/bug_report/setup.php +++ b/plugins/bug_report/setup.php @@ -16,64 +16,58 @@ /* Initialize the bug report plugin */ -function squirrelmail_plugin_init_bug_report() -{ - global $squirrelmail_plugin_hooks; - - $squirrelmail_plugin_hooks['menuline']['bug_report'] = 'bug_report_button'; - $squirrelmail_plugin_hooks['options_display_inside']['bug_report'] = 'bug_report_options'; - $squirrelmail_plugin_hooks['options_display_save']['bug_report'] = 'bug_report_save'; - $squirrelmail_plugin_hooks['loading_prefs']['bug_report'] = 'bug_report_load'; +function squirrelmail_plugin_init_bug_report() { + global $squirrelmail_plugin_hooks; + + $squirrelmail_plugin_hooks['menuline']['bug_report'] = 'bug_report_button'; + $squirrelmail_plugin_hooks['options_display_inside']['bug_report'] = 'bug_report_options'; + $squirrelmail_plugin_hooks['options_display_save']['bug_report'] = 'bug_report_save'; + $squirrelmail_plugin_hooks['loading_prefs']['bug_report'] = 'bug_report_load'; } /* Show the button in the main bar */ -function bug_report_button() -{ - global $color, $bug_report_visible; - - if (! $bug_report_visible) - return; - - displayInternalLink('plugins/bug_report/bug_report.php', 'Bug', ''); - echo "  \n"; +function bug_report_button() { + global $color, $bug_report_visible; + + if (! $bug_report_visible) { + return; + } + + displayInternalLink('plugins/bug_report/bug_report.php', 'Bug', ''); + echo "  \n"; } -function bug_report_save() -{ - global $username,$data_dir; - global $bug_report_bug_report_visible; +function bug_report_save() { + global $username,$data_dir; + global $bug_report_bug_report_visible; - if (isset($bug_report_bug_report_visible)) - { - setPref($data_dir, $username, 'bug_report_visible', '1'); - } - else - { - setPref($data_dir, $username, 'bug_report_visible', ''); - } + if (isset($bug_report_bug_report_visible)) { + setPref($data_dir, $username, 'bug_report_visible', '1'); + } else { + setPref($data_dir, $username, 'bug_report_visible', ''); + } } -function bug_report_load() -{ - global $username, $data_dir; - global $bug_report_visible; +function bug_report_load() { + global $username, $data_dir; + global $bug_report_visible; - $bug_report_visible = getPref($data_dir, $username, 'bug_report_visible'); + $bug_report_visible = getPref($data_dir, $username, 'bug_report_visible'); } -function bug_report_options() -{ - global $bug_report_visible; - - echo "Bug Reports:\n"; - echo " Show button in toolbar\n"; +function bug_report_options() { + global $bug_report_visible; + + echo '' . _("Bug Reports:") . "\n" . + ' ' . _("Show button in toolbar") . "\n"; } -?> +?> \ No newline at end of file diff --git a/plugins/sent_subfolders/setup.php b/plugins/sent_subfolders/setup.php index 9f20b11e..92f66532 100644 --- a/plugins/sent_subfolders/setup.php +++ b/plugins/sent_subfolders/setup.php @@ -61,8 +61,8 @@ function sent_subfolders_check_handleAsSent() { /* Perform the comparison. */ $handleAsSent_result = ( $handleAsSent_result - || ($base_str == $mbox_str) - || ($sent_subfolders_base == $args[1]) + || ($base_str == $mbox_str) + || ($sent_subfolders_base == $args[1]) ); } } @@ -73,7 +73,7 @@ function sent_subfolders_load_prefs() { $use_sent_subfolders = getPref ($data_dir, $username, 'use_sent_subfolders', SMPREF_OFF); - + $sent_subfolders_setting = getPref ($data_dir, $username, 'sent_subfolders_setting', SMPREF_SENT_SUBFOLDERS_DISABLED); @@ -100,9 +100,9 @@ function sent_subfolders_optpage_loadhook_folders() { 'type' => SMOPT_TYPE_STRLIST, 'refresh' => SMOPT_REFRESH_FOLDERLIST, 'posvals' => array(SMPREF_SENT_SUBFOLDERS_DISABLED => _("Disabled"), - SMPREF_SENT_SUBFOLDERS_MONTHLY => _("Monthly"), - SMPREF_SENT_SUBFOLDERS_QUARTERLY => _("Quarterly"), - SMPREF_SENT_SUBFOLDERS_YEARLY => _("Yearly")), + SMPREF_SENT_SUBFOLDERS_MONTHLY => _("Monthly"), + SMPREF_SENT_SUBFOLDERS_QUARTERLY => _("Quarterly"), + SMPREF_SENT_SUBFOLDERS_YEARLY => _("Yearly")), 'save' => 'save_option_sent_subfolders_setting' ); @@ -148,7 +148,7 @@ function sent_subfolders_update_sentfolder() { global $sent_subfolders_base, $sent_subfolders_setting; global $username, $data_dir, $key, $imapServerAddress, $imapPort; global $use_sent_subfolders, $move_to_sent; - + if ($use_sent_subfolders && $move_to_sent) { $year = date('Y'); $month = date('m'); @@ -156,7 +156,7 @@ function sent_subfolders_update_sentfolder() { switch ($sent_subfolders_setting) { case SMPREF_SENT_SUBFOLDERS_YEARLY: - $sent_subfolder = $sent_subfolders_base + $sent_subfolder = $sent_subfolders_base . $delimiter . $year; $year_folder = $sent_subfolder; break; @@ -193,14 +193,14 @@ function sent_subfolders_update_sentfolder() { /* Create the imap connection. */ $ic = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 10); - + /* Auto-create the year folder, if it does not yet exist. */ if (!sqimap_mailbox_exists($ic, $year_folder)) { sqimap_mailbox_create($ic, $year_folder, ''); } else if (!sqimap_mailbox_is_subscribed($ic, $year_folder)) { sqimap_subscribe($ic, $year_folder); } - + /* Auto-create the subfolder, if it does not yet exist. */ if (!sqimap_mailbox_exists($ic, $sent_folder)) { sqimap_mailbox_create($ic, $sent_folder, ''); @@ -219,17 +219,26 @@ function sent_subfolder_getQuarter($month) { switch ($month) { case '01': case '02': - case '03': $result = '1'; break; + case '03': + $result = '1'; + break; case '04': case '05': - case '06': $result = '2'; break; + case '06': + $result = '2'; + break; case '07': case '08': - case '09': $result = '3'; break; + case '09': + $result = '3'; + break; case '10': case '11': - case '12': $result = '4'; break; - default: $result = 'ERR'; + case '12': + $result = '4'; + break; + default: + $result = 'ERR'; } /* Return the current quarter. */ diff --git a/po/squirrelmail.po b/po/squirrelmail.po index 897ae3a0..cc7c5fc1 100644 --- a/po/squirrelmail.po +++ b/po/squirrelmail.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-12-21 14:06+0100\n" +"POT-Creation-Date: 2001-12-24 14:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,7 +64,7 @@ msgstr "" msgid "All address books" msgstr "" -#: squirrelmail/functions/page_header.php:88 +#: squirrelmail/functions/page_header.php:89 #: squirrelmail/src/addrbook_search.php:202 #: squirrelmail/src/addrbook_search_html.php:167 #: squirrelmail/src/search.php:32 squirrelmail/src/search.php:79 @@ -166,125 +166,125 @@ msgstr "" msgid "Add to %s" msgstr "" -#: squirrelmail/src/compose.php:118 +#: squirrelmail/src/compose.php:116 msgid "Original Message" msgstr "" -#: squirrelmail/functions/mailbox_display.php:564 -#: squirrelmail/plugins/filters/options.php:95 -#: squirrelmail/src/compose.php:119 squirrelmail/src/download.php:137 +#: squirrelmail/functions/mailbox_display.php:563 +#: squirrelmail/plugins/filters/options.php:97 +#: squirrelmail/src/compose.php:117 squirrelmail/src/download.php:137 #: squirrelmail/src/download.php:143 -#: squirrelmail/src/options_highlight.php:329 +#: squirrelmail/src/options_highlight.php:333 #: squirrelmail/src/options_order.php:59 #: squirrelmail/src/printer_friendly_bottom.php:97 #: squirrelmail/src/search.php:71 msgid "Subject" msgstr "" -#: squirrelmail/functions/mailbox_display.php:550 -#: squirrelmail/plugins/filters/options.php:83 -#: squirrelmail/src/compose.php:120 squirrelmail/src/download.php:138 +#: squirrelmail/functions/mailbox_display.php:549 +#: squirrelmail/plugins/filters/options.php:85 +#: squirrelmail/src/compose.php:118 squirrelmail/src/download.php:138 #: squirrelmail/src/download.php:145 -#: squirrelmail/src/options_highlight.php:317 +#: squirrelmail/src/options_highlight.php:321 #: squirrelmail/src/options_order.php:57 #: squirrelmail/src/printer_friendly_bottom.php:91 #: squirrelmail/src/search.php:72 msgid "From" msgstr "" -#: squirrelmail/functions/mailbox_display.php:548 -#: squirrelmail/plugins/filters/options.php:86 -#: squirrelmail/src/compose.php:121 squirrelmail/src/download.php:139 +#: squirrelmail/functions/mailbox_display.php:547 +#: squirrelmail/plugins/filters/options.php:88 +#: squirrelmail/src/compose.php:119 squirrelmail/src/download.php:139 #: squirrelmail/src/download.php:147 -#: squirrelmail/src/options_highlight.php:320 +#: squirrelmail/src/options_highlight.php:324 #: squirrelmail/src/printer_friendly_bottom.php:92 #: squirrelmail/src/search.php:74 msgid "To" msgstr "" -#: squirrelmail/src/compose.php:269 squirrelmail/src/read_body.php:551 +#: squirrelmail/src/compose.php:264 squirrelmail/src/read_body.php:543 msgid "From:" msgstr "" -#: squirrelmail/src/compose.php:294 squirrelmail/src/read_body.php:568 +#: squirrelmail/src/compose.php:289 squirrelmail/src/read_body.php:560 msgid "To:" msgstr "" -#: squirrelmail/src/compose.php:302 +#: squirrelmail/src/compose.php:297 msgid "CC:" msgstr "" -#: squirrelmail/src/compose.php:310 +#: squirrelmail/src/compose.php:305 msgid "BCC:" msgstr "" -#: squirrelmail/src/compose.php:318 squirrelmail/src/read_body.php:526 +#: squirrelmail/src/compose.php:313 squirrelmail/src/read_body.php:518 msgid "Subject:" msgstr "" -#: squirrelmail/src/compose.php:360 squirrelmail/src/compose.php:414 +#: squirrelmail/src/compose.php:355 squirrelmail/src/compose.php:410 msgid "Send" msgstr "" -#: squirrelmail/src/compose.php:366 +#: squirrelmail/src/compose.php:361 msgid "Attach:" msgstr "" -#: squirrelmail/src/compose.php:370 squirrelmail/src/options_order.php:145 +#: squirrelmail/src/compose.php:366 squirrelmail/src/options_order.php:145 msgid "Add" msgstr "" -#: squirrelmail/src/compose.php:385 +#: squirrelmail/src/compose.php:381 msgid "Delete selected attachments" msgstr "" -#: squirrelmail/functions/page_header.php:82 squirrelmail/src/compose.php:407 -#: squirrelmail/src/compose.php:409 squirrelmail/src/compose.php:412 +#: squirrelmail/functions/page_header.php:83 squirrelmail/src/compose.php:403 +#: squirrelmail/src/compose.php:405 squirrelmail/src/compose.php:408 msgid "Addresses" msgstr "" -#: squirrelmail/src/compose.php:417 +#: squirrelmail/src/compose.php:413 msgid "Save Draft" msgstr "" -#: squirrelmail/src/compose.php:423 squirrelmail/src/read_body.php:598 +#: squirrelmail/src/compose.php:419 squirrelmail/src/read_body.php:590 msgid "Priority" msgstr "" -#: squirrelmail/src/compose.php:424 squirrelmail/src/read_body.php:433 +#: squirrelmail/src/compose.php:420 squirrelmail/src/read_body.php:425 msgid "High" msgstr "" -#: squirrelmail/src/compose.php:425 squirrelmail/src/read_body.php:436 +#: squirrelmail/src/compose.php:421 squirrelmail/src/read_body.php:428 msgid "Normal" msgstr "" -#: squirrelmail/src/compose.php:426 squirrelmail/src/read_body.php:440 +#: squirrelmail/src/compose.php:422 squirrelmail/src/read_body.php:432 msgid "Low" msgstr "" -#: squirrelmail/src/compose.php:445 +#: squirrelmail/src/compose.php:441 msgid "You have not filled in the \"To:\" field." msgstr "" -#: squirrelmail/src/compose.php:490 +#: squirrelmail/src/compose.php:486 msgid "Draft Email Saved" msgstr "" -#: squirrelmail/src/compose.php:561 squirrelmail/src/compose.php:598 -#: squirrelmail/src/compose.php:605 +#: squirrelmail/src/compose.php:557 squirrelmail/src/compose.php:594 +#: squirrelmail/src/compose.php:601 msgid "Could not move/copy file. File not attached" msgstr "" -#: squirrelmail/src/compose.php:670 +#: squirrelmail/src/compose.php:683 msgid "said" msgstr "" -#: squirrelmail/src/compose.php:673 +#: squirrelmail/src/compose.php:686 msgid "quote" msgstr "" -#: squirrelmail/src/compose.php:673 +#: squirrelmail/src/compose.php:686 msgid "who" msgstr "" @@ -294,7 +294,7 @@ msgstr "" #: squirrelmail/src/download.php:52 squirrelmail/src/download.php:54 #: squirrelmail/src/image.php:47 squirrelmail/src/image.php:51 -#: squirrelmail/src/read_body.php:55 squirrelmail/src/vcard.php:51 +#: squirrelmail/src/read_body.php:178 squirrelmail/src/vcard.php:51 #: squirrelmail/src/vcard.php:55 msgid "View message" msgstr "" @@ -304,7 +304,7 @@ msgstr "" msgid "Download this as a file" msgstr "" -#: squirrelmail/functions/mailbox_display.php:558 +#: squirrelmail/functions/mailbox_display.php:557 #: squirrelmail/src/download.php:140 squirrelmail/src/download.php:149 #: squirrelmail/src/options_order.php:58 #: squirrelmail/src/printer_friendly_bottom.php:96 @@ -319,8 +319,8 @@ msgstr "" msgid "Click here to go back" msgstr "" -#: squirrelmail/functions/page_header.php:84 squirrelmail/src/folders.php:45 -#: squirrelmail/src/left_main.php:261 +#: squirrelmail/functions/page_header.php:85 squirrelmail/src/folders.php:45 +#: squirrelmail/src/left_main.php:259 msgid "Folders" msgstr "" @@ -344,69 +344,69 @@ msgstr "" msgid "Renamed successfully!" msgstr "" -#: squirrelmail/src/folders.php:69 squirrelmail/src/left_main.php:300 +#: squirrelmail/src/folders.php:69 squirrelmail/src/left_main.php:298 msgid "refresh folder list" msgstr "" -#: squirrelmail/src/folders.php:79 -msgid "Delete Folder" -msgstr "" - -#: squirrelmail/functions/mailbox_display.php:520 -#: squirrelmail/plugins/filters/options.php:152 -#: squirrelmail/plugins/mail_fetch/options.php:168 -#: squirrelmail/plugins/mail_fetch/options.php:175 -#: squirrelmail/src/folders.php:125 squirrelmail/src/options_highlight.php:71 -#: squirrelmail/src/options_identities.php:320 -#: squirrelmail/src/read_body.php:468 -msgid "Delete" -msgstr "" - -#: squirrelmail/src/folders.php:129 squirrelmail/src/folders.php:205 -msgid "No folders found" -msgstr "" - -#: squirrelmail/src/folders.php:136 +#: squirrelmail/src/folders.php:82 msgid "Create Folder" msgstr "" -#: squirrelmail/src/folders.php:141 +#: squirrelmail/src/folders.php:87 msgid "as a subfolder of" msgstr "" -#: squirrelmail/src/folders.php:146 squirrelmail/src/folders.php:148 +#: squirrelmail/src/folders.php:91 squirrelmail/src/folders.php:93 msgid "None" msgstr "" -#: squirrelmail/src/folders.php:169 +#: squirrelmail/src/folders.php:114 msgid "Let this folder contain subfolders" msgstr "" -#: squirrelmail/src/folders.php:172 +#: squirrelmail/src/folders.php:117 msgid "Create" msgstr "" -#: squirrelmail/src/folders.php:179 +#: squirrelmail/src/folders.php:124 msgid "Rename a Folder" msgstr "" -#: squirrelmail/src/folders.php:201 +#: squirrelmail/src/folders.php:145 msgid "Rename" msgstr "" -#: squirrelmail/src/folders.php:214 squirrelmail/src/folders.php:234 +#: squirrelmail/src/folders.php:149 squirrelmail/src/folders.php:206 +msgid "No folders found" +msgstr "" + +#: squirrelmail/src/folders.php:157 +msgid "Delete Folder" +msgstr "" + +#: squirrelmail/functions/mailbox_display.php:520 +#: squirrelmail/plugins/filters/options.php:154 +#: squirrelmail/plugins/mail_fetch/options.php:168 +#: squirrelmail/plugins/mail_fetch/options.php:175 +#: squirrelmail/src/folders.php:202 squirrelmail/src/options_highlight.php:75 +#: squirrelmail/src/options_identities.php:320 +#: squirrelmail/src/read_body.php:460 +msgid "Delete" +msgstr "" + +#: squirrelmail/src/folders.php:213 squirrelmail/src/folders.php:233 msgid "Unsubscribe" msgstr "" -#: squirrelmail/src/folders.php:214 squirrelmail/src/folders.php:275 +#: squirrelmail/src/folders.php:213 squirrelmail/src/folders.php:274 msgid "Subscribe" msgstr "" -#: squirrelmail/src/folders.php:238 +#: squirrelmail/src/folders.php:237 msgid "No folders were found to unsubscribe from!" msgstr "" -#: squirrelmail/src/folders.php:278 +#: squirrelmail/src/folders.php:277 msgid "No folders were found to subscribe to!" msgstr "" @@ -419,15 +419,15 @@ msgid "New name:" msgstr "" #: squirrelmail/functions/options.php:404 -#: squirrelmail/plugins/filters/options.php:136 -#: squirrelmail/plugins/newmail/newmail_opt.php:132 -#: squirrelmail/plugins/translate/options.php:159 +#: squirrelmail/plugins/filters/options.php:138 +#: squirrelmail/plugins/newmail/newmail_opt.php:133 +#: squirrelmail/plugins/translate/options.php:163 #: squirrelmail/src/folders_rename_getname.php:63 -#: squirrelmail/src/options_highlight.php:342 +#: squirrelmail/src/options_highlight.php:346 msgid "Submit" msgstr "" -#: squirrelmail/functions/page_header.php:90 squirrelmail/src/help.php:97 +#: squirrelmail/functions/page_header.php:91 squirrelmail/src/help.php:97 msgid "Help" msgstr "" @@ -446,19 +446,19 @@ msgstr "" msgid "Table of Contents" msgstr "" -#: squirrelmail/functions/mailbox_display.php:713 -#: squirrelmail/functions/mailbox_display.php:716 -#: squirrelmail/functions/mailbox_display.php:719 +#: squirrelmail/functions/mailbox_display.php:712 +#: squirrelmail/functions/mailbox_display.php:715 +#: squirrelmail/functions/mailbox_display.php:718 #: squirrelmail/src/help.php:180 squirrelmail/src/help.php:181 -#: squirrelmail/src/read_body.php:490 squirrelmail/src/read_body.php:492 +#: squirrelmail/src/read_body.php:482 squirrelmail/src/read_body.php:484 msgid "Previous" msgstr "" -#: squirrelmail/functions/mailbox_display.php:714 -#: squirrelmail/functions/mailbox_display.php:717 -#: squirrelmail/functions/mailbox_display.php:720 +#: squirrelmail/functions/mailbox_display.php:713 +#: squirrelmail/functions/mailbox_display.php:716 +#: squirrelmail/functions/mailbox_display.php:719 #: squirrelmail/src/help.php:183 squirrelmail/src/help.php:184 -#: squirrelmail/src/read_body.php:496 squirrelmail/src/read_body.php:498 +#: squirrelmail/src/read_body.php:488 squirrelmail/src/read_body.php:490 msgid "Next" msgstr "" @@ -474,7 +474,7 @@ msgstr "" msgid "empty" msgstr "" -#: squirrelmail/src/left_main.php:294 +#: squirrelmail/src/left_main.php:292 msgid "Last Refresh" msgstr "" @@ -521,107 +521,111 @@ msgid "Theme" msgstr "" #: squirrelmail/src/options_display.php:59 +msgid "Default" +msgstr "" + +#: squirrelmail/src/options_display.php:62 msgid "Language" msgstr "" -#: squirrelmail/src/options_display.php:68 +#: squirrelmail/src/options_display.php:71 msgid "Use Javascript" msgstr "" -#: squirrelmail/src/options_display.php:71 +#: squirrelmail/src/options_display.php:74 msgid "Autodetect" msgstr "" -#: squirrelmail/src/options_display.php:72 +#: squirrelmail/src/options_display.php:75 msgid "Always" msgstr "" -#: squirrelmail/src/options_display.php:73 +#: squirrelmail/src/options_display.php:76 #: squirrelmail/src/options_folder.php:122 msgid "Never" msgstr "" -#: squirrelmail/src/options_display.php:91 +#: squirrelmail/src/options_display.php:94 msgid "Mailbox Display Options" msgstr "" -#: squirrelmail/src/options_display.php:96 +#: squirrelmail/src/options_display.php:99 msgid "Number of Messages to Index" msgstr "" -#: squirrelmail/src/options_display.php:104 +#: squirrelmail/src/options_display.php:107 msgid "Enable Alternating Row Colors" msgstr "" -#: squirrelmail/src/options_display.php:111 +#: squirrelmail/src/options_display.php:114 msgid "Enable Page Selector" msgstr "" -#: squirrelmail/src/options_display.php:118 +#: squirrelmail/src/options_display.php:121 msgid "Maximum Number of Pages to Show" msgstr "" -#: squirrelmail/src/options_display.php:125 +#: squirrelmail/src/options_display.php:128 msgid "Message Display and Composition" msgstr "" -#: squirrelmail/src/options_display.php:130 +#: squirrelmail/src/options_display.php:133 msgid "Wrap Incoming Text At" msgstr "" -#: squirrelmail/src/options_display.php:138 +#: squirrelmail/src/options_display.php:141 msgid "Size of Editor Window" msgstr "" -#: squirrelmail/src/options_display.php:146 +#: squirrelmail/src/options_display.php:149 msgid "Location of Buttons when Composing" msgstr "" -#: squirrelmail/src/options_display.php:149 +#: squirrelmail/src/options_display.php:152 msgid "Before headers" msgstr "" -#: squirrelmail/src/options_display.php:150 +#: squirrelmail/src/options_display.php:153 msgid "Between headers and message body" msgstr "" -#: squirrelmail/src/options_display.php:151 +#: squirrelmail/src/options_display.php:154 msgid "After message body" msgstr "" -#: squirrelmail/src/options_display.php:156 +#: squirrelmail/src/options_display.php:159 msgid "Addressbook Display Format" msgstr "" -#: squirrelmail/src/options_display.php:159 +#: squirrelmail/src/options_display.php:162 msgid "Javascript" msgstr "" -#: squirrelmail/src/options_display.php:160 +#: squirrelmail/src/options_display.php:163 msgid "HTML" msgstr "" -#: squirrelmail/src/options_display.php:165 +#: squirrelmail/src/options_display.php:168 msgid "Show HTML Version by Default" msgstr "" -#: squirrelmail/src/options_display.php:172 +#: squirrelmail/src/options_display.php:175 msgid "Include Me in CC when I Reply All" msgstr "" -#: squirrelmail/src/options_display.php:179 +#: squirrelmail/src/options_display.php:182 msgid "Enable Mailer Display" msgstr "" -#: squirrelmail/src/options_display.php:186 +#: squirrelmail/src/options_display.php:189 msgid "Display Attached Images with Message" msgstr "" -#: squirrelmail/src/options_display.php:193 +#: squirrelmail/src/options_display.php:196 msgid "Enable Subtle Printer Friendly Link" msgstr "" -#: squirrelmail/src/options_display.php:200 +#: squirrelmail/src/options_display.php:203 msgid "Enable Printer Friendly Clean Display" msgstr "" @@ -749,126 +753,126 @@ msgstr "" msgid "24-hour clock" msgstr "" -#: squirrelmail/functions/page_header.php:86 -#: squirrelmail/plugins/filters/options.php:60 -#: squirrelmail/plugins/newmail/newmail_opt.php:33 -#: squirrelmail/plugins/translate/options.php:93 -#: squirrelmail/src/options.php:158 squirrelmail/src/options_highlight.php:57 +#: squirrelmail/functions/page_header.php:87 +#: squirrelmail/plugins/filters/options.php:62 +#: squirrelmail/plugins/newmail/newmail_opt.php:34 +#: squirrelmail/plugins/translate/options.php:97 +#: squirrelmail/src/options.php:164 squirrelmail/src/options_highlight.php:61 #: squirrelmail/src/options_identities.php:58 #: squirrelmail/src/options_order.php:48 msgid "Options" msgstr "" -#: squirrelmail/src/options.php:110 squirrelmail/src/options.php:257 -#: squirrelmail/src/options_highlight.php:57 +#: squirrelmail/src/options.php:112 squirrelmail/src/options.php:263 +#: squirrelmail/src/options_highlight.php:61 msgid "Message Highlighting" msgstr "" -#: squirrelmail/plugins/filters/options.php:62 -#: squirrelmail/src/options_highlight.php:61 +#: squirrelmail/plugins/filters/options.php:64 +#: squirrelmail/src/options_highlight.php:65 msgid "New" msgstr "" -#: squirrelmail/plugins/filters/options.php:63 -#: squirrelmail/plugins/filters/spamoptions.php:148 +#: squirrelmail/plugins/filters/options.php:65 +#: squirrelmail/plugins/filters/spamoptions.php:149 #: squirrelmail/plugins/mail_fetch/fetch.php:225 -#: squirrelmail/src/options_highlight.php:62 +#: squirrelmail/src/options_highlight.php:66 msgid "Done" msgstr "" -#: squirrelmail/plugins/filters/options.php:150 -#: squirrelmail/plugins/filters/spamoptions.php:147 -#: squirrelmail/src/options_highlight.php:69 +#: squirrelmail/plugins/filters/options.php:152 +#: squirrelmail/plugins/filters/spamoptions.php:148 +#: squirrelmail/src/options_highlight.php:73 msgid "Edit" msgstr "" -#: squirrelmail/src/options_highlight.php:82 +#: squirrelmail/src/options_highlight.php:86 msgid "No highlighting is defined" msgstr "" -#: squirrelmail/src/options_highlight.php:254 +#: squirrelmail/src/options_highlight.php:258 msgid "Identifying name" msgstr "" -#: squirrelmail/src/options_highlight.php:268 +#: squirrelmail/src/options_highlight.php:272 msgid "Color" msgstr "" -#: squirrelmail/src/options_highlight.php:272 +#: squirrelmail/src/options_highlight.php:276 msgid "Dark Blue" msgstr "" -#: squirrelmail/src/options_highlight.php:273 +#: squirrelmail/src/options_highlight.php:277 msgid "Dark Green" msgstr "" -#: squirrelmail/src/options_highlight.php:274 +#: squirrelmail/src/options_highlight.php:278 msgid "Dark Yellow" msgstr "" -#: squirrelmail/src/options_highlight.php:275 +#: squirrelmail/src/options_highlight.php:279 msgid "Dark Cyan" msgstr "" -#: squirrelmail/src/options_highlight.php:276 +#: squirrelmail/src/options_highlight.php:280 msgid "Dark Magenta" msgstr "" -#: squirrelmail/src/options_highlight.php:277 +#: squirrelmail/src/options_highlight.php:281 msgid "Light Blue" msgstr "" -#: squirrelmail/src/options_highlight.php:278 +#: squirrelmail/src/options_highlight.php:282 msgid "Light Green" msgstr "" -#: squirrelmail/src/options_highlight.php:279 +#: squirrelmail/src/options_highlight.php:283 msgid "Light Yellow" msgstr "" -#: squirrelmail/src/options_highlight.php:280 +#: squirrelmail/src/options_highlight.php:284 msgid "Light Cyan" msgstr "" -#: squirrelmail/src/options_highlight.php:281 +#: squirrelmail/src/options_highlight.php:285 msgid "Light Magenta" msgstr "" -#: squirrelmail/src/options_highlight.php:282 +#: squirrelmail/src/options_highlight.php:286 msgid "Dark Gray" msgstr "" -#: squirrelmail/src/options_highlight.php:283 +#: squirrelmail/src/options_highlight.php:287 msgid "Medium Gray" msgstr "" -#: squirrelmail/src/options_highlight.php:284 +#: squirrelmail/src/options_highlight.php:288 msgid "Light Gray" msgstr "" -#: squirrelmail/src/options_highlight.php:285 +#: squirrelmail/src/options_highlight.php:289 msgid "White" msgstr "" -#: squirrelmail/src/options_highlight.php:287 +#: squirrelmail/src/options_highlight.php:291 msgid "Other:" msgstr "" -#: squirrelmail/src/options_highlight.php:289 +#: squirrelmail/src/options_highlight.php:293 msgid "Ex: 63aa7f" msgstr "" -#: squirrelmail/plugins/filters/options.php:89 -#: squirrelmail/src/options_highlight.php:323 squirrelmail/src/search.php:73 +#: squirrelmail/plugins/filters/options.php:91 +#: squirrelmail/src/options_highlight.php:327 squirrelmail/src/search.php:73 msgid "Cc" msgstr "" -#: squirrelmail/plugins/filters/options.php:92 -#: squirrelmail/src/options_highlight.php:326 +#: squirrelmail/plugins/filters/options.php:94 +#: squirrelmail/src/options_highlight.php:330 msgid "To or Cc" msgstr "" -#: squirrelmail/src/options_highlight.php:331 +#: squirrelmail/src/options_highlight.php:335 msgid "Matches" msgstr "" @@ -915,7 +919,7 @@ msgstr "" msgid "Move Up" msgstr "" -#: squirrelmail/src/options.php:120 squirrelmail/src/options.php:273 +#: squirrelmail/src/options.php:124 squirrelmail/src/options.php:279 #: squirrelmail/src/options_order.php:48 msgid "Index Order" msgstr "" @@ -928,7 +932,7 @@ msgstr "" msgid "Flags" msgstr "" -#: squirrelmail/functions/mailbox_display.php:570 +#: squirrelmail/functions/mailbox_display.php:569 #: squirrelmail/src/options_order.php:61 msgid "Size" msgstr "" @@ -1024,55 +1028,55 @@ msgstr "" msgid "Signature" msgstr "" -#: squirrelmail/src/options.php:100 squirrelmail/src/options.php:241 +#: squirrelmail/src/options.php:100 squirrelmail/src/options.php:247 msgid "Personal Information" msgstr "" -#: squirrelmail/src/options.php:105 squirrelmail/src/options.php:249 +#: squirrelmail/src/options.php:106 squirrelmail/src/options.php:255 msgid "Display Preferences" msgstr "" -#: squirrelmail/src/options.php:115 squirrelmail/src/options.php:265 +#: squirrelmail/src/options.php:118 squirrelmail/src/options.php:271 msgid "Folder Preferences" msgstr "" -#: squirrelmail/src/options.php:225 +#: squirrelmail/src/options.php:231 msgid "Successfully Saved Options" msgstr "" -#: squirrelmail/src/options.php:229 +#: squirrelmail/src/options.php:235 msgid "Refresh Folder List" msgstr "" -#: squirrelmail/src/options.php:231 +#: squirrelmail/src/options.php:237 msgid "Refresh Page" msgstr "" -#: squirrelmail/src/options.php:243 +#: squirrelmail/src/options.php:249 msgid "" "This contains personal information about yourself such as your name, your " "email address, etc." msgstr "" -#: squirrelmail/src/options.php:251 +#: squirrelmail/src/options.php:257 msgid "" "You can change the way that SquirrelMail looks and displays information to " "you, such as the colors, the language, and other settings." msgstr "" -#: squirrelmail/src/options.php:259 +#: squirrelmail/src/options.php:265 msgid "" "Based upon given criteria, incoming messages can have different background " "colors in the message list. This helps to easily distinguish who the " "messages are from, especially for mailing lists." msgstr "" -#: squirrelmail/src/options.php:267 +#: squirrelmail/src/options.php:273 msgid "" "These settings change the way your folders are displayed and manipulated." msgstr "" -#: squirrelmail/src/options.php:275 +#: squirrelmail/src/options.php:281 msgid "" "The order of the message index can be rearanged and changed to contain the " "headers in any order you want." @@ -1096,51 +1100,51 @@ msgstr "" msgid "Close Window" msgstr "" -#: squirrelmail/src/read_body.php:48 -msgid "Viewing Full Header" +#: squirrelmail/src/read_body.php:118 +msgid "View Printable Version" msgstr "" -#: squirrelmail/src/read_body.php:180 -msgid "View Printable Version" +#: squirrelmail/src/read_body.php:171 +msgid "Viewing Full Header" msgstr "" -#: squirrelmail/src/read_body.php:314 +#: squirrelmail/src/read_body.php:306 msgid "more" msgstr "" -#: squirrelmail/src/read_body.php:315 +#: squirrelmail/src/read_body.php:307 msgid "less" msgstr "" -#: squirrelmail/src/read_body.php:461 +#: squirrelmail/src/read_body.php:453 msgid "Message List" msgstr "" -#: squirrelmail/src/read_body.php:472 +#: squirrelmail/src/read_body.php:464 msgid "Resume Draft" msgstr "" -#: squirrelmail/src/read_body.php:507 +#: squirrelmail/src/read_body.php:499 msgid "Forward" msgstr "" -#: squirrelmail/src/read_body.php:510 +#: squirrelmail/src/read_body.php:502 msgid "Reply" msgstr "" -#: squirrelmail/src/read_body.php:513 +#: squirrelmail/src/read_body.php:505 msgid "Reply All" msgstr "" -#: squirrelmail/src/read_body.php:534 squirrelmail/src/read_body.php:536 +#: squirrelmail/src/read_body.php:526 squirrelmail/src/read_body.php:528 msgid "View Full Header" msgstr "" -#: squirrelmail/src/read_body.php:559 +#: squirrelmail/src/read_body.php:551 msgid "Date:" msgstr "" -#: squirrelmail/src/read_body.php:615 +#: squirrelmail/src/read_body.php:607 msgid "Mailer" msgstr "" @@ -1169,7 +1173,7 @@ msgstr "" msgid "Everywhere" msgstr "" -#: squirrelmail/functions/page_header.php:72 squirrelmail/src/signout.php:83 +#: squirrelmail/functions/page_header.php:75 squirrelmail/src/signout.php:83 msgid "Sign Out" msgstr "" @@ -1462,9 +1466,9 @@ msgstr "" msgid "M j, Y" msgstr "" -#: squirrelmail/functions/db_prefs.php:82 -#: squirrelmail/functions/db_prefs.php:85 -#: squirrelmail/functions/db_prefs.php:204 +#: squirrelmail/functions/db_prefs.php:83 +#: squirrelmail/functions/db_prefs.php:86 +#: squirrelmail/functions/db_prefs.php:205 #, c-format msgid "Preference database error (%s). Exiting abnormally" msgstr "" @@ -1499,22 +1503,22 @@ msgstr "" #: squirrelmail/functions/imap_messages.php:159 #: squirrelmail/functions/imap_messages.php:168 #: squirrelmail/functions/imap_messages.php:280 -#: squirrelmail/plugins/filters/filters.php:88 +#: squirrelmail/plugins/filters/filters.php:89 msgid "ERROR : Could not complete request." msgstr "" #: squirrelmail/functions/imap_general.php:121 -#: squirrelmail/plugins/filters/filters.php:90 +#: squirrelmail/plugins/filters/filters.php:91 msgid "Reason Given: " msgstr "" #: squirrelmail/functions/imap_general.php:128 -#: squirrelmail/plugins/filters/filters.php:97 +#: squirrelmail/plugins/filters/filters.php:98 msgid "ERROR : Bad or malformed request." msgstr "" #: squirrelmail/functions/imap_general.php:130 -#: squirrelmail/plugins/filters/filters.php:99 +#: squirrelmail/plugins/filters/filters.php:100 msgid "Server responded: " msgstr "" @@ -1555,7 +1559,7 @@ msgstr "" #: squirrelmail/functions/imap_messages.php:208 #: squirrelmail/functions/imap_messages.php:452 #: squirrelmail/functions/imap_messages.php:502 -#: squirrelmail/functions/mailbox_display.php:868 +#: squirrelmail/functions/mailbox_display.php:867 msgid "(no subject)" msgstr "" @@ -1615,29 +1619,29 @@ msgstr "" msgid "Unread" msgstr "" -#: squirrelmail/functions/mailbox_display.php:615 +#: squirrelmail/functions/mailbox_display.php:614 msgid "Toggle All" msgstr "" -#: squirrelmail/functions/mailbox_display.php:633 +#: squirrelmail/functions/mailbox_display.php:632 msgid "Unselect All" msgstr "" -#: squirrelmail/functions/mailbox_display.php:635 +#: squirrelmail/functions/mailbox_display.php:634 msgid "Select All" msgstr "" -#: squirrelmail/functions/mailbox_display.php:652 +#: squirrelmail/functions/mailbox_display.php:651 #, c-format msgid "Viewing Messages: %s to %s (%s total)" msgstr "" -#: squirrelmail/functions/mailbox_display.php:654 +#: squirrelmail/functions/mailbox_display.php:653 #, c-format msgid "Viewing Message: %s (1 total)" msgstr "" -#: squirrelmail/functions/mailbox_display.php:842 +#: squirrelmail/functions/mailbox_display.php:841 msgid "Show All" msgstr "" @@ -1649,7 +1653,7 @@ msgstr "" msgid "download" msgstr "" -#: squirrelmail/functions/mime.php:956 +#: squirrelmail/functions/mime.php:955 msgid "Title:" msgstr "" @@ -1666,231 +1670,253 @@ msgstr "" msgid "No" msgstr "" -#: squirrelmail/functions/page_header.php:74 +#: squirrelmail/functions/page_header.php:72 msgid "Current Folder" msgstr "" -#: squirrelmail/functions/page_header.php:80 +#: squirrelmail/functions/page_header.php:81 msgid "Compose" msgstr "" -#: squirrelmail/functions/prefs.php:33 +#: squirrelmail/functions/prefs.php:39 #, c-format msgid "" "Preference file, %s, does not exist. Log out, and log back in to create a " "default preference file." msgstr "" -#: squirrelmail/functions/prefs.php:144 +#: squirrelmail/functions/prefs.php:164 squirrelmail/functions/prefs.php:169 msgid "Error opening " msgstr "" -#: squirrelmail/plugins/filters/filters.php:359 +#: squirrelmail/functions/prefs.php:165 +msgid "Default preference file not found!" +msgstr "" + +#: squirrelmail/functions/prefs.php:166 squirrelmail/functions/prefs.php:171 +#: squirrelmail/functions/prefs.php:265 +msgid "Please contact your system administrator and report this error." +msgstr "" + +#: squirrelmail/functions/prefs.php:170 +msgid "Could not create initial preference file!" +msgstr "" + +#: squirrelmail/functions/prefs.php:263 +#, c-format +msgid "Error creating directory %s." +msgstr "" + +#: squirrelmail/functions/prefs.php:264 +msgid "Could not create hashed directory structure!" +msgstr "" + +#: squirrelmail/plugins/filters/filters.php:360 msgid "" "COMMERCIAL - This list contains servers that are verified spam senders. It " "is a pretty reliable list to scan spam from." msgstr "" -#: squirrelmail/plugins/filters/filters.php:367 +#: squirrelmail/plugins/filters/filters.php:368 msgid "" "COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to " "be relayed through their system will be banned with this. Another good one " "to use." msgstr "" -#: squirrelmail/plugins/filters/filters.php:375 +#: squirrelmail/plugins/filters/filters.php:376 msgid "" "COMMERCIAL - Dial-up users are often filtered out since they should use " "their ISP's mail servers to send mail. Spammers typically get a dial-up " "account and send spam directly from there." msgstr "" -#: squirrelmail/plugins/filters/filters.php:383 +#: squirrelmail/plugins/filters/filters.php:384 msgid "COMMERCIAL - RBL+ Blackhole entries." msgstr "" -#: squirrelmail/plugins/filters/filters.php:391 +#: squirrelmail/plugins/filters/filters.php:392 msgid "COMMERCIAL - RBL+ OpenRelay entries." msgstr "" -#: squirrelmail/plugins/filters/filters.php:399 +#: squirrelmail/plugins/filters/filters.php:400 msgid "COMMERCIAL - RBL+ Dial-up entries." msgstr "" -#: squirrelmail/plugins/filters/filters.php:407 +#: squirrelmail/plugins/filters/filters.php:408 msgid "" "FREE - Osirusoft Relays - Osirusofts list of verified open relays. Seems to " "include servers used by abuse@uunet.net auto-replies too." msgstr "" -#: squirrelmail/plugins/filters/filters.php:415 +#: squirrelmail/plugins/filters/filters.php:416 msgid "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list." msgstr "" -#: squirrelmail/plugins/filters/filters.php:423 +#: squirrelmail/plugins/filters/filters.php:424 msgid "" "FREE - Osirusoft Confirmed Spam Source - Sites that continually spam and " "have been manually added after multiple nominations. Use with caution. Seems " "to catch abuse auto-replies from some ISPs." msgstr "" -#: squirrelmail/plugins/filters/filters.php:431 +#: squirrelmail/plugins/filters/filters.php:432 msgid "" "FREE - Osirusoft Smart Hosts - List of hosts that are secure but relay for " "other mail servers that are not secure." msgstr "" -#: squirrelmail/plugins/filters/filters.php:439 +#: squirrelmail/plugins/filters/filters.php:440 msgid "" "FREE - Osirusoft Spamware Developers - It is believed that these are IP " "ranges of companies that are known to produce spam software. Seems to catch " "abuse auto-replies from some ISPs." msgstr "" -#: squirrelmail/plugins/filters/filters.php:447 +#: squirrelmail/plugins/filters/filters.php:448 msgid "" "FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt " "users in without confirmation." msgstr "" -#: squirrelmail/plugins/filters/filters.php:455 +#: squirrelmail/plugins/filters/filters.php:456 msgid "" "FREE - ORDB was born when ORBS went off the air. It seems to have fewer " "false positives than ORBS did though." msgstr "" -#: squirrelmail/plugins/filters/filters.php:463 +#: squirrelmail/plugins/filters/filters.php:464 msgid "FREE - Another ORBS replacement (just the INPUTS database used here)." msgstr "" -#: squirrelmail/plugins/filters/filters.php:471 +#: squirrelmail/plugins/filters/filters.php:472 msgid "FREE - Another ORBS replacement (just the OUTPUTS database used here)." msgstr "" -#: squirrelmail/plugins/filters/filters.php:479 +#: squirrelmail/plugins/filters/filters.php:480 msgid "FREE - Five-Ten-sg.com - Direct SPAM sources." msgstr "" -#: squirrelmail/plugins/filters/filters.php:487 +#: squirrelmail/plugins/filters/filters.php:488 msgid "FREE - Five-Ten-sg.com - Dial-up lists - includes some DSL IPs." msgstr "" -#: squirrelmail/plugins/filters/filters.php:495 +#: squirrelmail/plugins/filters/filters.php:496 msgid "FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in." msgstr "" -#: squirrelmail/plugins/filters/filters.php:503 +#: squirrelmail/plugins/filters/filters.php:504 msgid "FREE - Five-Ten-sg.com - Other misc. servers." msgstr "" -#: squirrelmail/plugins/filters/filters.php:511 +#: squirrelmail/plugins/filters/filters.php:512 msgid "FREE - Five-Ten-sg.com - Single Stage servers." msgstr "" -#: squirrelmail/plugins/filters/filters.php:519 +#: squirrelmail/plugins/filters/filters.php:520 msgid "FREE - Five-Ten-sg.com - SPAM Support servers." msgstr "" -#: squirrelmail/plugins/filters/filters.php:527 +#: squirrelmail/plugins/filters/filters.php:528 msgid "FREE - Five-Ten-sg.com - Web Form IPs." msgstr "" -#: squirrelmail/plugins/filters/filters.php:535 +#: squirrelmail/plugins/filters/filters.php:536 msgid "" "FREE - Dorkslayers appears to include only really bad open relays outside " "the US to avoid being sued. Interestingly enough, their website recommends " "you NOT use their service." msgstr "" -#: squirrelmail/plugins/filters/filters.php:543 +#: squirrelmail/plugins/filters/filters.php:544 msgid "" "FREE - ORBL is another ORBS spinoff formed after ORBS shut down. May be " "SLOOOOOOW!" msgstr "" -#: squirrelmail/plugins/filters/filters.php:551 +#: squirrelmail/plugins/filters/filters.php:552 msgid "FREE - orbz.gst-group.co.uk - Inputs only." msgstr "" -#: squirrelmail/plugins/filters/filters.php:559 +#: squirrelmail/plugins/filters/filters.php:560 msgid "FREE - orbz.gst-group.co.uk - Outputs only." msgstr "" -#: squirrelmail/plugins/filters/filters.php:567 +#: squirrelmail/plugins/filters/filters.php:568 msgid "" "FREE - orbz.gst-group.co.uk - mailservers that refuse or bounce email " "addressed to postmaster@." msgstr "" -#: squirrelmail/plugins/filters/filters.php:575 +#: squirrelmail/plugins/filters/filters.php:576 #, c-format msgid "" "FREE, for now - SPAMCOP - An interesting solution that lists servers that " "have a very high spam to legit email ratio (85% or more)." msgstr "" -#: squirrelmail/plugins/filters/options.php:60 +#: squirrelmail/plugins/filters/options.php:62 msgid "Message Filtering" msgstr "" -#: squirrelmail/plugins/filters/options.php:76 +#: squirrelmail/plugins/filters/options.php:78 msgid "Match:" msgstr "" -#: squirrelmail/plugins/filters/options.php:102 +#: squirrelmail/plugins/filters/options.php:104 msgid "Contains:" msgstr "" -#: squirrelmail/plugins/filters/options.php:114 +#: squirrelmail/plugins/filters/options.php:116 msgid "Move to:" msgstr "" -#: squirrelmail/plugins/filters/options.php:156 +#: squirrelmail/plugins/filters/options.php:158 msgid "Down" msgstr "" -#: squirrelmail/plugins/filters/options.php:162 +#: squirrelmail/plugins/filters/options.php:164 msgid "Up" msgstr "" -#: squirrelmail/plugins/filters/options.php:165 +#: squirrelmail/plugins/filters/options.php:167 #, c-format msgid "If %s contains %s then move to %s" msgstr "" -#: squirrelmail/plugins/filters/setup.php:79 +#: squirrelmail/plugins/filters/setup.php:78 msgid "Message Filters" msgstr "" -#: squirrelmail/plugins/filters/setup.php:81 +#: squirrelmail/plugins/filters/setup.php:80 msgid "" "Filtering enables messages with different criteria to be automatically " "filtered into different folders for easier organization." msgstr "" -#: squirrelmail/plugins/filters/setup.php:87 +#: squirrelmail/plugins/filters/setup.php:86 msgid "SPAM Filters" msgstr "" -#: squirrelmail/plugins/filters/setup.php:89 +#: squirrelmail/plugins/filters/setup.php:88 msgid "" "SPAM filters allow you to select from various DNS based blacklists to detect " "junk email in your INBOX and move it to another folder (like Trash)." msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:52 +#: squirrelmail/plugins/filters/spamoptions.php:53 msgid "Spam Filtering" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:56 +#: squirrelmail/plugins/filters/spamoptions.php:57 msgid "WARNING! Tell your admin to set the SpamFilters_YourHop variable" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:76 +#: squirrelmail/plugins/filters/spamoptions.php:77 msgid "Move spam to:" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:93 +#: squirrelmail/plugins/filters/spamoptions.php:94 msgid "" "Moving spam directly to the trash may not be a good idea at first, since " "messages from friends and mailing lists might accidentally be marked as " @@ -1899,19 +1925,19 @@ msgid "" "around." msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:96 +#: squirrelmail/plugins/filters/spamoptions.php:97 msgid "What to Scan:" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:101 +#: squirrelmail/plugins/filters/spamoptions.php:102 msgid "All messages" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:105 +#: squirrelmail/plugins/filters/spamoptions.php:106 msgid "Only unread messages" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:111 +#: squirrelmail/plugins/filters/spamoptions.php:112 msgid "" "The more messages you scan, the longer it takes. I would suggest that you " "scan only new messages. If you make a change to your filters, I would set " @@ -1920,37 +1946,37 @@ msgid "" "you'll scan even the spam you read with the new filters." msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:137 +#: squirrelmail/plugins/filters/spamoptions.php:138 msgid "Save" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:149 +#: squirrelmail/plugins/filters/spamoptions.php:150 #, c-format msgid "Spam is sent to %s" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:149 +#: squirrelmail/plugins/filters/spamoptions.php:150 msgid "[not set yet]" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:151 +#: squirrelmail/plugins/filters/spamoptions.php:152 #, c-format msgid "Spam scan is limited to %s" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:151 +#: squirrelmail/plugins/filters/spamoptions.php:152 msgid "New Messages Only" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:151 +#: squirrelmail/plugins/filters/spamoptions.php:152 msgid "All Messages" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:161 +#: squirrelmail/plugins/filters/spamoptions.php:162 msgid "ON" msgstr "" -#: squirrelmail/plugins/filters/spamoptions.php:163 +#: squirrelmail/plugins/filters/spamoptions.php:164 msgid "OFF" msgstr "" @@ -1968,15 +1994,15 @@ msgstr "" msgid "Check Spelling" msgstr "" -#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:37 +#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:35 msgid "Back to "SpellChecker Options" page" msgstr "" -#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:212 +#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:210 msgid "ATTENTION:" msgstr "" -#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:213 +#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:211 msgid "" "SquirrelSpell was unable to decrypt your personal dictionary. This is most " "likely due to the fact that you have changed your mailbox password. In order " @@ -1988,20 +2014,20 @@ msgid "" "it, the encrypted data is no longer accessible." msgstr "" -#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:219 +#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:217 msgid "Delete my dictionary and start a new one" msgstr "" -#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:220 +#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:218 msgid "Decrypt my dictionary with my old password:" msgstr "" -#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:223 +#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:221 msgid "Proceed" msgstr "" +#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:227 #: squirrelmail/plugins/squirrelspell/sqspell_functions.php:229 -#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:231 msgid "Error Decrypting Dictionary" msgstr "" @@ -2328,382 +2354,382 @@ msgstr "" msgid "SquirrelSpell Options Menu" msgstr "" -#: squirrelmail/plugins/translate/options.php:93 +#: squirrelmail/plugins/translate/options.php:97 msgid "Translator" msgstr "" -#: squirrelmail/plugins/translate/options.php:96 +#: squirrelmail/plugins/translate/options.php:100 msgid "Your server options are as follows:" msgstr "" -#: squirrelmail/plugins/translate/options.php:101 +#: squirrelmail/plugins/translate/options.php:105 msgid "" "13 language pairs, maximum of 1000 characters translated, powered by Systran" msgstr "" -#: squirrelmail/plugins/translate/options.php:104 +#: squirrelmail/plugins/translate/options.php:108 msgid "" "10 language pairs, maximum of 25 kilobytes translated, powered by Systran" msgstr "" -#: squirrelmail/plugins/translate/options.php:107 +#: squirrelmail/plugins/translate/options.php:111 msgid "12 language pairs, no known limits, powered by Systran" msgstr "" -#: squirrelmail/plugins/translate/options.php:110 +#: squirrelmail/plugins/translate/options.php:114 msgid "" "767 language pairs, no known limits, powered by Translation Experts's " "InterTran" msgstr "" -#: squirrelmail/plugins/translate/options.php:113 +#: squirrelmail/plugins/translate/options.php:117 msgid "" "8 language pairs, no known limits, powered by GPLTrans (free, open source)" msgstr "" -#: squirrelmail/plugins/translate/options.php:119 +#: squirrelmail/plugins/translate/options.php:123 msgid "" "You also decide if you want the translation box displayed, and where it will " "be located." msgstr "" -#: squirrelmail/plugins/translate/options.php:123 +#: squirrelmail/plugins/translate/options.php:127 msgid "Select your translator:" msgstr "" -#: squirrelmail/plugins/translate/options.php:135 +#: squirrelmail/plugins/translate/options.php:139 msgid "When reading:" msgstr "" -#: squirrelmail/plugins/translate/options.php:140 +#: squirrelmail/plugins/translate/options.php:144 msgid "Show translation box" msgstr "" -#: squirrelmail/plugins/translate/options.php:142 +#: squirrelmail/plugins/translate/options.php:146 msgid "to the left" msgstr "" -#: squirrelmail/plugins/translate/options.php:143 +#: squirrelmail/plugins/translate/options.php:147 msgid "in the center" msgstr "" -#: squirrelmail/plugins/translate/options.php:144 +#: squirrelmail/plugins/translate/options.php:148 msgid "to the right" msgstr "" -#: squirrelmail/plugins/translate/options.php:149 +#: squirrelmail/plugins/translate/options.php:153 msgid "Translate inside the SquirrelMail frames" msgstr "" -#: squirrelmail/plugins/translate/options.php:152 +#: squirrelmail/plugins/translate/options.php:156 msgid "When composing:" msgstr "" -#: squirrelmail/plugins/translate/options.php:156 +#: squirrelmail/plugins/translate/options.php:160 msgid "Not yet functional, currently does nothing" msgstr "" -#: squirrelmail/plugins/translate/setup.php:95 +#: squirrelmail/plugins/translate/setup.php:104 msgid "Translation Options" msgstr "" -#: squirrelmail/plugins/translate/setup.php:97 +#: squirrelmail/plugins/translate/setup.php:106 msgid "" "Which translator should be used when you get messages in a different " "language?" msgstr "" -#: squirrelmail/plugins/translate/setup.php:221 -#: squirrelmail/plugins/translate/setup.php:225 -#: squirrelmail/plugins/translate/setup.php:229 -#: squirrelmail/plugins/translate/setup.php:233 -#: squirrelmail/plugins/translate/setup.php:237 -#: squirrelmail/plugins/translate/setup.php:241 -#: squirrelmail/plugins/translate/setup.php:245 -#: squirrelmail/plugins/translate/setup.php:249 -#: squirrelmail/plugins/translate/setup.php:253 -#: squirrelmail/plugins/translate/setup.php:257 -#: squirrelmail/plugins/translate/setup.php:261 -#: squirrelmail/plugins/translate/setup.php:265 -#: squirrelmail/plugins/translate/setup.php:269 -#: squirrelmail/plugins/translate/setup.php:284 -#: squirrelmail/plugins/translate/setup.php:288 -#: squirrelmail/plugins/translate/setup.php:292 -#: squirrelmail/plugins/translate/setup.php:296 -#: squirrelmail/plugins/translate/setup.php:300 -#: squirrelmail/plugins/translate/setup.php:304 -#: squirrelmail/plugins/translate/setup.php:308 -#: squirrelmail/plugins/translate/setup.php:312 -#: squirrelmail/plugins/translate/setup.php:316 -#: squirrelmail/plugins/translate/setup.php:320 -#: squirrelmail/plugins/translate/setup.php:395 -#: squirrelmail/plugins/translate/setup.php:428 -#: squirrelmail/plugins/translate/setup.php:432 -#: squirrelmail/plugins/translate/setup.php:436 -#: squirrelmail/plugins/translate/setup.php:440 -#: squirrelmail/plugins/translate/setup.php:444 -#: squirrelmail/plugins/translate/setup.php:448 -#: squirrelmail/plugins/translate/setup.php:452 -#: squirrelmail/plugins/translate/setup.php:456 -#: squirrelmail/plugins/translate/setup.php:460 -#: squirrelmail/plugins/translate/setup.php:464 -#: squirrelmail/plugins/translate/setup.php:468 -#: squirrelmail/plugins/translate/setup.php:472 -#, c-format -msgid "%s to %s" -msgstr "" - -#: squirrelmail/plugins/translate/setup.php:222 -#: squirrelmail/plugins/translate/setup.php:226 #: squirrelmail/plugins/translate/setup.php:230 #: squirrelmail/plugins/translate/setup.php:234 #: squirrelmail/plugins/translate/setup.php:238 -#: squirrelmail/plugins/translate/setup.php:243 -#: squirrelmail/plugins/translate/setup.php:247 -#: squirrelmail/plugins/translate/setup.php:251 -#: squirrelmail/plugins/translate/setup.php:255 -#: squirrelmail/plugins/translate/setup.php:259 -#: squirrelmail/plugins/translate/setup.php:271 -#: squirrelmail/plugins/translate/setup.php:285 -#: squirrelmail/plugins/translate/setup.php:289 +#: squirrelmail/plugins/translate/setup.php:242 +#: squirrelmail/plugins/translate/setup.php:246 +#: squirrelmail/plugins/translate/setup.php:250 +#: squirrelmail/plugins/translate/setup.php:254 +#: squirrelmail/plugins/translate/setup.php:258 +#: squirrelmail/plugins/translate/setup.php:262 +#: squirrelmail/plugins/translate/setup.php:266 +#: squirrelmail/plugins/translate/setup.php:270 +#: squirrelmail/plugins/translate/setup.php:274 +#: squirrelmail/plugins/translate/setup.php:278 #: squirrelmail/plugins/translate/setup.php:293 #: squirrelmail/plugins/translate/setup.php:297 #: squirrelmail/plugins/translate/setup.php:301 -#: squirrelmail/plugins/translate/setup.php:306 -#: squirrelmail/plugins/translate/setup.php:310 -#: squirrelmail/plugins/translate/setup.php:314 -#: squirrelmail/plugins/translate/setup.php:318 -#: squirrelmail/plugins/translate/setup.php:322 -#: squirrelmail/plugins/translate/setup.php:343 -#: squirrelmail/plugins/translate/setup.php:373 -#: squirrelmail/plugins/translate/setup.php:429 -#: squirrelmail/plugins/translate/setup.php:433 +#: squirrelmail/plugins/translate/setup.php:305 +#: squirrelmail/plugins/translate/setup.php:309 +#: squirrelmail/plugins/translate/setup.php:313 +#: squirrelmail/plugins/translate/setup.php:317 +#: squirrelmail/plugins/translate/setup.php:321 +#: squirrelmail/plugins/translate/setup.php:325 +#: squirrelmail/plugins/translate/setup.php:329 +#: squirrelmail/plugins/translate/setup.php:404 #: squirrelmail/plugins/translate/setup.php:437 #: squirrelmail/plugins/translate/setup.php:441 #: squirrelmail/plugins/translate/setup.php:445 +#: squirrelmail/plugins/translate/setup.php:449 +#: squirrelmail/plugins/translate/setup.php:453 +#: squirrelmail/plugins/translate/setup.php:457 +#: squirrelmail/plugins/translate/setup.php:461 +#: squirrelmail/plugins/translate/setup.php:465 +#: squirrelmail/plugins/translate/setup.php:469 +#: squirrelmail/plugins/translate/setup.php:473 +#: squirrelmail/plugins/translate/setup.php:477 +#: squirrelmail/plugins/translate/setup.php:481 +#, c-format +msgid "%s to %s" +msgstr "" + +#: squirrelmail/plugins/translate/setup.php:231 +#: squirrelmail/plugins/translate/setup.php:235 +#: squirrelmail/plugins/translate/setup.php:239 +#: squirrelmail/plugins/translate/setup.php:243 +#: squirrelmail/plugins/translate/setup.php:247 +#: squirrelmail/plugins/translate/setup.php:252 +#: squirrelmail/plugins/translate/setup.php:256 +#: squirrelmail/plugins/translate/setup.php:260 +#: squirrelmail/plugins/translate/setup.php:264 +#: squirrelmail/plugins/translate/setup.php:268 +#: squirrelmail/plugins/translate/setup.php:280 +#: squirrelmail/plugins/translate/setup.php:294 +#: squirrelmail/plugins/translate/setup.php:298 +#: squirrelmail/plugins/translate/setup.php:302 +#: squirrelmail/plugins/translate/setup.php:306 +#: squirrelmail/plugins/translate/setup.php:310 +#: squirrelmail/plugins/translate/setup.php:315 +#: squirrelmail/plugins/translate/setup.php:319 +#: squirrelmail/plugins/translate/setup.php:323 +#: squirrelmail/plugins/translate/setup.php:327 +#: squirrelmail/plugins/translate/setup.php:331 +#: squirrelmail/plugins/translate/setup.php:352 +#: squirrelmail/plugins/translate/setup.php:382 +#: squirrelmail/plugins/translate/setup.php:438 +#: squirrelmail/plugins/translate/setup.php:442 +#: squirrelmail/plugins/translate/setup.php:446 #: squirrelmail/plugins/translate/setup.php:450 -#: squirrelmail/plugins/translate/setup.php:462 -#: squirrelmail/plugins/translate/setup.php:466 -#: squirrelmail/plugins/translate/setup.php:470 -#: squirrelmail/plugins/translate/setup.php:474 +#: squirrelmail/plugins/translate/setup.php:454 +#: squirrelmail/plugins/translate/setup.php:459 +#: squirrelmail/plugins/translate/setup.php:471 +#: squirrelmail/plugins/translate/setup.php:475 +#: squirrelmail/plugins/translate/setup.php:479 +#: squirrelmail/plugins/translate/setup.php:483 msgid "English" msgstr "" -#: squirrelmail/plugins/translate/setup.php:223 -#: squirrelmail/plugins/translate/setup.php:242 -#: squirrelmail/plugins/translate/setup.php:263 -#: squirrelmail/plugins/translate/setup.php:266 -#: squirrelmail/plugins/translate/setup.php:290 -#: squirrelmail/plugins/translate/setup.php:309 -#: squirrelmail/plugins/translate/setup.php:346 -#: squirrelmail/plugins/translate/setup.php:376 -#: squirrelmail/plugins/translate/setup.php:408 -#: squirrelmail/plugins/translate/setup.php:430 -#: squirrelmail/plugins/translate/setup.php:449 -#: squirrelmail/plugins/translate/setup.php:453 +#: squirrelmail/plugins/translate/setup.php:232 +#: squirrelmail/plugins/translate/setup.php:251 +#: squirrelmail/plugins/translate/setup.php:272 +#: squirrelmail/plugins/translate/setup.php:275 +#: squirrelmail/plugins/translate/setup.php:299 +#: squirrelmail/plugins/translate/setup.php:318 +#: squirrelmail/plugins/translate/setup.php:355 +#: squirrelmail/plugins/translate/setup.php:385 +#: squirrelmail/plugins/translate/setup.php:417 +#: squirrelmail/plugins/translate/setup.php:439 #: squirrelmail/plugins/translate/setup.php:458 +#: squirrelmail/plugins/translate/setup.php:462 +#: squirrelmail/plugins/translate/setup.php:467 msgid "French" msgstr "" -#: squirrelmail/plugins/translate/setup.php:227 -#: squirrelmail/plugins/translate/setup.php:246 -#: squirrelmail/plugins/translate/setup.php:262 -#: squirrelmail/plugins/translate/setup.php:267 -#: squirrelmail/plugins/translate/setup.php:294 -#: squirrelmail/plugins/translate/setup.php:313 -#: squirrelmail/plugins/translate/setup.php:347 -#: squirrelmail/plugins/translate/setup.php:377 -#: squirrelmail/plugins/translate/setup.php:409 -#: squirrelmail/plugins/translate/setup.php:434 -#: squirrelmail/plugins/translate/setup.php:454 -#: squirrelmail/plugins/translate/setup.php:457 -#: squirrelmail/plugins/translate/setup.php:461 +#: squirrelmail/plugins/translate/setup.php:236 +#: squirrelmail/plugins/translate/setup.php:255 +#: squirrelmail/plugins/translate/setup.php:271 +#: squirrelmail/plugins/translate/setup.php:276 +#: squirrelmail/plugins/translate/setup.php:303 +#: squirrelmail/plugins/translate/setup.php:322 +#: squirrelmail/plugins/translate/setup.php:356 +#: squirrelmail/plugins/translate/setup.php:386 +#: squirrelmail/plugins/translate/setup.php:418 +#: squirrelmail/plugins/translate/setup.php:443 +#: squirrelmail/plugins/translate/setup.php:463 +#: squirrelmail/plugins/translate/setup.php:466 +#: squirrelmail/plugins/translate/setup.php:470 msgid "German" msgstr "" -#: squirrelmail/plugins/translate/setup.php:231 -#: squirrelmail/plugins/translate/setup.php:250 -#: squirrelmail/plugins/translate/setup.php:298 -#: squirrelmail/plugins/translate/setup.php:317 -#: squirrelmail/plugins/translate/setup.php:351 -#: squirrelmail/plugins/translate/setup.php:381 -#: squirrelmail/plugins/translate/setup.php:411 -#: squirrelmail/plugins/translate/setup.php:438 -#: squirrelmail/plugins/translate/setup.php:465 +#: squirrelmail/plugins/translate/setup.php:240 +#: squirrelmail/plugins/translate/setup.php:259 +#: squirrelmail/plugins/translate/setup.php:307 +#: squirrelmail/plugins/translate/setup.php:326 +#: squirrelmail/plugins/translate/setup.php:360 +#: squirrelmail/plugins/translate/setup.php:390 +#: squirrelmail/plugins/translate/setup.php:420 +#: squirrelmail/plugins/translate/setup.php:447 +#: squirrelmail/plugins/translate/setup.php:474 msgid "Italian" msgstr "" -#: squirrelmail/plugins/translate/setup.php:235 -#: squirrelmail/plugins/translate/setup.php:254 -#: squirrelmail/plugins/translate/setup.php:302 -#: squirrelmail/plugins/translate/setup.php:321 -#: squirrelmail/plugins/translate/setup.php:356 -#: squirrelmail/plugins/translate/setup.php:386 -#: squirrelmail/plugins/translate/setup.php:413 -#: squirrelmail/plugins/translate/setup.php:442 -#: squirrelmail/plugins/translate/setup.php:469 +#: squirrelmail/plugins/translate/setup.php:244 +#: squirrelmail/plugins/translate/setup.php:263 +#: squirrelmail/plugins/translate/setup.php:311 +#: squirrelmail/plugins/translate/setup.php:330 +#: squirrelmail/plugins/translate/setup.php:365 +#: squirrelmail/plugins/translate/setup.php:395 +#: squirrelmail/plugins/translate/setup.php:422 +#: squirrelmail/plugins/translate/setup.php:451 +#: squirrelmail/plugins/translate/setup.php:478 msgid "Portuguese" msgstr "" -#: squirrelmail/plugins/translate/setup.php:239 -#: squirrelmail/plugins/translate/setup.php:258 -#: squirrelmail/plugins/translate/setup.php:286 -#: squirrelmail/plugins/translate/setup.php:305 -#: squirrelmail/plugins/translate/setup.php:361 -#: squirrelmail/plugins/translate/setup.php:391 -#: squirrelmail/plugins/translate/setup.php:414 -#: squirrelmail/plugins/translate/setup.php:446 -#: squirrelmail/plugins/translate/setup.php:473 +#: squirrelmail/plugins/translate/setup.php:248 +#: squirrelmail/plugins/translate/setup.php:267 +#: squirrelmail/plugins/translate/setup.php:295 +#: squirrelmail/plugins/translate/setup.php:314 +#: squirrelmail/plugins/translate/setup.php:370 +#: squirrelmail/plugins/translate/setup.php:400 +#: squirrelmail/plugins/translate/setup.php:423 +#: squirrelmail/plugins/translate/setup.php:455 +#: squirrelmail/plugins/translate/setup.php:482 msgid "Spanish" msgstr "" -#: squirrelmail/plugins/translate/setup.php:270 -#: squirrelmail/plugins/translate/setup.php:358 -#: squirrelmail/plugins/translate/setup.php:388 +#: squirrelmail/plugins/translate/setup.php:279 +#: squirrelmail/plugins/translate/setup.php:367 +#: squirrelmail/plugins/translate/setup.php:397 msgid "Russian" msgstr "" -#: squirrelmail/plugins/translate/setup.php:273 -#: squirrelmail/plugins/translate/setup.php:325 -#: squirrelmail/plugins/translate/setup.php:396 -#: squirrelmail/plugins/translate/setup.php:417 -#: squirrelmail/plugins/translate/setup.php:476 +#: squirrelmail/plugins/translate/setup.php:282 +#: squirrelmail/plugins/translate/setup.php:334 +#: squirrelmail/plugins/translate/setup.php:405 +#: squirrelmail/plugins/translate/setup.php:426 +#: squirrelmail/plugins/translate/setup.php:485 msgid "Translate" msgstr "" -#: squirrelmail/plugins/translate/setup.php:337 -#: squirrelmail/plugins/translate/setup.php:367 +#: squirrelmail/plugins/translate/setup.php:346 +#: squirrelmail/plugins/translate/setup.php:376 msgid "Brazilian Portuguese" msgstr "" -#: squirrelmail/plugins/translate/setup.php:338 -#: squirrelmail/plugins/translate/setup.php:368 +#: squirrelmail/plugins/translate/setup.php:347 +#: squirrelmail/plugins/translate/setup.php:377 msgid "Bulgarian" msgstr "" -#: squirrelmail/plugins/translate/setup.php:339 -#: squirrelmail/plugins/translate/setup.php:369 +#: squirrelmail/plugins/translate/setup.php:348 +#: squirrelmail/plugins/translate/setup.php:378 msgid "Croatian" msgstr "" -#: squirrelmail/plugins/translate/setup.php:340 -#: squirrelmail/plugins/translate/setup.php:370 +#: squirrelmail/plugins/translate/setup.php:349 +#: squirrelmail/plugins/translate/setup.php:379 msgid "Czech" msgstr "" -#: squirrelmail/plugins/translate/setup.php:341 -#: squirrelmail/plugins/translate/setup.php:371 +#: squirrelmail/plugins/translate/setup.php:350 +#: squirrelmail/plugins/translate/setup.php:380 msgid "Danish" msgstr "" -#: squirrelmail/plugins/translate/setup.php:342 -#: squirrelmail/plugins/translate/setup.php:372 -#: squirrelmail/plugins/translate/setup.php:407 +#: squirrelmail/plugins/translate/setup.php:351 +#: squirrelmail/plugins/translate/setup.php:381 +#: squirrelmail/plugins/translate/setup.php:416 msgid "Dutch" msgstr "" -#: squirrelmail/plugins/translate/setup.php:344 -#: squirrelmail/plugins/translate/setup.php:374 +#: squirrelmail/plugins/translate/setup.php:353 +#: squirrelmail/plugins/translate/setup.php:383 msgid "European Spanish" msgstr "" -#: squirrelmail/plugins/translate/setup.php:345 -#: squirrelmail/plugins/translate/setup.php:375 +#: squirrelmail/plugins/translate/setup.php:354 +#: squirrelmail/plugins/translate/setup.php:384 msgid "Finnish" msgstr "" -#: squirrelmail/plugins/translate/setup.php:348 -#: squirrelmail/plugins/translate/setup.php:378 +#: squirrelmail/plugins/translate/setup.php:357 +#: squirrelmail/plugins/translate/setup.php:387 msgid "Greek" msgstr "" -#: squirrelmail/plugins/translate/setup.php:349 -#: squirrelmail/plugins/translate/setup.php:379 +#: squirrelmail/plugins/translate/setup.php:358 +#: squirrelmail/plugins/translate/setup.php:388 msgid "Hungarian" msgstr "" -#: squirrelmail/plugins/translate/setup.php:350 -#: squirrelmail/plugins/translate/setup.php:380 +#: squirrelmail/plugins/translate/setup.php:359 +#: squirrelmail/plugins/translate/setup.php:389 msgid "Icelandic" msgstr "" -#: squirrelmail/plugins/translate/setup.php:352 -#: squirrelmail/plugins/translate/setup.php:382 +#: squirrelmail/plugins/translate/setup.php:361 +#: squirrelmail/plugins/translate/setup.php:391 msgid "Japanese" msgstr "" -#: squirrelmail/plugins/translate/setup.php:353 -#: squirrelmail/plugins/translate/setup.php:383 +#: squirrelmail/plugins/translate/setup.php:362 +#: squirrelmail/plugins/translate/setup.php:392 msgid "Latin American Spanish" msgstr "" -#: squirrelmail/plugins/translate/setup.php:354 -#: squirrelmail/plugins/translate/setup.php:384 +#: squirrelmail/plugins/translate/setup.php:363 +#: squirrelmail/plugins/translate/setup.php:393 msgid "Norwegian" msgstr "" -#: squirrelmail/plugins/translate/setup.php:355 -#: squirrelmail/plugins/translate/setup.php:385 +#: squirrelmail/plugins/translate/setup.php:364 +#: squirrelmail/plugins/translate/setup.php:394 msgid "Polish" msgstr "" -#: squirrelmail/plugins/translate/setup.php:357 -#: squirrelmail/plugins/translate/setup.php:387 +#: squirrelmail/plugins/translate/setup.php:366 +#: squirrelmail/plugins/translate/setup.php:396 msgid "Romanian" msgstr "" -#: squirrelmail/plugins/translate/setup.php:359 -#: squirrelmail/plugins/translate/setup.php:389 +#: squirrelmail/plugins/translate/setup.php:368 +#: squirrelmail/plugins/translate/setup.php:398 msgid "Serbian" msgstr "" -#: squirrelmail/plugins/translate/setup.php:360 -#: squirrelmail/plugins/translate/setup.php:390 +#: squirrelmail/plugins/translate/setup.php:369 +#: squirrelmail/plugins/translate/setup.php:399 msgid "Slovenian" msgstr "" -#: squirrelmail/plugins/translate/setup.php:362 -#: squirrelmail/plugins/translate/setup.php:392 +#: squirrelmail/plugins/translate/setup.php:371 +#: squirrelmail/plugins/translate/setup.php:401 msgid "Swedish" msgstr "" -#: squirrelmail/plugins/translate/setup.php:363 -#: squirrelmail/plugins/translate/setup.php:393 +#: squirrelmail/plugins/translate/setup.php:372 +#: squirrelmail/plugins/translate/setup.php:402 msgid "Welsh" msgstr "" -#: squirrelmail/plugins/translate/setup.php:410 +#: squirrelmail/plugins/translate/setup.php:419 msgid "Indonesian" msgstr "" -#: squirrelmail/plugins/translate/setup.php:412 +#: squirrelmail/plugins/translate/setup.php:421 msgid "Latin" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:33 +#: squirrelmail/plugins/newmail/newmail_opt.php:34 msgid "New Mail Notification" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:36 +#: squirrelmail/plugins/newmail/newmail_opt.php:37 msgid "" "Select Enable Media Playing to turn on playing a media file when " "unseen mail is in your folders. When enabled, you can specify the media file " "to play in the provided file box." msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:38 +#: squirrelmail/plugins/newmail/newmail_opt.php:39 msgid "" "The Check all boxes, not just INBOX option will check ALL of your " "folders for unseen mail, not just the inbox for notification." msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:40 +#: squirrelmail/plugins/newmail/newmail_opt.php:41 msgid "" "Selecting the Show popup option will enable the showing of a popup " "window when unseen mail is in your folders (requires JavaScript)." msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:42 +#: squirrelmail/plugins/newmail/newmail_opt.php:43 msgid "" "Use the Check RECENT to only check for messages that are recent. " "Recent messages are those that have just recently showed up and have not " @@ -2711,7 +2737,7 @@ msgid "" "by sounds or popups for unseen mail." msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:44 +#: squirrelmail/plugins/newmail/newmail_opt.php:45 msgid "" "Selecting the Change title option will change the title in some " "browsers to let you know when you have new mail (requires JavaScript, and " @@ -2720,7 +2746,7 @@ msgid "" "enabled." msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:46 +#: squirrelmail/plugins/newmail/newmail_opt.php:47 msgid "" "Select from the list of server files the media file to play when new " "mail arrives. Selecting local media will play the file specified in " @@ -2728,83 +2754,83 @@ msgid "" "is specified, the system will use a default from the server." msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:56 +#: squirrelmail/plugins/newmail/newmail_opt.php:57 msgid "Enable Media Playing" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:64 +#: squirrelmail/plugins/newmail/newmail_opt.php:65 msgid "Check all boxes, not just INBOX" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:72 +#: squirrelmail/plugins/newmail/newmail_opt.php:73 msgid "Count only messages that are RECENT" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:80 +#: squirrelmail/plugins/newmail/newmail_opt.php:81 msgid "Change title on supported browsers." msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:80 -#: squirrelmail/plugins/newmail/newmail_opt.php:88 +#: squirrelmail/plugins/newmail/newmail_opt.php:81 +#: squirrelmail/plugins/newmail/newmail_opt.php:89 msgid "requires JavaScript to work" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:88 +#: squirrelmail/plugins/newmail/newmail_opt.php:89 msgid "Show popup window on new mail" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:91 +#: squirrelmail/plugins/newmail/newmail_opt.php:92 msgid "Select server file:" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:93 +#: squirrelmail/plugins/newmail/newmail_opt.php:94 msgid "(local media)" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:110 +#: squirrelmail/plugins/newmail/newmail_opt.php:111 msgid "Try" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:118 +#: squirrelmail/plugins/newmail/newmail_opt.php:119 msgid "Local Media File:" msgstr "" -#: squirrelmail/plugins/newmail/newmail_opt.php:124 +#: squirrelmail/plugins/newmail/newmail_opt.php:125 msgid "Current File:" msgstr "" -#: squirrelmail/plugins/newmail/newmail.php:19 +#: squirrelmail/plugins/newmail/newmail.php:20 msgid "New Mail" msgstr "" -#: squirrelmail/plugins/newmail/newmail.php:26 +#: squirrelmail/plugins/newmail/newmail.php:27 msgid "SquirrelMail Notice:" msgstr "" -#: squirrelmail/plugins/newmail/newmail.php:30 +#: squirrelmail/plugins/newmail/newmail.php:31 msgid "You have new mail!" msgstr "" -#: squirrelmail/plugins/newmail/setup.php:76 +#: squirrelmail/plugins/newmail/setup.php:78 msgid "NewMail Options" msgstr "" -#: squirrelmail/plugins/newmail/setup.php:78 +#: squirrelmail/plugins/newmail/setup.php:80 msgid "" "This configures settings for playing sounds and/or showing popup windows " "when new mail arrives." msgstr "" -#: squirrelmail/plugins/newmail/setup.php:127 +#: squirrelmail/plugins/newmail/setup.php:129 msgid "New Mail Notification options saved" msgstr "" -#: squirrelmail/plugins/newmail/setup.php:200 +#: squirrelmail/plugins/newmail/setup.php:202 #, c-format msgid "%s New Messages" msgstr "" -#: squirrelmail/plugins/newmail/setup.php:204 +#: squirrelmail/plugins/newmail/setup.php:206 #, c-format msgid "%s New Message" msgstr "" @@ -3234,12 +3260,48 @@ msgstr "" msgid "Mail Fetch Result:" msgstr "" -#: squirrelmail/plugins/mail_fetch/setup.php:224 +#: squirrelmail/plugins/mail_fetch/setup.php:223 msgid "Simple POP3 Fetch Mail" msgstr "" -#: squirrelmail/plugins/mail_fetch/setup.php:226 +#: squirrelmail/plugins/mail_fetch/setup.php:225 msgid "" "This configures settings for downloading email from a pop3 mailbox to your " "account on this server." msgstr "" + +#: squirrelmail/plugins/bug_report/setup.php:65 +msgid "Bug Reports:" +msgstr "" + +#: squirrelmail/plugins/bug_report/setup.php:70 +msgid "Show button in toolbar" +msgstr "" + +#: squirrelmail/plugins/sent_subfolders/setup.php:94 +msgid "Sent Subfolders Options" +msgstr "" + +#: squirrelmail/plugins/sent_subfolders/setup.php:99 +msgid "Use Sent Subfolders" +msgstr "" + +#: squirrelmail/plugins/sent_subfolders/setup.php:102 +msgid "Disabled" +msgstr "" + +#: squirrelmail/plugins/sent_subfolders/setup.php:103 +msgid "Monthly" +msgstr "" + +#: squirrelmail/plugins/sent_subfolders/setup.php:104 +msgid "Quarterly" +msgstr "" + +#: squirrelmail/plugins/sent_subfolders/setup.php:105 +msgid "Yearly" +msgstr "" + +#: squirrelmail/plugins/sent_subfolders/setup.php:120 +msgid "Base Sent Folder" +msgstr "" diff --git a/po/xgetpo b/po/xgetpo index 5cf66dad..0f3256aa 100755 --- a/po/xgetpo +++ b/po/xgetpo @@ -28,5 +28,9 @@ xgettext --keyword=_ -keyword=N_ --default-domain=squirrelmail -j \ -C squirrelmail/plugins/newmail/*.php --output-dir=squirrelmail/po/ xgettext --keyword=_ -keyword=N_ --default-domain=squirrelmail -j \ -C squirrelmail/plugins/mail_fetch/*.php --output-dir=squirrelmail/po/ +xgettext --keyword=_ -keyword=N_ --default-domain=squirrelmail -j \ + -C squirrelmail/plugins/bug_report/*.php --output-dir=squirrelmail/po/ +xgettext --keyword=_ -keyword=N_ --default-domain=squirrelmail -j \ + -C squirrelmail/plugins/sent_subfolders/*.php --output-dir=squirrelmail/po/ cd squirrelmail/po \ No newline at end of file diff --git a/src/options_highlight.php b/src/options_highlight.php index f3f1f080..e50a54fe 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -18,330 +18,334 @@ require_once('../functions/array.php'); require_once('../functions/plugin.php'); function oh_opt( $val, $sel, $tit ) { - echo " \n"; } - if (! isset($action)) - $action = ''; - if (! isset($message_highlight_list)) - $message_highlight_list = array(); - - if ($action == 'delete' && isset($theid)) { - removePref($data_dir, $username, "highlight$theid"); - } else if ($action == 'save') { - if (!$theid) $theid = 0; - $identname = ereg_replace(',', ' ', $identname); - if ($color_type == 1) $newcolor = $newcolor_choose; - elseif ($color_type == 2) $newcolor = $newcolor_input; - else $newcolor = $color_type; - - $newcolor = ereg_replace(',', '', $newcolor); - $newcolor = ereg_replace('#', '', $newcolor); - $newcolor = ereg_replace('"', '', $newcolor); - $newcolor = ereg_replace('\'', '', $newcolor); - $value = ereg_replace(',', ' ', $value); - - setPref($data_dir, $username, "highlight$theid", $identname.','.$newcolor.','.$value.','.$match_type); - $message_highlight_list[$theid]['name'] = $identname; - $message_highlight_list[$theid]['color'] = $newcolor; - $message_highlight_list[$theid]['value'] = $value; - $message_highlight_list[$theid]['match_type'] = $match_type; - } - displayPageHeader($color, 'None'); +if (! isset($action)) { + $action = ''; +} +if (! isset($message_highlight_list)) { + $message_highlight_list = array(); +} + +if ($action == 'delete' && isset($theid)) { + removePref($data_dir, $username, "highlight$theid"); + header( "Location: $PHP_SELF" ); + exit; +} else if ($action == 'save') { + if (!$theid) $theid = 0; + $identname = ereg_replace(',', ' ', $identname); + if ($color_type == 1) $newcolor = $newcolor_choose; + elseif ($color_type == 2) $newcolor = $newcolor_input; + else $newcolor = $color_type; + + $newcolor = ereg_replace(',', '', $newcolor); + $newcolor = ereg_replace('#', '', $newcolor); + $newcolor = ereg_replace('"', '', $newcolor); + $newcolor = ereg_replace('\'', '', $newcolor); + $value = ereg_replace(',', ' ', $value); + + setPref($data_dir, $username, "highlight$theid", $identname.','.$newcolor.','.$value.','.$match_type); + $message_highlight_list[$theid]['name'] = $identname; + $message_highlight_list[$theid]['color'] = $newcolor; + $message_highlight_list[$theid]['value'] = $value; + $message_highlight_list[$theid]['match_type'] = $match_type; +} +displayPageHeader($color, 'None'); ?> -
-
-
-
+
+
+
+

[' . _("New") . ']'. +echo '
[' . _("New") . ']'. ' - ['._("Done").']

'."\n"; - if (count($message_highlight_list) >= 1) { - echo ''."\n"; - for ($i=0; $i < count($message_highlight_list); $i++) { +if (count($message_highlight_list) >= 1) { + echo '
'."\n"; + for ($i=0; $i < count($message_highlight_list); $i++) { echo ''. - "'; - } - echo "
". - "[". - _("Edit") . - '] [' . _("Delete") . ']'. - ''. - htmlspecialchars($message_highlight_list[$i]['name']) . - ''. - $message_highlight_list[$i]['match_type'] . ' = ' . - htmlspecialchars($message_highlight_list[$i]['value']). - '
\n". - "
\n"; - } else { - echo '
' . _("No highlighting is defined") . "

\n". - "
\n"; - } - if ($action == 'edit' || $action == 'add') { - if (!isset($theid)) - { + "". + "[". + _("Edit") . + '] [' . _("Delete") . ']'. + ''. + htmlspecialchars($message_highlight_list[$i]['name']) . + ''. + $message_highlight_list[$i]['match_type'] . ' = ' . + htmlspecialchars($message_highlight_list[$i]['value']). + ''; + } + echo "\n". + "
\n"; +} else { + echo '
' . _("No highlighting is defined") . "

\n". + "
\n"; +} +if ($action == 'edit' || $action == 'add') { + if (!isset($theid)) + { $theid = count($message_highlight_list); $message_highlight_list[$theid] = array(); - } - - $color_list[0] = '4444aa'; - $color_list[1] = '44aa44'; - $color_list[2] = 'aaaa44'; - $color_list[3] = '44aaaa'; - $color_list[4] = 'aa44aa'; - $color_list[5] = 'aaaaff'; - $color_list[6] = 'aaffaa'; - $color_list[7] = 'ffffaa'; - $color_list[8] = 'aaffff'; - $color_list[9] = 'ffaaff'; - $color_list[10] = 'aaaaaa'; - $color_list[11] = 'bfbfbf'; - $color_list[12] = 'dfdfdf'; - $color_list[13] = 'ffffff'; - - # helpful color chart from http://www.visibone.com/colorlab/big.html - $new_color_list["0,0"] = 'cccccc'; - $new_color_list["0,1"] = '999999'; - $new_color_list["0,2"] = '666666'; - $new_color_list["0,3"] = '333333'; - $new_color_list["0,4"] = '000000'; - - # red - $new_color_list["1,0"] = 'ff0000'; - $new_color_list["1,1"] = 'cc0000'; - $new_color_list["1,2"] = '990000'; - $new_color_list["1,3"] = '660000'; - $new_color_list["1,4"] = '330000'; - - $new_color_list["2,0"] = 'ffcccc'; - $new_color_list["2,1"] = 'cc9999'; - $new_color_list["2,2"] = '996666'; - $new_color_list["2,3"] = '663333'; - $new_color_list["2,4"] = '330000'; - - $new_color_list["3,0"] = 'ffcccc'; - $new_color_list["3,1"] = 'ff9999'; - $new_color_list["3,2"] = 'ff6666'; - $new_color_list["3,3"] = 'ff3333'; - $new_color_list["3,4"] = 'ff0000'; - - # green - $new_color_list["4,0"] = '00ff00'; - $new_color_list["4,1"] = '00cc00'; - $new_color_list["4,2"] = '009900'; - $new_color_list["4,3"] = '006600'; - $new_color_list["4,4"] = '003300'; - - $new_color_list["5,0"] = 'ccffcc'; - $new_color_list["5,1"] = '99cc99'; - $new_color_list["5,2"] = '669966'; - $new_color_list["5,3"] = '336633'; - $new_color_list["5,4"] = '003300'; - - $new_color_list["6,0"] = 'ccffcc'; - $new_color_list["6,1"] = '99ff99'; - $new_color_list["6,2"] = '66ff66'; - $new_color_list["6,3"] = '33ff33'; - $new_color_list["6,4"] = '00ff00'; - - # blue - $new_color_list["7,0"] = '0000ff'; - $new_color_list["7,1"] = '0000cc'; - $new_color_list["7,2"] = '000099'; - $new_color_list["7,3"] = '000066'; - $new_color_list["7,4"] = '000033'; - - $new_color_list["8,0"] = 'ccccff'; - $new_color_list["8,1"] = '9999cc'; - $new_color_list["8,2"] = '666699'; - $new_color_list["8,3"] = '333366'; - $new_color_list["8,4"] = '000033'; - - $new_color_list["9,0"] = 'ccccff'; - $new_color_list["9,1"] = '9999ff'; - $new_color_list["9,2"] = '6666ff'; - $new_color_list["9,3"] = '3333ff'; - $new_color_list["9,4"] = '0000ff'; - - # yellow - $new_color_list["10,0"] = 'ffff00'; - $new_color_list["10,1"] = 'cccc00'; - $new_color_list["10,2"] = '999900'; - $new_color_list["10,3"] = '666600'; - $new_color_list["10,4"] = '333300'; - - $new_color_list["11,0"] = 'ffffcc'; - $new_color_list["11,1"] = 'cccc99'; - $new_color_list["11,2"] = '999966'; - $new_color_list["11,3"] = '666633'; - $new_color_list["11,4"] = '333300'; - - $new_color_list["12,0"] = 'ffffcc'; - $new_color_list["12,1"] = 'ffff99'; - $new_color_list["12,2"] = 'ffff66'; - $new_color_list["12,3"] = 'ffff33'; - $new_color_list["12,4"] = 'ffff00'; - - # cyan - $new_color_list["13,0"] = '00ffff'; - $new_color_list["13,1"] = '00cccc'; - $new_color_list["13,2"] = '009999'; - $new_color_list["13,3"] = '006666'; - $new_color_list["13,4"] = '003333'; - - $new_color_list["14,0"] = 'ccffff'; - $new_color_list["14,1"] = '99cccc'; - $new_color_list["14,2"] = '669999'; - $new_color_list["14,3"] = '336666'; - $new_color_list["14,4"] = '003333'; - - $new_color_list["15,0"] = 'ccffff'; - $new_color_list["15,1"] = '99ffff'; - $new_color_list["15,2"] = '66ffff'; - $new_color_list["15,3"] = '33ffff'; - $new_color_list["15,4"] = '00ffff'; - - # magenta - $new_color_list["16,0"] = 'ff00ff'; - $new_color_list["16,1"] = 'cc00cc'; - $new_color_list["16,2"] = '990099'; - $new_color_list["16,3"] = '660066'; - $new_color_list["16,4"] = '330033'; - - $new_color_list["17,0"] = 'ffccff'; - $new_color_list["17,1"] = 'cc99cc'; - $new_color_list["17,2"] = '996699'; - $new_color_list["17,3"] = '663366'; - $new_color_list["17,4"] = '330033'; - - $new_color_list["18,0"] = 'ffccff'; - $new_color_list["18,1"] = 'ff99ff'; - $new_color_list["18,2"] = 'ff66ff'; - $new_color_list["18,3"] = 'ff33ff'; - $new_color_list["18,4"] = 'ff00ff'; - - $selected_input = ''; - $selected_choose = ''; - - for ($i=0; $i < 14; $i++) { - ${"selected".$i} = ''; - } - if (isset($message_highlight_list[$theid]['color'])) { - for ($i=0; $i < 14; $i++) { + } + + $color_list[0] = '4444aa'; + $color_list[1] = '44aa44'; + $color_list[2] = 'aaaa44'; + $color_list[3] = '44aaaa'; + $color_list[4] = 'aa44aa'; + $color_list[5] = 'aaaaff'; + $color_list[6] = 'aaffaa'; + $color_list[7] = 'ffffaa'; + $color_list[8] = 'aaffff'; + $color_list[9] = 'ffaaff'; + $color_list[10] = 'aaaaaa'; + $color_list[11] = 'bfbfbf'; + $color_list[12] = 'dfdfdf'; + $color_list[13] = 'ffffff'; + + # helpful color chart from http://www.visibone.com/colorlab/big.html + $new_color_list["0,0"] = 'cccccc'; + $new_color_list["0,1"] = '999999'; + $new_color_list["0,2"] = '666666'; + $new_color_list["0,3"] = '333333'; + $new_color_list["0,4"] = '000000'; + + # red + $new_color_list["1,0"] = 'ff0000'; + $new_color_list["1,1"] = 'cc0000'; + $new_color_list["1,2"] = '990000'; + $new_color_list["1,3"] = '660000'; + $new_color_list["1,4"] = '330000'; + + $new_color_list["2,0"] = 'ffcccc'; + $new_color_list["2,1"] = 'cc9999'; + $new_color_list["2,2"] = '996666'; + $new_color_list["2,3"] = '663333'; + $new_color_list["2,4"] = '330000'; + + $new_color_list["3,0"] = 'ffcccc'; + $new_color_list["3,1"] = 'ff9999'; + $new_color_list["3,2"] = 'ff6666'; + $new_color_list["3,3"] = 'ff3333'; + $new_color_list["3,4"] = 'ff0000'; + + # green + $new_color_list["4,0"] = '00ff00'; + $new_color_list["4,1"] = '00cc00'; + $new_color_list["4,2"] = '009900'; + $new_color_list["4,3"] = '006600'; + $new_color_list["4,4"] = '003300'; + + $new_color_list["5,0"] = 'ccffcc'; + $new_color_list["5,1"] = '99cc99'; + $new_color_list["5,2"] = '669966'; + $new_color_list["5,3"] = '336633'; + $new_color_list["5,4"] = '003300'; + + $new_color_list["6,0"] = 'ccffcc'; + $new_color_list["6,1"] = '99ff99'; + $new_color_list["6,2"] = '66ff66'; + $new_color_list["6,3"] = '33ff33'; + $new_color_list["6,4"] = '00ff00'; + + # blue + $new_color_list["7,0"] = '0000ff'; + $new_color_list["7,1"] = '0000cc'; + $new_color_list["7,2"] = '000099'; + $new_color_list["7,3"] = '000066'; + $new_color_list["7,4"] = '000033'; + + $new_color_list["8,0"] = 'ccccff'; + $new_color_list["8,1"] = '9999cc'; + $new_color_list["8,2"] = '666699'; + $new_color_list["8,3"] = '333366'; + $new_color_list["8,4"] = '000033'; + + $new_color_list["9,0"] = 'ccccff'; + $new_color_list["9,1"] = '9999ff'; + $new_color_list["9,2"] = '6666ff'; + $new_color_list["9,3"] = '3333ff'; + $new_color_list["9,4"] = '0000ff'; + + # yellow + $new_color_list["10,0"] = 'ffff00'; + $new_color_list["10,1"] = 'cccc00'; + $new_color_list["10,2"] = '999900'; + $new_color_list["10,3"] = '666600'; + $new_color_list["10,4"] = '333300'; + + $new_color_list["11,0"] = 'ffffcc'; + $new_color_list["11,1"] = 'cccc99'; + $new_color_list["11,2"] = '999966'; + $new_color_list["11,3"] = '666633'; + $new_color_list["11,4"] = '333300'; + + $new_color_list["12,0"] = 'ffffcc'; + $new_color_list["12,1"] = 'ffff99'; + $new_color_list["12,2"] = 'ffff66'; + $new_color_list["12,3"] = 'ffff33'; + $new_color_list["12,4"] = 'ffff00'; + + # cyan + $new_color_list["13,0"] = '00ffff'; + $new_color_list["13,1"] = '00cccc'; + $new_color_list["13,2"] = '009999'; + $new_color_list["13,3"] = '006666'; + $new_color_list["13,4"] = '003333'; + + $new_color_list["14,0"] = 'ccffff'; + $new_color_list["14,1"] = '99cccc'; + $new_color_list["14,2"] = '669999'; + $new_color_list["14,3"] = '336666'; + $new_color_list["14,4"] = '003333'; + + $new_color_list["15,0"] = 'ccffff'; + $new_color_list["15,1"] = '99ffff'; + $new_color_list["15,2"] = '66ffff'; + $new_color_list["15,3"] = '33ffff'; + $new_color_list["15,4"] = '00ffff'; + + # magenta + $new_color_list["16,0"] = 'ff00ff'; + $new_color_list["16,1"] = 'cc00cc'; + $new_color_list["16,2"] = '990099'; + $new_color_list["16,3"] = '660066'; + $new_color_list["16,4"] = '330033'; + + $new_color_list["17,0"] = 'ffccff'; + $new_color_list["17,1"] = 'cc99cc'; + $new_color_list["17,2"] = '996699'; + $new_color_list["17,3"] = '663366'; + $new_color_list["17,4"] = '330033'; + + $new_color_list["18,0"] = 'ffccff'; + $new_color_list["18,1"] = 'ff99ff'; + $new_color_list["18,2"] = 'ff66ff'; + $new_color_list["18,3"] = 'ff33ff'; + $new_color_list["18,4"] = 'ff00ff'; + + $selected_input = ''; + $selected_choose = ''; + + for ($i=0; $i < 14; $i++) { + ${"selected".$i} = ''; + } + if (isset($message_highlight_list[$theid]['color'])) { + for ($i=0; $i < 14; $i++) { if ($color_list[$i] == $message_highlight_list[$theid]['color']) { - $selected_choose = ' checked'; - ${"selected".$i} = ' selected'; - continue; + $selected_choose = ' checked'; + ${"selected".$i} = ' selected'; + continue; } - } - } - if (!isset($message_highlight_list[$theid]['color'])) - $selected_choose = ' checked'; - else if ($selected_choose == '') - $selected_input = ' checked'; - - echo '
' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo " \n"; - echo " ' . "\n"; - echo ' \n"; - echo " \n"; - echo ' ' . "\n"; - echo " \n"; - echo ' \n"; - echo ' \n"; - echo " \n"; - - # Show grid of color choices - echo "
\n"; - echo _("Identifying name") . ":"; - echo ' ' . "\n"; - if (isset($message_highlight_list[$theid]['name'])) - $disp = $message_highlight_list[$theid]['name']; - else - $disp = ''; - $disp = htmlspecialchars($disp); - echo " "; - echo "
 
' . "\n"; - echo _("Color") . ':'; - echo " ' . "\n"; - echo "  
\n"; - echo "  ". _("Other:") ." '._("Ex: 63aa7f")."
\n"; - echo "
\n"; - echo "\n"; - $current_color = $message_highlight_list[$theid]['color']; - for($x = 0; $x < 5; $x++) { + } + } + if (!isset($message_highlight_list[$theid]['color'])) + $selected_choose = ' checked'; + else if ($selected_choose == '') + $selected_input = ' checked'; + + echo '' . "\n"; + echo '' . "\n"; + echo '' . "\n"; + echo '
' . "\n"; + echo " \n"; + echo " ' . "\n"; + echo ' \n"; + echo " \n"; + echo ' ' . "\n"; + echo " \n"; + echo ' \n"; + echo ' \n"; + echo " \n"; + + # Show grid of color choices + echo "\n"; - - echo ' ' . "\n"; - echo " \n"; - echo ' \n"; - echo " \n"; - echo "
\n"; + echo _("Identifying name") . ":"; + echo ' ' . "\n"; + if (isset($message_highlight_list[$theid]['name'])) + $disp = $message_highlight_list[$theid]['name']; + else + $disp = ''; + $disp = htmlspecialchars($disp); + echo " "; + echo "
 
' . "\n"; + echo _("Color") . ':'; + echo " ' . "\n"; + echo "  
\n"; + echo "  ". _("Other:") ." '._("Ex: 63aa7f")."
\n"; + echo "
\n"; + echo "\n"; + $current_color = $message_highlight_list[$theid]['color']; + for($x = 0; $x < 5; $x++) { echo "\n"; for($y = 0; $y < 19; $y++) { - $gridindex = "$y,$x"; - $gridcolor = $new_color_list[$gridindex]; - $selected = ($gridcolor == $current_color)?'SELECTED':'' ; - echo "\n"; + $gridindex = "$y,$x"; + $gridcolor = $new_color_list[$gridindex]; + $selected = ($gridcolor == $current_color)?'SELECTED':'' ; + echo "\n"; } echo "\n"; - } - echo "
\n"; - echo "\n"; + echo "
\n"; - echo "
 
' . "\n"; - echo " \n"; - echo '' . _("Matches") . ': '; - if (isset($message_highlight_list[$theid]['value'])) - $disp = $message_highlight_list[$theid]['value']; - else - $disp = ''; - $disp = htmlspecialchars($disp); - echo ' '; - echo "
\n"; - echo '
\n"; - echo "\n"; - } - do_hook('options_highlight_bottom'); + } + echo "
\n"; + echo "\n"; + + echo '  ' . "\n"; + echo " \n"; + echo ' ' . "\n"; + echo " \n"; + echo '' . _("Matches") . ': '; + if (isset($message_highlight_list[$theid]['value'])) + $disp = $message_highlight_list[$theid]['value']; + else + $disp = ''; + $disp = htmlspecialchars($disp); + echo ' '; + echo " \n"; + echo " \n"; + echo "\n"; + echo '
\n"; + echo "\n"; +} +do_hook('options_highlight_bottom'); ?> -- 2.25.1