From 0e1a248bbf1741fee46743bb9ab01870f1341d53 Mon Sep 17 00:00:00 2001 From: jervfors Date: Sat, 16 Apr 2005 17:45:40 +0000 Subject: [PATCH] Fixing strings: - Removing space before colon - Removing trailing spaces - Changing "said" to "wrote" git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9316 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- ChangeLog | 2 +- functions/imap_asearch.php | 261 ++++++++--------- functions/imap_general.php | 82 +++--- help/en_US/options.hlp | 4 +- include/options/folder.php | 8 +- include/options/personal.php | 4 +- po/squirrelmail.pot | 547 +++++++++++++++++------------------ src/compose.php | 8 +- src/read_body.php | 2 +- 9 files changed, 447 insertions(+), 471 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f29ce79..f85c4089 100644 --- a/ChangeLog +++ b/ChangeLog @@ -195,7 +195,7 @@ Version 1.5.1 -- CVS - Fix undefined variables in src/webmail.php. - 24hr clock format should include a leading 0. - Removed numeric keys for plugin array in config.php. - - Fixed translations of "On DATE, AUTHOR said" and "AUTHOR said" replies. + - Fixed translations of "On DATE, AUTHOR Wrote" and "AUTHOR Wrote" replies. - Added sq_str_pad function for padding of multi-byte strings. - Added sq_strlen function for calculation of multi-byte string length. - Quoted "INBOX" in check for the status of INBOX in a LIST call. Fixes an diff --git a/functions/imap_asearch.php b/functions/imap_asearch.php index 12269e04..7867335d 100644 --- a/functions/imap_asearch.php +++ b/functions/imap_asearch.php @@ -1,36 +1,36 @@ => 'asequence', */ // Special handling, @see sqimap_asearch_build_criteria() @@ -71,9 +71,9 @@ $imap_asearch_opcodes = array( 'UNSEEN' => '' ); -/** Imap SEARCH month names encoding -* @global array $imap_asearch_months -*/ +/** IMAP SEARCH month names encoding + * @global array $imap_asearch_months + */ $imap_asearch_months = array( '01' => 'jan', '02' => 'feb', @@ -90,37 +90,38 @@ $imap_asearch_months = array( ); /** -* Function to display an error related to an IMAP-query. -* We need to do our own error management since we may receive NO responses on purpose (even BAD with SORT or THREAD) -* so we call sqimap_error_box() if the function exists (sm >= 1.5) or use our own embedded code -* @global array imap_error_titles -* @param string $response the imap server response code -* @param string $query the failed query -* @param string $message an optional error message -* @param string $link an optional link to try again -*/ + * Function to display an error related to an IMAP query. + * We need to do our own error management since we may receive NO responses on purpose (even BAD with SORT or THREAD) + * so we call sqimap_error_box() if the function exists (sm >= 1.5) or use our own embedded code + * @global array imap_error_titles + * @param string $response the imap server response code + * @param string $query the failed query + * @param string $message an optional error message + * @param string $link an optional link to try again + */ //@global array color sm colors array function sqimap_asearch_error_box($response, $query, $message, $link = '') { global $color; - // Error message titles according to imap server returned code + // Error message titles according to IMAP server returned code $imap_error_titles = array( 'OK' => '', - 'NO' => _("ERROR : Could not complete request."), - 'BAD' => _("ERROR : Bad or malformed request."), - 'BYE' => _("ERROR : Imap server closed the connection."), - '' => _("ERROR : Connection dropped by imap-server.") + 'NO' => _("ERROR: Could not complete request."), + 'BAD' => _("ERROR: Bad or malformed request."), + 'BYE' => _("ERROR: IMAP server closed the connection."), + '' => _("ERROR: Connection dropped by IMAP server.") ); if (!array_key_exists($response, $imap_error_titles)) - $title = _("ERROR : Unknown imap response."); + $title = _("ERROR: Unknown IMAP response."); else $title = $imap_error_titles[$response]; if ($link == '') - $message_title = _("Reason Given: "); + $message_title = _("Reason Given:"); else - $message_title = _("Possible reason : "); + $message_title = _("Possible reason:"); + $message_title .= ' '; if (function_exists('sqimap_error_box')) sqimap_error_box($title, $query, $message_title, $message, $link); else { //Straight copy of 1.5 imap_general.php:sqimap_error_box(). Can be removed at a later time @@ -141,11 +142,11 @@ function sqimap_asearch_error_box($response, $query, $message, $link = '') } /** -* This is a convenient way to avoid spreading if (isset(... all over the code -* @param mixed $var any variable (reference) -* @param mixed $def default value to return if unset (default is zls (''), pass 0 or array() when appropriate) -* @return mixed $def if $var is unset, otherwise $var -*/ + * This is a convenient way to avoid spreading if (isset(... all over the code + * @param mixed $var any variable (reference) + * @param mixed $def default value to return if unset (default is zls (''), pass 0 or array() when appropriate) + * @return mixed $def if $var is unset, otherwise $var + */ function asearch_nz(&$var, $def = '') { if (isset($var)) @@ -154,11 +155,11 @@ function asearch_nz(&$var, $def = '') } /** -* This should give the same results as PHP 4 >= 4.3.0's html_entity_decode(), -* except it doesn't handle hex constructs -* @param string $string string to unhtmlentity() -* @return string decoded string -*/ + * This should give the same results as PHP 4 >= 4.3.0's html_entity_decode(), + * except it doesn't handle hex constructs + * @param string $string string to unhtmlentity() + * @return string decoded string + */ function asearch_unhtmlentities($string) { $trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES)); for ($i=127; $i<255; $i++) /* Add &#; entities */ @@ -167,15 +168,15 @@ function asearch_unhtmlentities($string) { /* I think the one above is quicker, though it should be benchmarked $string = strtr($string, array_flip(get_html_translation_table(HTML_ENTITIES))); return preg_replace("/&#([0-9]+);/E", "chr('\\1')", $string); -*/ + */ } /** -* Provide an easy way to dump the imap dialogue if $imap_asearch_debug_dump is TRUE -* @global bool imap_asearch_debug_dump -* @param string $var_name -* @param string $var_var -*/ + * Provide an easy way to dump the IMAP dialogue if $imap_asearch_debug_dump is TRUE + * @global bool imap_asearch_debug_dump + * @param string $var_name + * @param string $var_var + */ function s_debug_dump($var_name, $var_var) { global $imap_asearch_debug_dump; @@ -192,16 +193,16 @@ function s_debug_dump($var_name, $var_var) } /** Encode a string to quoted or literal as defined in rfc 3501 -* -* - 4.3 String: -* A quoted string is a sequence of zero or more 7-bit characters, -* excluding CR and LF, with double quote (<">) characters at each end. -* - 9. Formal Syntax: -* quoted-specials = DQUOTE / "\" -* @param string $what string to encode -* @param string $charset search charset used -* @return string encoded string -*/ + * + * - 4.3 String: + * A quoted string is a sequence of zero or more 7-bit characters, + * excluding CR and LF, with double quote (<">) characters at each end. + * - 9. Formal Syntax: + * quoted-specials = DQUOTE / "\" + * @param string $what string to encode + * @param string $charset search charset used + * @return string encoded string + */ function sqimap_asearch_encode_string($what, $charset) { if (strtoupper($charset) == 'ISO-2022-JP') // This should be now handled in imap_utf7_local? @@ -212,16 +213,16 @@ function sqimap_asearch_encode_string($what, $charset) } /** -* Parses a user date string into an rfc 3501 date string -* Handles space, slash, backslash, dot and comma as separators (and dash of course ;=) -* @global array imap_asearch_months -* @param string user date -* @return array a preg_match-style array: -* - [0] = fully formatted rfc 3501 date string (--<4 digit year>) -* - [1] = day -* - [2] = month -* - [3] = year -*/ + * Parses a user date string into an rfc 3501 date string + * Handles space, slash, backslash, dot and comma as separators (and dash of course ;=) + * @global array imap_asearch_months + * @param string user date + * @return array a preg_match-style array: + * - [0] = fully formatted rfc 3501 date string (--<4 digit year>) + * - [1] = day + * - [2] = month + * - [3] = year + */ function sqimap_asearch_parse_date($what) { global $imap_asearch_months; @@ -253,13 +254,13 @@ function sqimap_asearch_parse_date($what) } /** -* Build one criteria sequence -* @global array imap_asearch_opcodes -* @param string $opcode search opcode -* @param string $what opcode argument -* @param string $charset search charset -* @return string one full criteria sequence -*/ + * Build one criteria sequence + * @global array imap_asearch_opcodes + * @param string $opcode search opcode + * @param string $what opcode argument + * @param string $charset search charset + * @return string one full criteria sequence + */ function sqimap_asearch_build_criteria($opcode, $what, $charset) { global $imap_asearch_opcodes; @@ -314,11 +315,11 @@ function sqimap_asearch_build_criteria($opcode, $what, $charset) } /** -* Another way to do array_values(array_unique(array_merge($to, $from))); -* @param array $to to array (reference) -* @param array $from from array -* @return array uniquely merged array -*/ + * Another way to do array_values(array_unique(array_merge($to, $from))); + * @param array $to to array (reference) + * @param array $from from array + * @return array uniquely merged array + */ function sqimap_array_merge_unique(&$to, $from) { if (empty($to)) @@ -332,14 +333,14 @@ function sqimap_array_merge_unique(&$to, $from) } /** -* Run the imap SEARCH command as defined in rfc 3501 -* @link http://www.ietf.org/rfc/rfc3501.txt -* @param resource $imapConnection the current imap stream -* @param string $search_string the full search expression eg "ALL RECENT" -* @param string $search_charset charset to use or zls ('') -* @return array an IDs or UIDs array of matching messages or an empty array -* @since 1.5.0 -*/ + * Run the IMAP SEARCH command as defined in rfc 3501 + * @link http://www.ietf.org/rfc/rfc3501.txt + * @param resource $imapConnection the current imap stream + * @param string $search_string the full search expression eg "ALL RECENT" + * @param string $search_charset charset to use or zls ('') + * @return array an IDs or UIDs array of matching messages or an empty array + * @since 1.5.0 + */ function sqimap_run_search($imapConnection, $search_string, $search_charset) { //For some reason, this seems to happen and forbids searching servers not allowing OPTIONAL [CHARSET] @@ -375,11 +376,11 @@ function sqimap_run_search($imapConnection, $search_string, $search_charset) } /** -* @global bool allow_charset_search user setting -* @global array languages sm languages array -* @global string squirrelmail_language user language setting -* @return string the user defined charset if $allow_charset_search is TRUE else zls ('') -*/ + * @global bool allow_charset_search user setting + * @global array languages sm languages array + * @global string squirrelmail_language user language setting + * @return string the user defined charset if $allow_charset_search is TRUE else zls ('') + */ function sqimap_asearch_get_charset() { global $allow_charset_search, $languages, $squirrelmail_language; @@ -390,16 +391,16 @@ function sqimap_asearch_get_charset() } /** -* Convert sm internal sort to imap sort taking care of: -* - user defined date sorting (ARRIVAL vs DATE) -* - if the searched mailbox is the sent folder then TO is being used instead of FROM -* - reverse order by using REVERSE -* @param string $mailbox mailbox name to sort -* @param integer $sort_by sm sort criteria index -* @global bool internal_date_sort sort by arrival date instead of message date -* @global string sent_folder sent folder name -* @return string imap sort criteria -*/ + * Convert SquirrelMail internal sort to IMAP sort taking care of: + * - user defined date sorting (ARRIVAL vs DATE) + * - if the searched mailbox is the sent folder then TO is being used instead of FROM + * - reverse order by using REVERSE + * @param string $mailbox mailbox name to sort + * @param integer $sort_by sm sort criteria index + * @global bool internal_date_sort sort by arrival date instead of message date + * @global string sent_folder sent folder name + * @return string imap sort criteria + */ function sqimap_asearch_get_sort_criteria($mailbox, $sort_by) { global $internal_date_sort, $sent_folder; @@ -415,10 +416,10 @@ function sqimap_asearch_get_sort_criteria($mailbox, $sort_by) } /** -* @param string $cur_mailbox unformatted mailbox name -* @param array $boxes_unformatted selectable mailbox unformatted names array (reference) -* @return array sub mailboxes unformatted names -*/ + * @param string $cur_mailbox unformatted mailbox name + * @param array $boxes_unformatted selectable mailbox unformatted names array (reference) + * @return array sub mailboxes unformatted names + */ function sqimap_asearch_get_sub_mailboxes($cur_mailbox, &$mboxes_array) { $sub_mboxes_array = array(); @@ -431,18 +432,18 @@ function sqimap_asearch_get_sub_mailboxes($cur_mailbox, &$mboxes_array) } /** -* Create the search query strings for all given criteria and merge results for every mailbox -* @param resource $imapConnection -* @param array $mailbox_array (reference) -* @param array $biop_array (reference) -* @param array $unop_array (reference) -* @param array $where_array (reference) -* @param array $what_array (reference) -* @param array $exclude_array (reference) -* @param array $sub_array (reference) -* @param array $mboxes_array selectable unformatted mailboxes names (reference) -* @return array array(mailbox => array(UIDs)) -*/ + * Create the search query strings for all given criteria and merge results for every mailbox + * @param resource $imapConnection + * @param array $mailbox_array (reference) + * @param array $biop_array (reference) + * @param array $unop_array (reference) + * @param array $where_array (reference) + * @param array $what_array (reference) + * @param array $exclude_array (reference) + * @param array $sub_array (reference) + * @param array $mboxes_array selectable unformatted mailboxes names (reference) + * @return array array(mailbox => array(UIDs)) + */ function sqimap_asearch($imapConnection, &$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array, &$mboxes_array) { diff --git a/functions/imap_general.php b/functions/imap_general.php index 4bf4151e..0a4aa5fb 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -6,7 +6,7 @@ * Copyright (c) 1999-2005 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * - * This implements all functions that do general imap functions. + * This implements all functions that do general IMAP functions. * * @version $Id$ * @package squirrelmail @@ -21,7 +21,7 @@ require_once(SM_PATH . 'functions/auth.php'); /** * Generates a new session ID by incrementing the last one used; * this ensures that each command has a unique ID. - * @param bool $unique_id (since 1.3.0) controls use of unique + * @param bool $unique_id (since 1.3.0) controls use of unique * identifiers/message sequence numbers in IMAP commands. See IMAP * rfc 'UID command' chapter. * @return string IMAP session id of the form 'A000'. @@ -46,7 +46,7 @@ function sqimap_session_id($unique_id = FALSE) { * @param array $response * @param array $message * @param boolean $unique_id (since 1.3.0) see sqimap_session_id(). - * @return mixed returns false on imap error. displays error message + * @return mixed returns false on imap error. displays error message * if imap stream is not available. * @since 1.2.3 */ @@ -66,7 +66,7 @@ function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$respon set_up_language($squirrelmail_language); require_once(SM_PATH . 'functions/display_messages.php'); $string = "\n" . - _("ERROR : No available imapstream.") . + _("ERROR: No available IMAP stream.") . "\n"; error_box($string,$color); return false; @@ -83,7 +83,7 @@ function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$respon * @param boolean $filter (since 1.4.1 and 1.5.0) see sqimap_fread() * @param mixed $outputstream (since 1.4.1 and 1.5.0) see sqimap_fread() * @param boolean $no_return (since 1.4.1 and 1.5.0) see sqimap_fread() - * @return mixed returns false on imap error. displays error message + * @return mixed returns false on imap error. displays error message * if imap stream is not available. * @since 1.2.3 */ @@ -98,7 +98,7 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, $read = sqimap_read_data ($imap_stream, $tag, $handle_errors, $response, $message, $query,$filter,$outputstream,$no_return); - if (empty($read)) { //Imap server dropped its connection + if (empty($read)) { //IMAP server dropped its connection $response = ''; $message = ''; return false; @@ -117,7 +117,7 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, set_up_language($squirrelmail_language); require_once(SM_PATH . 'functions/display_messages.php'); $string = "\n" . - _("ERROR : No available imapstream.") . + _("ERROR: No available IMAP stream.") . "\n"; error_box($string,$color); return false; @@ -157,9 +157,9 @@ function sqimap_run_pipelined_command ($imap_stream, $aQueryList, $handle_errors $aResponse = false; /* - Do not fire all calls at once to the imap-server but split the calls up + Do not fire all calls at once to the IMAP server but split the calls up in portions of $iChunkSize. If we do not do that I think we misbehave as - IMAP client or should handle BYE calls if the IMAP-server drops the + IMAP client or should handle BYE calls if the IMAP server drops the connection because the number of queries is to large. This isn't tested but a wild guess how it could work in the field. @@ -215,7 +215,7 @@ function sqimap_run_pipelined_command ($imap_stream, $aQueryList, $handle_errors } /** - * Custom fgets function: gets a line from the IMAP-server, + * Custom fgets function: gets a line from the IMAP server, * no matter how big it may be. * @param stream $imap_stream the stream to read from * @return string a line @@ -246,7 +246,7 @@ function sqimap_fgets($imap_stream) { * @param integer $iSize * @param boolean $filter * @param mixed $outputstream stream or 'php://stdout' string - * @param boolean $no_return controls data returned by function + * @param boolean $no_return controls data returned by function * @return string * @since 1.4.1 */ @@ -321,7 +321,7 @@ function sqimap_read_data_list($imap_stream, $tag, $handle_errors, set_up_language($squirrelmail_language); require_once(SM_PATH . 'functions/display_messages.php'); $string = "\n" . - _("ERROR : Bad function call.") . + _("ERROR: Bad function call.") . "
\n" . _("Reason:") . ' '. 'There is a plugin installed which make use of the
' . @@ -336,7 +336,7 @@ function sqimap_read_data_list($imap_stream, $tag, $handle_errors, } /** - * Function to display an error related to an IMAP-query. + * Function to display an error related to an IMAP query. * @param string title the caption of the error box * @param string query the query that went wrong * @param string message_title optional message title @@ -549,12 +549,12 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors, if (!$handle_errors) { $query = ''; } - sqimap_error_box(_("ERROR : Imap server closed the connection."), $query, _("Server responded:"),$sResponse); + sqimap_error_box(_("ERROR: IMAP server closed the connection."), $query, _("Server responded:"),$sResponse); echo ''; exit; } else if ($handle_errors) { unset($data); - sqimap_error_box(_("ERROR : Connection dropped by imap-server."), $query); + sqimap_error_box(_("ERROR: Connection dropped by IMAP server."), $query); exit; } } @@ -578,21 +578,21 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors, case 'NO': /* ignore this error from M$ exchange, it is not fatal (aka bug) */ if (strstr($message[$tag], 'command resulted in') === false) { - sqimap_error_box(_("ERROR : Could not complete request."), $query, _("Reason Given: "), $message[$tag]); + sqimap_error_box(_("ERROR: Could not complete request."), $query, _("Reason Given:") . ' ', $message[$tag]); echo ''; exit; } break; case 'BAD': - sqimap_error_box(_("ERROR : Bad or malformed request."), $query, _("Server responded: "), $message[$tag]); + sqimap_error_box(_("ERROR: Bad or malformed request."), $query, _("Server responded:") . ' ', $message[$tag]); echo ''; exit; case 'BYE': - sqimap_error_box(_("ERROR : Imap server closed the connection."), $query, _("Server responded: "), $message[$tag]); + sqimap_error_box(_("ERROR: IMAP server closed the connection."), $query, _("Server responded:") . ' ', $message[$tag]); echo ''; exit; default: - sqimap_error_box(_("ERROR : Unknown imap response."), $query, _("Server responded: "), $message[$tag]); + sqimap_error_box(_("ERROR: Unknown IMAP response."), $query, _("Server responded:") . ' ', $message[$tag]); /* the error is displayed but because we don't know the reponse we return the result anyway */ return $aResponse; @@ -664,8 +664,8 @@ function sqimap_create_stream($server,$port,$tls=false) { } /** - * Logs the user into the imap server. If $hide is set, no error messages - * will be displayed. This function returns the imap connection handle. + * Logs the user into the IMAP server. If $hide is set, no error messages + * will be displayed. This function returns the IMAP connection handle. * @param string $username user name * @param string $password encrypted password * @param string $imap_server_address address of imap server @@ -823,19 +823,19 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $ /* Special error case: * Login referrals. The server returns: - * ? OK [REFERRAL ] - * Check RFC 2221 for details. Since we do not support login referrals yet - * we log the user out. - */ + * ? OK [REFERRAL ] + * Check RFC 2221 for details. Since we do not support login referrals yet + * we log the user out. + */ if ( stristr($message, 'REFERRAL imap') === TRUE ) { - sqimap_logout($imap_stream); + sqimap_logout($imap_stream); set_up_language($squirrelmail_language, true); include_once(SM_PATH . 'functions/display_messages.php' ); sqsession_destroy(); logout_error( _("Your mailbox is not located at this server. Try a different server or consult your system administrator") ); exit; } - + return $imap_stream; } @@ -857,7 +857,7 @@ function sqimap_logout ($imap_stream) { * else returns array of all capabilities. * @param stream $imap_stream * @param string $capability (optional since 1.3.0) - * @return mixed (string if $capability is set and found, + * @return mixed (string if $capability is set and found, * false, if $capability is set and not found, * array if $capability not set) */ @@ -996,7 +996,7 @@ function parseAddress($address, $max=0) { * OBSOLETE FUNCTION should be removed after mailbox_display, * printMessage function is adapted * - * callback function used for formating of addresses array in + * callback function used for formating of addresses array in * parseAddress() function * @param array $aAddr * @param integer $k array key @@ -1029,7 +1029,7 @@ function sqimap_unseen_messages ($imap_stream, $mailbox) { /** * Returns the status items of a mailbox. * Default it returns MESSAGES,UNSEEN and RECENT - * Supported status items are MESSAGES, UNSEEN, RECENT (since 1.4.0), + * Supported status items are MESSAGES, UNSEEN, RECENT (since 1.4.0), * UIDNEXT (since 1.5.1) and UIDVALIDITY (since 1.5.1) * @param stream $imap_stream imap stream * @param string $mailbox mail folder @@ -1095,14 +1095,14 @@ function sqimap_append_done ($imap_stream, $folder='') { } /** - * Displays error messages, if there are errors in responses to + * Displays error messages, if there are errors in responses to * commands issues by sqimap_append() and sqimap_append_done() functions. * @param string $response * @param string $folder * @since 1.5.1 */ function sqimap_append_checkresponse($response, $folder) { - + if (preg_match("/(.*)(BAD|NO)(.*)$/", $response, $regs)) { global $squirrelmail_language, $color; set_up_language($squirrelmail_language); @@ -1111,12 +1111,12 @@ function sqimap_append_checkresponse($response, $folder) { $reason = $regs[3]; if ($regs[2] == 'NO') { $string = "\n" . - _("ERROR : Could not append message to") ." $folder." . + _("ERROR: Could not append message to") ." $folder." . "
\n" . - _("Server responded: ") . + _("Server responded:") . ' ' . $reason . "
\n"; if (preg_match("/(.*)(quota)(.*)$/i", $reason, $regs)) { - $string .= _("Solution: ") . + $string .= _("Solution:") . ' ' . _("Remove unneccessary messages from your folder and start with your Trash folder.") ."
\n"; } @@ -1124,9 +1124,9 @@ function sqimap_append_checkresponse($response, $folder) { error_box($string,$color); } else { $string = "\n" . - _("ERROR : Bad or malformed request.") . + _("ERROR: Bad or malformed request.") . "
\n" . - _("Server responded: ") . + _("Server responded:") . ' ' . $reason . "
\n"; error_box($string,$color); exit; @@ -1135,7 +1135,7 @@ function sqimap_append_checkresponse($response, $folder) { } /** - * Allows mapping of imap server address with custom function + * Allows mapping of IMAP server address with custom function * see map_yp_alias() * @param string $imap_server imap server address or mapping * @param string $username @@ -1151,11 +1151,11 @@ function sqimap_get_user_server ($imap_server, $username) { } /** - * This is an example that gets imapservers from yellowpages (NIS). + * This is an example that gets IMAP servers from yellowpages (NIS). * you can simple put map:map_yp_alias in your $imap_server_address * in config.php use your own function instead map_yp_alias to map your - * LDAP whatever way to find the users imapserver. - * + * LDAP whatever way to find the users IMAP server. + * * Requires access to external ypmatch program * FIXME: it can be implemented in php yp extension or pecl (since php 5.1.0) * @param string $username diff --git a/help/en_US/options.hlp b/help/en_US/options.hlp index f655b05e..9cf33468 100644 --- a/help/en_US/options.hlp +++ b/help/en_US/options.hlp @@ -58,8 +58,8 @@
  • No Citation
    Prepends no citation line whatsoever.

    -
  • Author Said
    - This produces the line: John Doe Said: where John Doe will be replaced +
  • Author Wrote
    + This produces the line: John Doe Wrote: where John Doe will be replaced by whoever the message you're replying to was from.

  • Quote Who XML
    This produces the line: <quote who="John Doe">.

    diff --git a/include/options/folder.php b/include/options/folder.php index b09abcb9..d0dbd558 100644 --- a/include/options/folder.php +++ b/include/options/folder.php @@ -229,9 +229,9 @@ function load_optpage_data_folder() { 'caption' => _("Selection List Style"), 'type' => SMOPT_TYPE_STRLIST, 'refresh' => SMOPT_REFRESH_NONE, - 'posvals' => array( 0 => _("Long: ") . '"' . _("Folder") . $delim . _("Subfolder") . '"', - 1 => _("Indented: ") . '"    ' . _("Subfolder") . '"', - 2 => _("Delimited: ") . '". ' . _("Subfolder") . '"'), + 'posvals' => array( 0 => _("Long:") . ' "' . _("Folder") . $delim . _("Subfolder") . '"', + 1 => _("Indented:") . ' "    ' . _("Subfolder") . '"', + 2 => _("Delimited:") . ' ". ' . _("Subfolder") . '"'), 'htmlencoded' => true ); @@ -290,4 +290,4 @@ function save_option_draft_folder($option) { save_option($option); } -?> +?> \ No newline at end of file diff --git a/include/options/personal.php b/include/options/personal.php index 5b55bdf3..2d3e1023 100644 --- a/include/options/personal.php +++ b/include/options/personal.php @@ -172,8 +172,8 @@ function load_optpage_data_personal() { 'type' => SMOPT_TYPE_STRLIST, 'refresh' => SMOPT_REFRESH_NONE, 'posvals' => array(SMPREF_NONE => _("No Citation"), - 'author_said' => _("AUTHOR Said"), - 'date_time_author' => _("On DATE, AUTHOR Said"), + 'author_said' => _("AUTHOR Wrote"), + 'date_time_author' => _("On DATE, AUTHOR Wrote"), 'quote_who' => _("Quote Who XML"), 'user-defined' => _("User-Defined")) ); diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot index f35424df..8bd0b23b 100644 --- a/po/squirrelmail.pot +++ b/po/squirrelmail.pot @@ -1,20 +1,23 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2005-04-04 17:07+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-16 19:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#, c-format +#, php-format msgid "About SquirrelMail %s" msgstr "" @@ -24,14 +27,14 @@ msgid "" msgstr "" #. i18n: %s displays org_name variable value enclosed in () or empty string. -#, c-format +#, php-format msgid "" "If you have questions about or problems with your mail account, passwords, " "abuse etc, please refer to your system administrator or provider%s." msgstr "" #. i18n: %s tags are used in order to remove html URL attributes from translation -#, c-format +#, php-format msgid "" "They can assist you adequately with these issues. The SquirrelMail Project " "Team cannot help you with that. The %shelp system%s provides answers to " @@ -39,7 +42,7 @@ msgid "" msgstr "" #. i18n: %s tags are used in order to remove html URL attributes from translation -#, c-format +#, php-format msgid "" "SquirrelMail is a feature rich, standards compliant webmail application " "written in PHP. It was made by a group of volunteers united in the " @@ -48,7 +51,7 @@ msgid "" msgstr "" #. i18n: %s tags are used in order to remove html URL attributes from translation -#, c-format +#, php-format msgid "" "For more information about SquirrelMail and the SquirrelMail Project Team, " "see %sthe SquirrelMail website%s." @@ -57,7 +60,7 @@ msgstr "" msgid "System information" msgstr "" -#, c-format +#, php-format msgid "You are using SquirrelMail version: %s" msgstr "" @@ -70,15 +73,6 @@ msgstr "" msgid "Address Book" msgstr "" -msgid "All" -msgstr "" - -msgid "To" -msgstr "" - -msgid "Cc" -msgstr "" - msgid "Name" msgstr "" @@ -91,13 +85,16 @@ msgstr "" msgid "Source" msgstr "" -msgid "Bcc" +msgid "To" msgstr "" -msgid "Use Addresses" +msgid "Cc" msgstr "" -msgid "Address Book Search" +msgid "Bcc" +msgstr "" + +msgid "No persons matching your search were found" msgstr "" msgid "Search for" @@ -115,20 +112,29 @@ msgstr "" msgid "List all" msgstr "" -#, c-format +msgid "Close" +msgstr "" + +#, php-format msgid "Unable to list addresses from %s" msgstr "" msgid "Your search failed with the following error(s)" msgstr "" -msgid "No persons matching your search were found" +msgid "All" msgstr "" -msgid "Return" +msgid "Use Addresses" msgstr "" -msgid "Close" +msgid "Cancel" +msgstr "" + +msgid "Address Book Search" +msgstr "" + +msgid "Return" msgstr "" msgid "No personal address book is defined. Contact administrator." @@ -138,6 +144,7 @@ msgid "You can only edit one address at the time" msgstr "" #. Display the "new address" form +#. Display the "new address" form again msgid "Update address" msgstr "" @@ -182,8 +189,8 @@ msgstr "" #. * #. * To translators: %s is for author's name #. -#, c-format -msgid "%s said:" +#, php-format +msgid "%s wrote:" msgstr "" #. FIXME: do we have to translate xml formating? @@ -198,12 +205,12 @@ msgstr "" #. * first %s is for date string, second %s is for author's name. Date uses #. * formating from "D, F j, Y g:i a" and "D, F j, Y H:i" translations. #. * Example string: -#. * "On Sat, December 24, 2004 23:59, Santa said:" +#. * "On Sat, December 24, 2004 23:59, Santa wrote:" #. * If you have to put author's name in front of date string, check comments about #. * argument swapping at http://www.php.net/sprintf #. -#, c-format -msgid "On %s, %s said:" +#, php-format +msgid "On %s, %s wrote:" msgstr "" #. using own strlen function in order to detect correct string length @@ -285,11 +292,11 @@ msgstr "" msgid "You have not filled in the \"To:\" field." msgstr "" -#, c-format +#, php-format msgid "Error: Draft folder %s does not exist." msgstr "" -msgid "Server replied: " +msgid "Server replied:" msgstr "" msgid "Folders" @@ -373,7 +380,7 @@ msgstr "" msgid "Help" msgstr "" -#, c-format +#, php-format msgid "" "The help has not been translated to %s. It will be displayed in English " "instead." @@ -403,12 +410,6 @@ msgstr "" msgid "Download this as a file" msgstr "" -#. mailboxes are casesensitive => inbox.sent != inbox.Sent -#. nevermind, to many dependencies this should be fixed! -#. inbox is special and not casesensitive -msgid "INBOX" -msgstr "" - msgid "Purge" msgstr "" @@ -436,7 +437,7 @@ msgstr "" msgid "Login" msgstr "" -#, c-format +#, php-format msgid "%s Logo" msgstr "" @@ -446,7 +447,7 @@ msgstr "" msgid "By the SquirrelMail Project Team" msgstr "" -#, c-format +#, php-format msgid "%s Login" msgstr "" @@ -456,12 +457,73 @@ msgstr "" msgid "Password:" msgstr "" -msgid "Options" +msgid "Personal Information" +msgstr "" + +msgid "Display Preferences" +msgstr "" + +msgid "Compose Preferences" msgstr "" msgid "Message Highlighting" msgstr "" +msgid "Folder Preferences" +msgstr "" + +msgid "Index Order" +msgstr "" + +msgid "Options" +msgstr "" + +msgid "Error(s) occurred while saving your options" +msgstr "" + +msgid "Some of your preference changes were not applied." +msgstr "" + +#. Display a message indicating a successful save. +msgid "Successfully Saved Options" +msgstr "" + +msgid "Refresh Folder List" +msgstr "" + +msgid "Refresh Page" +msgstr "" + +msgid "" +"This contains personal information about yourself such as your name, your " +"email address, etc." +msgstr "" + +msgid "" +"You can change the way that SquirrelMail looks and displays information to " +"you, such as the colors, the language, and other settings." +msgstr "" + +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 "" + +msgid "" +"These settings change the way your folders are displayed and manipulated." +msgstr "" + +msgid "" +"The order of the message index can be rearranged and changed to contain the " +"headers in any order you want." +msgstr "" + +msgid "" +"Control the behaviour and layout of writing new mail messages, replying to " +"and forwarding messages." +msgstr "" + msgid "New" msgstr "" @@ -546,7 +608,7 @@ msgstr "" msgid "Submit" msgstr "" -#, c-format +#, php-format msgid "Alternate Identity %d" msgstr "" @@ -577,9 +639,9 @@ msgstr "" msgid "Move Up" msgstr "" -msgid "Index Order" -msgstr "" - +#. * +#. * Column to string translation array +#. msgid "Checkbox" msgstr "" @@ -589,6 +651,12 @@ msgstr "" msgid "Size" msgstr "" +msgid "Attachments" +msgstr "" + +msgid "Received" +msgstr "" + msgid "" "The index order is the order that the columns are arranged in the message " "index. You can add, remove, and move columns around to customize them to fit " @@ -598,6 +666,7 @@ msgstr "" msgid "up" msgstr "" +#. else msgid "down" msgstr "" @@ -607,64 +676,6 @@ msgstr "" msgid "Return to options page" msgstr "" -msgid "Personal Information" -msgstr "" - -msgid "Display Preferences" -msgstr "" - -msgid "Compose Preferences" -msgstr "" - -msgid "Folder Preferences" -msgstr "" - -msgid "Error(s) occurred while saving your options" -msgstr "" - -msgid "Some of your preference changes were not applied." -msgstr "" - -#. Display a message indicating a successful save. -msgid "Successfully Saved Options" -msgstr "" - -msgid "Refresh Folder List" -msgstr "" - -msgid "Refresh Page" -msgstr "" - -msgid "" -"This contains personal information about yourself such as your name, your " -"email address, etc." -msgstr "" - -msgid "" -"You can change the way that SquirrelMail looks and displays information to " -"you, such as the colors, the language, and other settings." -msgstr "" - -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 "" - -msgid "" -"These settings change the way your folders are displayed and manipulated." -msgstr "" - -msgid "" -"The order of the message index can be rearranged and changed to contain the " -"headers in any order you want." -msgstr "" - -msgid "" -"Control the behaviour and layout of writing new mail messages, replying to " -"and forwarding messages." -msgstr "" - msgid "Message not printable" msgstr "" @@ -690,7 +701,7 @@ msgstr "" msgid "Sent" msgstr "" -#, c-format +#, php-format msgid "Was displayed on %s" msgstr "" @@ -768,15 +779,18 @@ msgstr "" msgid "View Full Header" msgstr "" -msgid "Attachments" -msgstr "" - msgid "You must be logged in to access this page." msgstr "" msgid "THIS FOLDER IS EMPTY" msgstr "" +#. mailboxes are casesensitive => inbox.sent != inbox.Sent +#. nevermind, to many dependencies this should be fixed! +#. inbox is special and not casesensitive +msgid "INBOX" +msgstr "" + msgid "All Folders" msgstr "" @@ -850,9 +864,6 @@ msgstr "" msgid "Search Criteria" msgstr "" -msgid "Folder:" -msgstr "" - msgid "Add New Criteria" msgstr "" @@ -959,6 +970,9 @@ msgstr "" msgid "Advanced search" msgstr "" +msgid "Folder:" +msgstr "" + msgid "No Messages Found" msgstr "" @@ -977,7 +991,7 @@ msgstr "" msgid "Viewing a Business Card" msgstr "" -#, c-format +#, php-format msgid "" "vCard Version %s is not supported. Some information might not be converted " "correctly." @@ -1041,7 +1055,7 @@ msgid "" "Could not include PEAR database functions required for the database backend." msgstr "" -#, c-format +#, php-format msgid "Is PEAR installed, and is the include path set correctly to find %s?" msgstr "" @@ -1049,18 +1063,18 @@ msgid "Personal address book" msgstr "" #. Fail -#, c-format +#, php-format msgid "Database error: %s" msgstr "" msgid "Addressbook is read-only" msgstr "" -#, c-format +#, php-format msgid "User '%s' already exist" msgstr "" -#, c-format +#, php-format msgid "User '%s' does not exist" msgstr "" @@ -1093,7 +1107,7 @@ msgid "Error initializing addressbook database." msgstr "" #. no need to use $abook->error, because message explains error. -#, c-format +#, php-format msgid "Error opening file %s" msgstr "" @@ -1103,7 +1117,7 @@ msgstr "" msgid "Error initializing global addressbook." msgstr "" -#, c-format +#, php-format msgid "Error initializing LDAP server %s:" msgstr "" @@ -1273,36 +1287,36 @@ msgstr "" msgid "D, H:i" msgstr "" -#, c-format +#, php-format msgid "Preference database error (%s). Exiting abnormally" msgstr "" -#, c-format +#, php-format msgid "Click here to return to %s" msgstr "" msgid "Go to the login page" msgstr "" -#, c-format +#, php-format msgid "" "Preference file, %s, does not exist. Log out, and log back in to create a " "default preference file." msgstr "" -#, c-format +#, php-format msgid "" "Preference file, %s, could not be opened. Contact your system administrator " "to resolve this issue." msgstr "" -#, c-format +#, php-format msgid "" "Preference file, %s, could not be written. Contact your system administrator " "to resolve this issue." msgstr "" -#, c-format +#, php-format msgid "" "Preference file, %s, could not be copied from temporary file, %s. Contact " "your system administrator to resolve this issue." @@ -1311,32 +1325,39 @@ msgstr "" msgid "Could not create initial preference file!" msgstr "" -#, c-format +#, php-format msgid "%s should be writable by user %s" msgstr "" msgid "Signature is too big." msgstr "" -#, c-format +#, php-format msgid "" "Signature file, %s, could not be opened. Contact your system administrator " "to resolve this issue." msgstr "" -#, c-format +#, php-format msgid "" "Signature file, %s, could not be written. Contact your system administrator " "to resolve this issue." msgstr "" -#, c-format +#, php-format msgid "" "Signature file, %s, could not be copied from temporary file, %s. Contact " "your system administrator to resolve this issue." msgstr "" -msgid "Illegal folder name. Please select a different name." +msgid "Illegal folder name." +msgstr "" + +#, php-format +msgid "The name may not contain any of the following: %s" +msgstr "" + +msgid "Please select a different name." msgstr "" msgid "Click here to go back" @@ -1351,13 +1372,10 @@ msgstr "" msgid "New name:" msgstr "" -msgid "Cancel" -msgstr "" - msgid "You have not selected a folder to delete. Please do so." msgstr "" -#, c-format +#, php-format msgid "Are you sure you want to delete %s?" msgstr "" @@ -1376,34 +1394,34 @@ msgstr "" msgid "You have not selected a folder to unsubscribe. Please do so." msgstr "" -msgid "ERROR : Could not complete request." +msgid "ERROR: Could not complete request." msgstr "" -msgid "ERROR : Bad or malformed request." +msgid "ERROR: Bad or malformed request." msgstr "" -msgid "ERROR : Imap server closed the connection." +msgid "ERROR: IMAP server closed the connection." msgstr "" -msgid "ERROR : Connection dropped by imap-server." +msgid "ERROR: Connection dropped by IMAP server." msgstr "" -msgid "ERROR : Unknown imap response." +msgid "ERROR: Unknown IMAP response." msgstr "" -msgid "Reason Given: " +msgid "Reason Given:" msgstr "" -msgid "Possible reason : " +msgid "Possible reason:" msgstr "" msgid "Query:" msgstr "" -msgid "ERROR : No available imapstream." +msgid "ERROR: No available IMAP stream." msgstr "" -msgid "ERROR : Bad function call." +msgid "ERROR: Bad function call." msgstr "" msgid "Reason:" @@ -1412,10 +1430,7 @@ msgstr "" msgid "Server responded:" msgstr "" -msgid "Server responded: " -msgstr "" - -#, c-format +#, php-format msgid "Error connecting to IMAP server: %s." msgstr "" @@ -1424,11 +1439,11 @@ msgid "" "missing the openssl extension." msgstr "" -#, c-format +#, php-format msgid "Bad request: %s" msgstr "" -#, c-format +#, php-format msgid "Unknown error: %s" msgstr "" @@ -1438,10 +1453,15 @@ msgstr "" msgid "Unknown user or password incorrect." msgstr "" -msgid "ERROR : Could not append message to" +msgid "" +"Your mailbox is not located at this server. Try a different server or " +"consult your system administrator" msgstr "" -msgid "Solution: " +msgid "ERROR: Could not append message to" +msgstr "" + +msgid "Solution:" msgstr "" msgid "" @@ -1458,25 +1478,10 @@ msgid "" "mailbox)." msgstr "" -msgid "(no subject)" -msgstr "" - msgid "Unknown recipient" msgstr "" -msgid "Unknown date" -msgstr "" - -msgid "Read" -msgstr "" - -msgid "A" -msgstr "" - -msgid "Thread sorting is not supported by your IMAP server." -msgstr "" - -msgid "Server-side sorting is not supported by your IMAP server." +msgid "(no subject)" msgstr "" msgid "Unthread View" @@ -1491,37 +1496,16 @@ msgstr "" msgid "Flag" msgstr "" -msgid "Unread" -msgstr "" - -msgid "Expunge" -msgstr "" - -msgid "mailbox" -msgstr "" - -msgid "Click here to change the sorting of the message list" -msgstr "" - -msgid "Toggle All" -msgstr "" - -#, c-format -msgid "Viewing Messages: %s to %s (%s total)" -msgstr "" - -#, c-format -msgid "Viewing Message: %s (%s total)" +msgid "Read" msgstr "" -msgid "Paginate" +msgid "Unread" msgstr "" -#. Compute the 'show all' string. -msgid "Show All" +msgid "Undelete" msgstr "" -msgid "Go" +msgid "Expunge" msgstr "" msgid "No messages were selected." @@ -1565,7 +1549,7 @@ msgstr "" msgid "This external link will open in a new window" msgstr "" -#, c-format +#, php-format msgid "Option Type '%s' Not Found" msgstr "" @@ -1576,7 +1560,7 @@ msgstr "" msgid "Compose" msgstr "" -#, c-format +#, php-format msgid "Error creating directory %s." msgstr "" @@ -1806,12 +1790,6 @@ msgstr "" msgid "Length of Subject Field (0 for full)" msgstr "" -msgid "Show recipient name if the message is from your default identity" -msgstr "" - -msgid "Sort by Received Date" -msgstr "" - msgid "Enable Thread Sort by References Header" msgstr "" @@ -1893,7 +1871,7 @@ msgstr "" msgid "Seconds" msgstr "" -#, c-format +#, php-format msgid "%d Minute" msgid_plural "%d Minutes" msgstr[0] "" @@ -1966,7 +1944,7 @@ msgstr "" msgid "Selection List Style" msgstr "" -msgid "Long: " +msgid "Long:" msgstr "" msgid "Folder" @@ -1975,10 +1953,10 @@ msgstr "" msgid "Subfolder" msgstr "" -msgid "Indented: " +msgid "Indented:" msgstr "" -msgid "Delimited: " +msgid "Delimited:" msgstr "" #. **************************************************** @@ -2022,10 +2000,10 @@ msgstr "" msgid "No Citation" msgstr "" -msgid "AUTHOR Said" +msgid "AUTHOR Wrote" msgstr "" -msgid "On DATE, AUTHOR Said" +msgid "On DATE, AUTHOR Wrote" msgstr "" msgid "Quote Who XML" @@ -2385,9 +2363,6 @@ msgstr "" msgid "Use advanced tree folder listing" msgstr "" -msgid "Use old folder listing functions" -msgstr "" - msgid "Use icons" msgstr "" @@ -2450,7 +2425,7 @@ msgstr "" msgid "Plugins" msgstr "" -#, c-format +#, php-format msgid "Plugin directory could not be found: %s" msgstr "" @@ -2482,13 +2457,13 @@ msgid "" "for any common problems." msgstr "" -#, c-format +#, php-format msgid "" "Make sure that you are running the most recent copy of %s. You are currently " "using version %s." msgstr "" -#, c-format +#, php-format msgid "" "Check to see if your bug is already listed in the %sBug List%s on " "SourceForge. If it is, we already know about it and are trying to fix it." @@ -2500,7 +2475,7 @@ msgid "" "view a specific message, keep that message around so maybe we can see it." msgstr "" -#, c-format +#, php-format msgid "" "If there were warnings displayed above, try to resolve them yourself. Read " "the guides in the %s directory where SquirrelMail was installed." @@ -2620,11 +2595,14 @@ msgstr "" msgid "Show button in toolbar" msgstr "" -#, c-format -msgid "Could not write calendar file %s" +msgid "TODAY" msgstr "" -msgid "TODAY" +msgid "Go" +msgstr "" + +#, php-format +msgid "Could not write calendar file %s" msgstr "" msgid "l, F j Y" @@ -2748,7 +2726,7 @@ msgstr "" msgid "Your current password is not correct." msgstr "" -#, c-format +#, php-format msgid "Your new password should be %s to %s characters long." msgstr "" @@ -2781,11 +2759,11 @@ msgid "Plugin is not configured correctly." msgstr "" #. set error message -#, c-format +#, php-format msgid "Setting of LDAP connection option %s to value %s failed." msgstr "" -#, c-format +#, php-format msgid "Incorrect LDAP connection option: %s" msgstr "" @@ -2796,7 +2774,7 @@ msgstr "" msgid "Unable to use TLS." msgstr "" -#, c-format +#, php-format msgid "Error: %s" msgstr "" @@ -2806,7 +2784,7 @@ msgstr "" msgid "Unable to bind to LDAP server." msgstr "" -#, c-format +#, php-format msgid "Server replied: %s" msgstr "" @@ -2834,7 +2812,7 @@ msgstr "" msgid "ldap_get_dn error." msgstr "" -#, c-format +#, php-format msgid "Unsupported crypto: %s" msgstr "" @@ -3115,7 +3093,7 @@ msgstr "" msgid "Contains:" msgstr "" -#, c-format +#, php-format msgid "If %s contains %s then move to %s" msgstr "" @@ -3128,7 +3106,7 @@ msgstr "" msgid "Spam Filtering" msgstr "" -#, c-format +#, php-format msgid "WARNING! Tell the administrator to set the %s variable." msgstr "" @@ -3155,14 +3133,14 @@ msgid "" "scanned." msgstr "" -#, c-format +#, php-format msgid "Spam is sent to %s." msgstr "" msgid "not set yet" msgstr "" -#, c-format +#, php-format msgid "Spam scan is limited to %s." msgstr "" @@ -3172,7 +3150,7 @@ msgstr "" msgid "OFF" msgstr "" -#, c-format +#, php-format msgid "%s is not found." msgstr "" @@ -3243,19 +3221,19 @@ msgstr "" msgid "Mailinglist" msgstr "" -#, c-format +#, php-format msgid "" "This will send a message to %s requesting help for this list. You will " "receive an emailed response at the address below." msgstr "" -#, c-format +#, php-format msgid "" "This will send a message to %s requesting that you will be subscribed to " "this list. You will be subscribed with the address below." msgstr "" -#, c-format +#, php-format msgid "" "This will send a message to %s requesting that you will be unsubscribed from " "this list. It will try to unsubscribe the adress below." @@ -3327,9 +3305,9 @@ msgstr "" msgid "POP3 last:" msgstr "" -#. The POP3 RSET command -never- gives a -ERR -#. response - if it ever does, something truely -#. wild is going on. +#. The POP3 RSET command -never- gives a -ERR +#. response - if it ever does, something truely +#. wild is going on. msgid "POP3 reset:" msgstr "" @@ -3396,7 +3374,7 @@ msgstr "" msgid "Login OK: Inbox EMPTY" msgstr "" -#, c-format +#, php-format msgid "Login OK: Inbox contains %s message" msgid_plural "Login OK: Inbox contains %s messages" msgstr[0] "" @@ -3443,7 +3421,7 @@ msgstr "" msgid "Message appended to mailbox" msgstr "" -#, c-format +#, php-format msgid "Message %d deleted from remote server!" msgstr "" @@ -3570,10 +3548,22 @@ msgstr "" msgid "View Message details" msgstr "" +msgid "New Mail" +msgstr "" + +msgid "SquirrelMail Notice:" +msgstr "" + +#, php-format +msgid "You have %s new message" +msgid_plural "You have %s new messages" +msgstr[0] "" +msgstr[1] "" + msgid "New Mail Notification" msgstr "" -#, c-format +#, php-format msgid "" "The %s option will check ALL of your folders for unseen mail, not just the " "inbox for notification." @@ -3582,7 +3572,7 @@ msgstr "" msgid "Check all boxes, not just INBOX" msgstr "" -#, c-format +#, php-format msgid "" "Selecting the %s option will enable the showing of a popup window when " "unseen mail is in your folders (requires JavaScript)." @@ -3591,7 +3581,7 @@ msgstr "" msgid "Show popup window on new mail" msgstr "" -#, c-format +#, php-format msgid "" "Use the %s option to only check for messages that are recent. Recent " "messages are those that have just recently showed up and have not been " @@ -3602,7 +3592,7 @@ msgstr "" msgid "Count only messages that are RECENT" msgstr "" -#, c-format +#, php-format msgid "" "Selecting the %s option will change the title in some browsers to let you " "know when you have new mail (requires JavaScript, and only works in IE but " @@ -3613,7 +3603,7 @@ msgstr "" msgid "Change title on supported browsers" msgstr "" -#, c-format +#, php-format msgid "" "Select %s 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 " @@ -3623,7 +3613,7 @@ msgstr "" msgid "Enable Media Playing" msgstr "" -#, c-format +#, php-format msgid "" "Select from the list of %s the media file to play when new mail arrives. If " "no file is specified, %s, no sound will be used." @@ -3665,25 +3655,13 @@ msgstr "" msgid "unavailable" msgstr "" -#, c-format +#, php-format msgid "Media file %s will be removed, if you upload other media file." msgstr "" msgid "Current File:" msgstr "" -msgid "New Mail" -msgstr "" - -msgid "SquirrelMail Notice:" -msgstr "" - -#, c-format -msgid "You have %s new message" -msgid_plural "You have %s new messages" -msgstr[0] "" -msgstr[1] "" - msgid "NewMail Options" msgstr "" @@ -3692,7 +3670,7 @@ msgid "" "when new mail arrives." msgstr "" -#, c-format +#, php-format msgid "%s New Message" msgid_plural "%s New Messages" msgstr[0] "" @@ -3791,7 +3769,7 @@ msgid "" "the spam and helps in letting the proper people know about the abuse." msgstr "" -#, c-format +#, php-format msgid "" "To use it, you must get a SpamCop authorization code. There is a free %ssign " "up page%s so you can use SpamCop." @@ -3800,7 +3778,7 @@ msgstr "" msgid "Before you sign up, be warned" msgstr "" -#, c-format +#, php-format msgid "" "Some users have reported that the email addresses used with SpamCop find " "their way onto spam lists. To be safe, you can just create an email " @@ -3870,7 +3848,7 @@ msgstr "" msgid "More information" msgstr "" -#, c-format +#, php-format msgid "" "For more information about SpamCop, it's services, spam in general, and many " "related topics, try reading through SpamCop's %sHelp and Feedback%s section." @@ -3941,9 +3919,6 @@ msgstr "" msgid "Proceed" msgstr "" -#. * -#. * Add some string vars so they can be i18n'd. -#. msgid "You must make a choice" msgstr "" @@ -3960,22 +3935,22 @@ msgstr "" msgid "Cute." msgstr "" -#, c-format +#, php-format msgid "Could not run the spellchecker command (%s)." msgstr "" msgid "Error while writing to pipe." msgstr "" -#, c-format +#, php-format msgid "Could not open temporary file '%s'." msgstr "" -#, c-format +#, php-format msgid "Error while writing to temporary file '%s'." msgstr "" -#, c-format +#, php-format msgid "I tried to execute '%s', but it returned:" msgstr "" @@ -3997,7 +3972,7 @@ msgstr "" msgid "SquirrelSpell Results" msgstr "" -#, c-format +#, php-format msgid "Found %s errors" msgstr "" @@ -4064,6 +4039,18 @@ msgstr "" msgid "No errors found" msgstr "" +msgid "" +"Your personal dictionary has been encrypted and is now stored in an " +"encrypted format." +msgstr "" + +msgid "" +"Your personal dictionary has been decrypted and is now stored as plain text." +msgstr "" + +msgid "Personal Dictionary Crypto Settings" +msgstr "" + msgid "Your personal dictionary was erased." msgstr "" @@ -4095,22 +4082,13 @@ msgstr "" msgid "Dictionary re-encrypted" msgstr "" -msgid "" -"Your personal dictionary has been encrypted and is now stored in an " -"encrypted format." -msgstr "" - -msgid "" -"Your personal dictionary has been decrypted and is now stored as plain text." -msgstr "" - -msgid "Personal Dictionary Crypto Settings" -msgstr "" - #. * #. * Agt. Smith: "You're empty." #. * Neo: "So are you." #. +#. * +#. * Click on some words first, Einstein! +#. msgid "Personal Dictionary" msgstr "" @@ -4120,7 +4098,7 @@ msgstr "" msgid "Please check any words you wish to delete from your dictionary." msgstr "" -#, c-format +#, php-format msgid "%s dictionary" msgstr "" @@ -4130,9 +4108,6 @@ msgstr "" msgid "Edit your Personal Dictionary" msgstr "" -#. * -#. * Set up some i18n'able wrappers for javascript. -#. msgid "Please make your selection first." msgstr "" @@ -4194,7 +4169,7 @@ msgid "" "Please encrypt my personal dictionary and store it in an encrypted format." msgstr "" -#, c-format +#, php-format msgid "Deleting the following entries from %s dictionary:" msgstr "" @@ -4218,11 +4193,11 @@ msgstr "" msgid "SquirrelSpell Initiating" msgstr "" -#, c-format +#, php-format msgid "Settings adjusted to: %s with %s as default dictionary." msgstr "" -#, c-format +#, php-format msgid "Using %s dictionary (system default) for spellcheck." msgstr "" @@ -4286,7 +4261,7 @@ msgstr "" msgid "Maximum of 150 words translated, powered by Systran" msgstr "" -#, c-format +#, php-format msgid "Number of supported language pairs: %s" msgstr "" @@ -4302,7 +4277,7 @@ msgstr "" msgid "No known limits, powered by Translation Experts' InterTran" msgstr "" -#, c-format +#, php-format msgid "Number of supported languages: %s" msgstr "" @@ -4312,7 +4287,7 @@ msgstr "" msgid "Russian translations, maximum of 500 characters translated" msgstr "" -#, c-format +#, php-format msgid "%s to %s" msgstr "" diff --git a/src/compose.php b/src/compose.php index 5667c4d9..53581cb8 100644 --- a/src/compose.php +++ b/src/compose.php @@ -194,7 +194,7 @@ function getReplyCitation($orig_from, $orig_date) { /** * To translators: %s is for author's name */ - $full_reply_citation = sprintf(_("%s said:"),$orig_from); + $full_reply_citation = sprintf(_("%s wrote:"),$orig_from); break; case 'quote_who': // FIXME: do we have to translate xml formating? @@ -208,11 +208,11 @@ function getReplyCitation($orig_from, $orig_date) { * first %s is for date string, second %s is for author's name. Date uses * formating from "D, F j, Y g:i a" and "D, F j, Y H:i" translations. * Example string: - * "On Sat, December 24, 2004 23:59, Santa said:" + * "On Sat, December 24, 2004 23:59, Santa wrote:" * If you have to put author's name in front of date string, check comments about * argument swapping at http://www.php.net/sprintf */ - $full_reply_citation = sprintf(_("On %s, %s said:"), getLongDateString($orig_date), $orig_from); + $full_reply_citation = sprintf(_("On %s, %s wrote:"), getLongDateString($orig_date), $orig_from); break; case 'user-defined': $start = $reply_citation_start . @@ -1576,7 +1576,7 @@ function deliverMessage($composeMessage, $draft=false) { } if (!$succes) { $msg = $deliver->dlv_msg . '
    ' . - _("Server replied: ") . $deliver->dlv_ret_nr . ' '. + _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' . $deliver->dlv_server_msg; plain_error_message($msg, $color); } else { diff --git a/src/read_body.php b/src/read_body.php index b336e23e..cbd3149b 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -264,7 +264,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { } if (!$success) { $msg = $deliver->dlv_msg . '
    ' . - _("Server replied: ") . $deliver->dlv_ret_nr . ' '. + _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' . $deliver->dlv_server_msg; require_once(SM_PATH . 'functions/display_messages.php'); plain_error_message($msg, $color); -- 2.25.1