summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-04-05 12:49:21 +0000
committerthomascube <thomas@roundcube.net>2008-04-05 12:49:21 +0000
commite70d6ea64e711096af36b1234f8545b870ea5f45 (patch)
tree98e784b95d08418d85a17af767037e8a6e0f3f41 /program
parentcb1330b7b10ce46e466850b27300a06ed122501e (diff)
Apply changes from trunk to 0.1-stable
Diffstat (limited to 'program')
-rw-r--r--program/include/main.inc27
-rw-r--r--program/include/rcube_db.inc12
-rw-r--r--program/include/rcube_imap.inc63
-rw-r--r--program/include/rcube_ldap.inc16
-rw-r--r--program/include/rcube_mdb2.inc52
-rw-r--r--program/include/rcube_shared.inc3
-rw-r--r--program/include/rcube_user.inc4
-rw-r--r--program/js/app.js107
-rw-r--r--program/js/list.js7
-rw-r--r--program/js/tiny_mce/themes/advanced/css/editor_content.css58
-rw-r--r--program/lib/imap.inc60
-rw-r--r--program/localization/en_GB/labels.inc4
-rw-r--r--program/localization/en_US/labels.inc4
-rw-r--r--program/localization/fi/labels.inc8
-rw-r--r--program/localization/fr/labels.inc11
-rw-r--r--program/localization/fr/messages.inc5
-rwxr-xr-xprogram/localization/ge/labels.inc257
-rwxr-xr-xprogram/localization/ge/messages.inc16
-rw-r--r--program/localization/hu/messages.inc118
-rw-r--r--program/localization/index.inc1
-rw-r--r--program/localization/ku/labels.inc189
-rw-r--r--program/localization/ku/messages.inc79
-rw-r--r--program/localization/nl_NL/labels.inc6
-rw-r--r--program/localization/pl/labels.inc4
-rw-r--r--program/localization/pl/messages.inc4
-rw-r--r--program/localization/se/labels.inc4
-rw-r--r--program/localization/zh_CN/labels.inc8
-rw-r--r--program/localization/zh_CN/messages.inc5
-rw-r--r--program/steps/mail/compose.inc10
-rw-r--r--program/steps/mail/func.inc6
-rw-r--r--program/steps/mail/sendmail.inc26
-rw-r--r--program/steps/mail/show.inc4
-rw-r--r--program/steps/mail/viewsource.inc26
-rw-r--r--program/steps/settings/func.inc11
-rw-r--r--program/steps/settings/manage_folders.inc8
35 files changed, 811 insertions, 412 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index f3d0e263b..1d35682ce 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -74,6 +74,7 @@ function rcmail_startup($task='mail')
$DB = new $dbclass($CONFIG['db_dsnw'], $CONFIG['db_dsnr'], $CONFIG['db_persistent']);
$DB->sqlite_initials = $INSTALL_PATH.'SQL/sqlite.initial.sql';
+ $DB->set_debug((bool)$CONFIG['sql_debug']);
$DB->db_connect('w');
// use database for storing session data
@@ -289,6 +290,9 @@ function rcmail_imap_init($connect=FALSE)
function rcmail_set_imap_prop()
{
global $CONFIG, $IMAP;
+
+ if (!empty($CONFIG['default_charset']))
+ $IMAP->set_charset($CONFIG['default_charset']);
// set root dir from config
if (!empty($CONFIG['imap_root']))
@@ -955,22 +959,23 @@ function rcube_charset_convert($str, $from, $to=NULL)
'X-USER-DEFINED' => 'ISO-8859-15',
'ISO-8859-8-I' => 'ISO-8859-8',
'KS_C_5601-1987' => 'EUC-KR',
- 'GB2312' => 'GB18030'
);
// convert charset using iconv module
if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7')
{
+ $aliases['GB2312'] = 'GB18030';
return iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
}
// convert charset using mbstring module
if ($MBSTRING)
{
- $mb_map = $aliases + array('UTF-7' => 'UTF7-IMAP');
+ $aliases['UTF-7'] = 'UTF7-IMAP';
+ $aliases['WINDOWS-1257'] = 'ISO-8859-13';
// return if convert succeeded
- if (($out = mb_convert_encoding($str, ($mb_map[$to] ? $mb_map[$to] : $to), ($mb_map[$from] ? $mb_map[$from] : $from))) != '')
+ if (($out = mb_convert_encoding($str, ($aliases[$to] ? $aliases[$to] : $to), ($aliases[$from] ? $aliases[$from] : $from))) != '')
return $out;
}
@@ -1372,6 +1377,7 @@ function rcmail_mail_domain($host)
/**
* Replace all css definitions with #container [def]
+ * and remove css-inlined scripting
*
* @param string CSS source code
* @param string Container ID to use as prefix
@@ -1381,6 +1387,10 @@ function rcmail_mod_css_styles($source, $container_id, $base_url = '')
{
$a_css_values = array();
$last_pos = 0;
+
+ // ignore the whole block if evil styles are detected
+ if (stristr($source, 'expression') || stristr($source, 'behavior'))
+ return '';
// cut out all contents between { and }
while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos)))
@@ -1391,7 +1401,7 @@ function rcmail_mod_css_styles($source, $container_id, $base_url = '')
$last_pos = $pos+2;
}
- // remove html commends and add #container to each tag selector.
+ // remove html comments and add #container to each tag selector.
// also replace body definition because we also stripped off the <body> tag
$styles = preg_replace(
array(
@@ -1562,7 +1572,10 @@ function format_date($date, $format=NULL)
function format_email_recipient($email, $name='')
{
if ($name && $name != $email)
- return sprintf('%s <%s>', strpos($name, ",") ? '"'.$name.'"' : $name, $email);
+ {
+ // Special chars as defined by RFC 822 need to in quoted string (or escaped).
+ return sprintf('%s <%s>', preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $name) ? '"'.addcslashes($name, '"').'"' : $name, $email);
+ }
else
return $email;
}
@@ -1787,10 +1800,6 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, $maxlength, $
}
}
- // add unread message count display
- if ($unread_count = $IMAP->messagecount($folder['id'], 'RECENT', ($folder['id']==$mbox_name)))
- $foldername .= sprintf(' (%d)', $unread_count);
-
// make folder name safe for ids and class names
$folder_id = preg_replace('/[^A-Za-z0-9\-_]/', '', $folder['id']);
$class_name = preg_replace('/[^a-z0-9\-_]/', '', $folder_class ? $folder_class : strtolower($folder['id']));
diff --git a/program/include/rcube_db.inc b/program/include/rcube_db.inc
index 4c3e9fc62..63c6759b9 100644
--- a/program/include/rcube_db.inc
+++ b/program/include/rcube_db.inc
@@ -153,8 +153,18 @@ class rcube_db
$this->db_handle = $this->dsn_connect($dsn);
$this->db_connected = $this->db_handle ? TRUE : FALSE;
}
+
+
+ /**
+ * Activate/deactivate debug mode
+ * (not implemented)
+ */
+ function set_debug($dbg = true)
+ {
-
+ }
+
+
/**
* Getter for error state
*
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index dce778968..9a594854c 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -51,6 +51,7 @@ class rcube_imap
var $sort_order = 'DESC';
var $delimiter = NULL;
var $caching_enabled = FALSE;
+ var $default_charset = 'ISO-8859-1';
var $default_folders = array('INBOX');
var $default_folders_lc = array('inbox');
var $cache = array();
@@ -204,6 +205,20 @@ class rcube_imap
/**
+ * Set default message charset
+ *
+ * This will be used for message decoding if a charset specification is not available
+ *
+ * @param string Charset string
+ * @access public
+ */
+ function set_charset($cs)
+ {
+ $this->default_charset = $ch;
+ }
+
+
+ /**
* This list of folders will be listed above all other folders
*
* @param array Indexed list of folder names
@@ -1146,7 +1161,7 @@ class rcube_imap
// normalize filename property
if ($filename_mime = $struct->d_parameters['filename'] ? $struct->d_parameters['filename'] : $struct->ctype_parameters['name'])
- $struct->filename = $this->decode_mime_string($filename_mime);
+ $struct->filename = rcube_imap::decode_mime_string($filename_mime, $this->default_charset);
else if ($filename_encoded = $struct->d_parameters['filename*'] ? $struct->d_parameters['filename*'] : $struct->ctype_parameters['name*'])
{
// decode filename according to RFC 2231, Section 4
@@ -1154,7 +1169,7 @@ class rcube_imap
$struct->filename = rcube_charset_convert(urldecode($filename_urlencoded), $filename_charset);
}
else if (!empty($struct->headers['content-description']))
- $struct->filename = $this->decode_mime_string($struct->headers['content-description']);
+ $struct->filename = rcube_imap::decode_mime_string($struct->headers['content-description'], $this->default_charset);
return $struct;
}
@@ -1241,9 +1256,9 @@ class rcube_imap
// convert charset (if text or message part)
if ($o_part->ctype_primary=='text' || $o_part->ctype_primary=='message')
{
- // assume ISO-8859-1 if no charset specified
+ // assume default if no charset specified
if (empty($o_part->charset))
- $o_part->charset = 'ISO-8859-1';
+ $o_part->charset = $this->default_charset;
$body = rcube_charset_convert($body, $o_part->charset);
}
@@ -1633,16 +1648,14 @@ class rcube_imap
/**
* Subscribe to a specific mailbox(es)
*
- * @param string Mailbox name(s)
+ * @param array Mailbox name(s)
* @return boolean True on success
*/
- function subscribe($mbox_name)
+ function subscribe($a_mboxes)
{
- if (is_array($mbox_name))
- $a_mboxes = $mbox_name;
- else if (is_string($mbox_name) && strlen($mbox_name))
- $a_mboxes = explode(',', $mbox_name);
-
+ if (!is_array($a_mboxes))
+ $a_mboxes = array($a_mboxes);
+
// let this common function do the main work
return $this->_change_subscription($a_mboxes, 'subscribe');
}
@@ -1651,15 +1664,13 @@ class rcube_imap
/**
* Unsubscribe mailboxes
*
- * @param string Mailbox name(s)
+ * @param array Mailbox name(s)
* @return boolean True on success
*/
- function unsubscribe($mbox_name)
+ function unsubscribe($a_mboxes)
{
- if (is_array($mbox_name))
- $a_mboxes = $mbox_name;
- else if (is_string($mbox_name) && strlen($mbox_name))
- $a_mboxes = explode(',', $mbox_name);
+ if (!is_array($a_mboxes))
+ $a_mboxes = array($a_mboxes);
// let this common function do the main work
return $this->_change_subscription($a_mboxes, 'unsubscribe');
@@ -2213,6 +2224,9 @@ class rcube_imap
*/
function remove_message_cache($key, $index)
{
+ if (!$this->caching_enabled)
+ return;
+
$this->db->query(
"DELETE FROM ".get_table_name('messages')."
WHERE user_id=?
@@ -2228,6 +2242,9 @@ class rcube_imap
*/
function clear_message_cache($key, $start_index=1)
{
+ if (!$this->caching_enabled)
+ return;
+
$this->db->query(
"DELETE FROM ".get_table_name('messages')."
WHERE user_id=?
@@ -2257,6 +2274,8 @@ class rcube_imap
{
$a = $this->_parse_address_list($input, $decode);
$out = array();
+ // Special chars as defined by RFC 822 need to in quoted string (or escaped).
+ $special_chars = '[\(\)\<\>\\\.\[\]@,;:"]';
if (!is_array($a))
return $out;
@@ -2270,7 +2289,7 @@ class rcube_imap
$address = $val['address'];
$name = preg_replace(array('/^[\'"]/', '/[\'"]$/'), '', trim($val['name']));
if ($name && $address && $name != $address)
- $string = sprintf('%s <%s>', strpos($name, ',')!==FALSE ? '"'.$name.'"' : $name, $address);
+ $string = sprintf('%s <%s>', preg_match("/$special_chars/", $name) ? '"'.addcslashes($name, '"').'"' : $name, $address);
else if ($address)
$string = $address;
else if ($name)
@@ -2297,7 +2316,7 @@ class rcube_imap
*/
function decode_header($input, $remove_quotes=FALSE)
{
- $str = $this->decode_mime_string((string)$input);
+ $str = rcube_imap::decode_mime_string((string)$input, $this->default_charset);
if ($str{0}=='"' && $remove_quotes)
$str = str_replace('"', '', $str);
@@ -2320,6 +2339,10 @@ class rcube_imap
$pos = strpos($input, '=?');
if ($pos !== false)
{
+ // rfc: all line breaks or other characters not found in the Base64 Alphabet must be ignored by decoding software
+ // delete all blanks between MIME-lines, differently we can receive unnecessary blanks and broken utf-8 symbols
+ $input = preg_replace("/\?=\s+=\?/", '?==?', $input);
+
$out = substr($input, 0, $pos);
$end_cs_pos = strpos($input, "?", $pos+2);
@@ -2414,7 +2437,7 @@ class rcube_imap
return rcube_charset_convert($body, $ctype_param['charset']);
// defaults to what is specified in the class header
- return rcube_charset_convert($body, 'ISO-8859-1');
+ return rcube_charset_convert($body, $this->default_charset);
}
diff --git a/program/include/rcube_ldap.inc b/program/include/rcube_ldap.inc
index 29e7faa6b..969101b2a 100644
--- a/program/include/rcube_ldap.inc
+++ b/program/include/rcube_ldap.inc
@@ -119,20 +119,20 @@ class rcube_ldap
*/
function bind($dn, $pass)
{
- if (!$this->conn)
+ if (!$this->conn) {
return false;
+ }
- if (@ldap_bind($this->conn, $dn, $pass))
+ if (ldap_bind($this->conn, $dn, $pass)) {
return true;
- else
- {
- raise_error(array(
+ }
+
+ raise_error(array(
'code' => ldap_errno($this->conn),
'type' => 'ldap',
'message' => "Bind failed for dn=$dn: ".ldap_error($this->conn)),
- true);
- }
-
+ true);
+
return false;
}
diff --git a/program/include/rcube_mdb2.inc b/program/include/rcube_mdb2.inc
index 63d156a08..72d906664 100644
--- a/program/include/rcube_mdb2.inc
+++ b/program/include/rcube_mdb2.inc
@@ -48,6 +48,7 @@ class rcube_mdb2
var $db_handle = 0; // Connection handle
var $db_error = false;
var $db_error_msg = '';
+ var $debug_mode = false;
var $a_query_results = array('dummy');
var $last_res_id = 0;
@@ -94,8 +95,11 @@ class rcube_mdb2
function dsn_connect($dsn)
{
// Use persistent connections if available
- $dbh = MDB2::connect($dsn,
- array('persistent' => $this->db_pconn,
+ $dbh = MDB2::connect($dsn, array(
+ 'persistent' => $this->db_pconn,
+ 'emulate_prepared' => $this->debug_mode,
+ 'debug' => $this->debug_mode,
+ 'debug_handler' => 'mdb2_debug_handler',
'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL));
if (MDB2::isError($dbh))
@@ -156,6 +160,21 @@ class rcube_mdb2
}
+ /**
+ * Activate/deactivate debug mode
+ *
+ * @param boolean True if SQL queries should be logged
+ */
+ function set_debug($dbg = true)
+ {
+ $this->debug_mode = $dbg;
+ if ($this->db_connected)
+ {
+ $this->db_handle->setOption('debug', $dbg);
+ $this->db_handle->setOption('emulate_prepared', $dbg);
+ }
+ }
+
/**
* Getter for error state
@@ -413,6 +432,22 @@ class rcube_mdb2
return $this->db_handle->quoteIdentifier($str);
}
+ /**
+ * Escapes a string
+ *
+ * @param string The string to be escaped
+ * @return string The escaped string
+ * @access public
+ * @since 0.1.1
+ */
+ function escapeSimple($str)
+ {
+ if (!$this->db_handle)
+ $this->db_connect('r');
+
+ return $this->db_handle->escape($str);
+ }
+
/**
* Return SQL function for current time and date
@@ -569,4 +604,17 @@ class rcube_mdb2
} // end class rcube_db
+
+/* this is our own debug handler for the MDB2 connection */
+function mdb2_debug_handler(&$db, $scope, $message, $context = array())
+{
+ if ($scope != 'prepare')
+ {
+ $debug_output = $scope . '('.$db->db_index.'): ';
+ $debug_output .= $message . $db->getOption('log_line_break');
+ write_log('sqllog', $debug_output);
+ }
+}
+
+
?>
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index bec254661..815331195 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -262,7 +262,10 @@ function send_modified_header($mdate, $etag=null)
header("Etag: $etag");
if ($iscached)
+ {
+ ob_end_clean();
exit;
+ }
}
diff --git a/program/include/rcube_user.inc b/program/include/rcube_user.inc
index 41b424f1d..e748758a9 100644
--- a/program/include/rcube_user.inc
+++ b/program/include/rcube_user.inc
@@ -361,7 +361,7 @@ class rcube_user
// try to resolve user in virtusertable
if (!empty($CONFIG['virtuser_file']) && !strpos($user, '@'))
- $user_email = self::user2email($user);
+ $user_email = rcube_user::user2email($user);
$DB->query(
"INSERT INTO ".get_table_name('users')."
@@ -468,7 +468,7 @@ class rcube_user
$arr = preg_split('/\s+/', $data);
if (count($arr) > 0)
{
- $email = trim($arr[0]);
+ $email = trim(str_replace('\\@', '@', $arr[0]));
break;
}
}
diff --git a/program/js/app.js b/program/js/app.js
index 73c03c860..4359e5985 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -132,7 +132,7 @@ function rcube_webmail()
this.message_list.addEventListener('dblclick', function(o){ p.msglist_dbl_click(o); });
this.message_list.addEventListener('keypress', function(o){ p.msglist_keypress(o); });
this.message_list.addEventListener('select', function(o){ p.msglist_select(o); });
- this.message_list.addEventListener('dragstart', function(o){ p.drag_active = true; });
+ this.message_list.addEventListener('dragstart', function(o){ p.drag_active = true; if (p.preview_timer) clearTimeout(p.preview_timer); });
this.message_list.addEventListener('dragend', function(o){ p.drag_active = false; });
this.message_list.init();
@@ -202,7 +202,7 @@ function rcube_webmail()
}
if (this.env.messagecount)
- this.enable_command('select-all', 'select-none', 'sort', 'expunge', true);
+ this.enable_command('select-all', 'select-none', 'expunge', true);
if (this.env.messagecount && (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox))
this.enable_command('purge', true);
@@ -314,7 +314,7 @@ function rcube_webmail()
var input_user = rcube_find_object('rcmloginuser');
var input_pass = rcube_find_object('rcmloginpwd');
if (input_user)
- input_user.onkeypress = function(e){ return rcmail.login_user_keypress(e); };
+ input_user.onkeyup = function(e){ return rcmail.login_user_keyup(e); };
if (input_user && input_user.value=='')
input_user.focus();
else if (input_pass)
@@ -712,7 +712,7 @@ function rcube_webmail()
break;
case 'load-attachment':
- var qstring = '_mbox='+this.env.mailbox+'&_uid='+this.env.uid+'&_part='+props.part;
+ var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props.part;
// open attachment in frame if it's of a supported mimetype
if (this.env.uid && props.mimetype && find_in_array(props.mimetype, this.mimetypes)>=0)
@@ -892,7 +892,7 @@ function rcube_webmail()
{
setTimeout(function(){ ref.printwin.focus(); }, 20);
if (this.env.action != 'show')
- this.toggle_read_status('read', [uid]);
+ this.mark_message('read', uid);
}
}
break;
@@ -1138,7 +1138,7 @@ function rcube_webmail()
}
// start timer for message preview (wait for double click)
- if (selected && this.env.contentframe)
+ if (selected && this.env.contentframe && !list.multi_selecting)
this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, this.dblclick_time + 10);
else if (this.env.contentframe)
this.show_contentframe(false);
@@ -1486,6 +1486,7 @@ function rcube_webmail()
this.mark_message = function(flag, uid)
{
var a_uids = new Array();
+ var r_uids = new Array();
var selection = this.message_list ? this.message_list.get_selection() : new Array();
if (uid)
@@ -1496,26 +1497,35 @@ function rcube_webmail()
{
for (var id, n=0; n<selection.length; n++)
{
- id = selection[n];
- if ((flag=='read' && this.message_list.rows[id].unread) || (flag=='unread' && !this.message_list.rows[id].unread)
- || (flag=='delete' && !this.message_list.rows[id].deleted) || (flag=='undelete' && this.message_list.rows[id].deleted))
- a_uids[a_uids.length] = id;
+ a_uids[a_uids.length] = selection[n];
}
}
+
+ for (var id, n=0; n<a_uids.length; n++)
+ {
+ id = a_uids[n];
+ if ((flag=='read' && this.message_list.rows[id].unread)
+ || (flag=='unread' && !this.message_list.rows[id].unread)
+ || (flag=='delete' && !this.message_list.rows[id].deleted)
+ || (flag=='undelete' && this.message_list.rows[id].deleted))
+ {
+ r_uids[r_uids.length] = id;
+ }
+ }
// nothing to do
- if (!a_uids.length)
+ if (!r_uids.length)
return;
switch (flag)
{
case 'read':
case 'unread':
- this.toggle_read_status(flag, a_uids);
+ this.toggle_read_status(flag, r_uids);
break;
case 'delete':
case 'undelete':
- this.toggle_delete_status(a_uids);
+ this.toggle_delete_status(r_uids);
break;
}
};
@@ -1556,7 +1566,7 @@ function rcube_webmail()
rows[uid].icon.src = icn_src;
}
}
-
+
this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
};
@@ -1564,7 +1574,7 @@ function rcube_webmail()
this.toggle_delete_status = function(a_uids)
{
if (this.env.read_when_deleted)
- this.toggle_read_status('read',a_uids);
+ this.mark_message('read',a_uids);
// if deleting message from "view message" don't bother with delete icon
if (this.env.action == "show")
@@ -1671,7 +1681,7 @@ function rcube_webmail()
/*********************************************************/
// handler for keyboard events on the _user field
- this.login_user_keypress = function(e)
+ this.login_user_keyup = function(e)
{
var key = rcube_event.get_keycode(e);
var elm;
@@ -2010,7 +2020,7 @@ function rcube_webmail()
// reset vars
this.env.current_page = 1;
this.set_busy(true, 'searching');
- this.http_request('search', '_q='+urlencode(value)+(this.env.mailbox ? '&_mbox='+this.env.mailbox : '')+(this.env.source ? '&_source='+urlencode(this.env.source) : ''), true);
+ this.http_request('search', '_q='+urlencode(value)+(this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : '')+(this.env.source ? '&_source='+urlencode(this.env.source) : ''), true);
}
return true;
};
@@ -2681,6 +2691,10 @@ function rcube_webmail()
{
this.http_post('delete-folder', '_mboxes='+urlencode(folder));
this.set_env('folder', null);
+
+ if (this.gui_objects.createfolderhint)
+ this.gui_objects.createfolderhint.innerHTML = '';
+
}
};
@@ -2816,60 +2830,18 @@ function rcube_webmail()
this.subscribe_folder = function(folder)
{
- var form;
- if ((form = this.gui_objects.editform) && form.elements['_unsubscribed'])
- this.change_subscription('_unsubscribed', '_subscribed', 'subscribe');
- else if (folder)
- this.http_post('subscribe', '_mboxes='+urlencode(folder));
+ if (folder)
+ this.http_post('subscribe', '_mbox='+urlencode(folder));
};
this.unsubscribe_folder = function(folder)
{
- var form;
- if ((form = this.gui_objects.editform) && form.elements['_subscribed'])
- this.change_subscription('_subscribed', '_unsubscribed', 'unsubscribe');
- else if (folder)
- this.http_post('unsubscribe', '_mboxes='+urlencode(folder));
+ if (folder)
+ this.http_post('unsubscribe', '_mbox='+urlencode(folder));
};
- this.change_subscription = function(from, to, action)
- {
- var form;
- if (form = this.gui_objects.editform)
- {
- var a_folders = new Array();
- var list_from = form.elements[from];
-
- for (var i=0; list_from && i<list_from.options.length; i++)
- {
- if (list_from.options[i] && list_from.options[i].selected)
- {
- a_folders[a_folders.length] = list_from.options[i].value;
- list_from[i] = null;
- i--;
- }
- }
-
- // yes, we have some folders selected
- if (a_folders.length)
- {
- var list_to = form.elements[to];
- var index;
-
- for (var n=0; n<a_folders.length; n++)
- {
- index = list_to.options.length;
- list_to[index] = new Option(a_folders[n]);
- }
-
- this.http_post(action, '_mboxes='+urlencode(a_folders.join(',')));
- }
- }
-
- };
-
// helper method to find a specific mailbox row ID
this.get_folder_row_id = function(folder)
{
@@ -3491,12 +3463,17 @@ function rcube_webmail()
case 'list':
if (this.env.messagecount)
- this.enable_command('purge', (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox));
- this.msglist_select(this.message_list);
+ this.enable_command('purge', (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox));
+
+ this.msglist_select(this.message_list);
+
+ case 'getunread':
+ this.enable_command('sort', (this.env.messagecount > 0));
case 'expunge':
this.enable_command('select-all', 'select-none', 'expunge', this.env.messagecount ? true : false);
break;
+
}
request_obj.reset();
diff --git a/program/js/list.js b/program/js/list.js
index e42d3f6b7..2b3c7a8f6 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -35,6 +35,7 @@ function rcube_list_widget(list, p)
this.subject_col = -1;
this.shiftkey = false;
this.multiselect = false;
+ this.multi_selecting = false;
this.draggable = false;
this.keyboard = false;
this.toggleselect = false;
@@ -319,6 +320,7 @@ select_row: function(id, mod_key, with_mouse)
{
this.shift_start = id;
this.highlight_row(id, false);
+ this.multi_selecting = false;
}
else
{
@@ -341,6 +343,7 @@ select_row: function(id, mod_key, with_mouse)
this.highlight_row(id, false);
break;
}
+ this.multi_selecting = true;
}
// trigger event if selection changed
@@ -456,6 +459,8 @@ select_all: function(filter)
if (this.selection.join(',') != select_before)
this.trigger_event('select');
+ this.focus();
+
return true;
},
@@ -508,7 +513,7 @@ highlight_row: function(id, multiple)
{
if (this.rows[id] && !multiple)
{
- if (!this.in_selection(id))
+ if (this.selection.length > 1 || !this.in_selection(id))
{
this.clear_selection();
this.selection[0] = id;
diff --git a/program/js/tiny_mce/themes/advanced/css/editor_content.css b/program/js/tiny_mce/themes/advanced/css/editor_content.css
new file mode 100644
index 000000000..182e79121
--- /dev/null
+++ b/program/js/tiny_mce/themes/advanced/css/editor_content.css
@@ -0,0 +1,58 @@
+/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
+/* You can extend this CSS by adding your own CSS file with the the content_css option */
+
+body, td, pre {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
+body {
+ background-color: #FFFFFF;
+}
+
+.mceVisualAid {
+ border: 1px dashed #BBBBBB !important;
+}
+
+div.mceVisualAid {
+ background-image:url('../images/spacer.gif');
+ visibility: visible !important;
+}
+
+.mceItemAnchor {
+ width: 12px;
+ line-height: 6px;
+ overflow: hidden;
+ padding-left: 12px;
+ background-image: url('../images/anchor_symbol.gif');
+ background-position: bottom;
+ background-repeat: no-repeat;
+}
+
+/* Important is needed in Gecko browsers inorder to style links */
+/*
+a {
+ color: green !important;
+}
+*/
+
+/* Style selection range colors in Gecko browsers */
+/*
+::-moz-selection {
+ background-color: red;
+ color: green;
+}
+*/
+
+/* MSIE specific */
+
+* html body {
+ scrollbar-3dlight-color: #F0F0EE;
+ scrollbar-arrow-color: #676662;
+ scrollbar-base-color: #F0F0EE;
+ scrollbar-darkshadow-color: #DDDDDD;
+ scrollbar-face-color: #E0E0DD;
+ scrollbar-highlight-color: #F0F0EE;
+ scrollbar-shadow-color: #F0F0EE;
+ scrollbar-track-color: #F5F5F5;
+}
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index e9b46847d..96353dd2f 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -161,18 +161,19 @@ function iil_xor($string, $string2) {
}
function iil_ReadLine($fp, $size) {
- $line = '';
- if ($fp) {
- do {
- // FIXME: hardcode size?
- $buffer = fgets($fp, 2048);
- if ($buffer === false) {
- break;
- }
- $line .= $buffer;
- } while ($buffer[strlen($buffer)-1]!="\n");
- }
- return $line;
+ $line = '';
+ if (!$fp) {
+ return $line;
+ }
+ do {
+ // FIXME: hardcode size?
+ $buffer = fgets($fp, 2048);
+ if ($buffer === false) {
+ break;
+ }
+ $line .= $buffer;
+ } while ($buffer[strlen($buffer)-1] != "\n");
+ return $line;
}
function iil_MultLine($fp, $line) {
@@ -192,13 +193,16 @@ function iil_MultLine($fp, $line) {
}
function iil_ReadBytes($fp, $bytes) {
- $data = '';
- $len = 0;
- do {
- $data.=fread($fp, $bytes-$len);
- $len = strlen($data);
- } while ($len<$bytes);
- return $data;
+ $data = '';
+ $len = 0;
+ do {
+ $data .= fread($fp, $bytes-$len);
+ if ($len == strlen($data)) {
+ break; //nothing was read -> exit to avoid apache lockups
+ }
+ $len = strlen($data);
+ } while ($len < $bytes);
+ return $data;
}
function iil_ReadReply($fp) {
@@ -1596,7 +1600,8 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false)
while ( list($lines_key, $str) = each($lines) ) {
list($field, $string) = iil_SplitHeaderLine($str);
- $field = strtolower($field);
+ $field = strtolower($field);
+ $string = ereg_replace("\n[[:space:]]*"," ",$string);
switch ($field) {
case 'date';
@@ -1607,22 +1612,22 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false)
$result[$id]->from = $string;
break;
case 'to':
- $result[$id]->to = str_replace("\n", " ", $string);
+ $result[$id]->to = $string;
break;
case 'subject':
- $result[$id]->subject = str_replace("\n", '', $string);
+ $result[$id]->subject = $string;
break;
case 'reply-to':
- $result[$id]->replyto = str_replace("\n", " ", $string);
+ $result[$id]->replyto = $string;
break;
case 'cc':
- $result[$id]->cc = str_replace("\n", " ", $string);
+ $result[$id]->cc = $string;
break;
case 'bcc':
- $result[$id]->bcc = str_replace("\n", " ", $string);
+ $result[$id]->bcc = $string;
break;
case 'content-transfer-encoding':
- $result[$id]->encoding = str_replace("\n", " ", $string);
+ $result[$id]->encoding = $string;
break;
case 'content-type':
$ctype_parts = explode(";", $string);
@@ -1643,7 +1648,7 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false)
case 'return-receipt-to':
case 'disposition-notification-to':
case 'x-confirm-reading-to':
- $result[$id]->mdn_to = str_replace("\n", " ", $string);
+ $result[$id]->mdn_to = $string;
break;
case 'message-id':
$result[$id]->messageID = $string;
@@ -2448,7 +2453,6 @@ function iil_C_Append(&$conn, $folder, &$message) {
if (fputs($fp, $request)) {
$line=iil_ReadLine($fp, 100);
$sent = fwrite($fp, $message."\r\n");
- flush();
do {
$line=iil_ReadLine($fp, 1000);
} while ($line[0] != 'A');
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 24622d00e..3761cc6d3 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -167,7 +167,7 @@ $labels['language'] = 'Language';
$labels['timezone'] = 'Time zone';
$labels['pagesize'] = 'Rows per page';
$labels['signature'] = 'Signature';
-$labels['dstactive'] = 'Daylight savings';
+$labels['dstactive'] = 'Summer time';
$labels['htmleditor'] = 'Compose HTML messages';
$labels['htmlsignature'] = 'HTML signature';
$labels['previewpane'] = 'Show preview pane';
@@ -189,4 +189,4 @@ $labels['sortby'] = 'Sort by';
$labels['sortasc'] = 'Sort ascending';
$labels['sortdesc'] = 'Sort descending';
-?> \ No newline at end of file
+?>
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 9a9c8410c..823fb2ab5 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -218,7 +218,7 @@ $labels['language'] = 'Language';
$labels['timezone'] = 'Time zone';
$labels['pagesize'] = 'Rows per page';
$labels['signature'] = 'Signature';
-$labels['dstactive'] = 'Daylight savings';
+$labels['dstactive'] = 'Daylight saving time';
$labels['htmleditor'] = 'Compose HTML messages';
$labels['htmlsignature'] = 'HTML signature';
$labels['previewpane'] = 'Show preview pane';
@@ -243,4 +243,4 @@ $labels['sortby'] = 'Sort by';
$labels['sortasc'] = 'Sort ascending';
$labels['sortdesc'] = 'Sort descending';
-?> \ No newline at end of file
+?>
diff --git a/program/localization/fi/labels.inc b/program/localization/fi/labels.inc
index b46eddb88..1abeffa87 100644
--- a/program/localization/fi/labels.inc
+++ b/program/localization/fi/labels.inc
@@ -47,7 +47,7 @@ $labels['reply-to'] = 'Vastaus osoitteeseen';
$labels['mailboxlist'] = 'Kansiot';
$labels['messagesfromto'] = 'Viestit $from-$to/$count';
$labels['messagenrof'] = 'Viesti $nr/$count';
-$labels['moveto'] = 'siirrä...';
+$labels['moveto'] = 'siirrä kansioon...';
$labels['download'] = 'lataa';
$labels['filename'] = 'Tiedoston nimi';
$labels['filesize'] = 'Tiedoston koko';
@@ -96,7 +96,7 @@ $labels['all'] = 'Kaikki';
$labels['none'] = 'Ei mitään';
$labels['unread'] = 'Lukemattomat';
$labels['compact'] = 'Tiivistä';
-$labels['empty'] = 'Empty';
+$labels['empty'] = 'Tyhjennä';
$labels['purge'] = 'Puhdista';
$labels['quota'] = 'Levytila';
$labels['unknown'] = 'tuntematon';
@@ -187,7 +187,7 @@ $labels['renamefolder'] = 'Nimeä kansio uudelleen';
$labels['deletefolder'] = 'Poista kansio';
$labels['managefolders'] = 'Kansioiden ylläpito';
$labels['sortby'] = 'Järjestä';
-$labels['sortasc'] = 'Järjestä nousevasti';
-$labels['sortdesc'] = 'Järjestä laskevasti';
+$labels['sortasc'] = 'Järjestä nousevasti (a-ö)';
+$labels['sortdesc'] = 'Järjestä laskevasti (ö-a)';
?> \ No newline at end of file
diff --git a/program/localization/fr/labels.inc b/program/localization/fr/labels.inc
index 3c89d86ee..01bc6f0bc 100644
--- a/program/localization/fr/labels.inc
+++ b/program/localization/fr/labels.inc
@@ -10,9 +10,8 @@
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
- | Author: aldweb <info@aldweb.com> |
- | Pierre HAEGELI <pierre@haegeli.net> |
- | Mickaël Wolff <rcw@lupusmic.org> |
+ | Author: Joel S. <joel.s@spijoprod.net> |
+ | Jerome Lipowicz <jerome@yayel.com> |
+-----------------------------------------------------------------------+
@version $Id$
@@ -90,8 +89,8 @@ $labels['lastmessages'] = 'Voir la dernière page de messages';
$labels['backtolist'] = 'Retourner à la liste des messages';
$labels['viewsource'] = 'Voir le source';
$labels['markmessages'] = 'Marquer les messages';
-$labels['markread'] = 'comme lus';
-$labels['markunread'] = 'comme non lus';
+$labels['markread'] = 'Comme lus';
+$labels['markunread'] = 'Comme non lus';
$labels['select'] = 'Sélectionner';
$labels['all'] = 'Tous';
$labels['none'] = 'Aucun';
@@ -191,4 +190,4 @@ $labels['sortby'] = 'Trier par';
$labels['sortasc'] = 'Tri ascendant';
$labels['sortdesc'] = 'Tri descendant';
-?> \ No newline at end of file
+?>
diff --git a/program/localization/fr/messages.inc b/program/localization/fr/messages.inc
index fcd59fcfc..d91e09373 100644
--- a/program/localization/fr/messages.inc
+++ b/program/localization/fr/messages.inc
@@ -10,9 +10,8 @@
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
- | Author: aldweb <info@aldweb.com> |
- | Pierre HAEGELI <pierre@haegeli.net> |
- | Mickaël Wolff <rcw@lupusmic.org> |
+ | Author: Joel S. <joel.s@spijoprod.net> |
+ | Jerome Lipowicz <jerome@yayel.com> |
+-----------------------------------------------------------------------+
@version $Id$
diff --git a/program/localization/ge/labels.inc b/program/localization/ge/labels.inc
index 75ccc1df9..6d3722319 100755
--- a/program/localization/ge/labels.inc
+++ b/program/localization/ge/labels.inc
@@ -18,59 +18,42 @@
*/
$labels = array();
-
-// login page
-$labels['welcome'] = 'მáƒáƒ’ესáƒáƒšáƒ›áƒ”ბáƒáƒ— $product';
-$labels['username'] = 'მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი';
-$labels['password'] = 'პáƒáƒ áƒáƒšáƒ˜';
-$labels['server'] = 'სერვერი';
-$labels['login'] = 'შესვლáƒ';
-
-// taskbar
-$labels['logout'] = 'გáƒáƒ›áƒáƒ¡áƒ•áƒšáƒ';
-$labels['mail'] = 'ელ–ფáƒáƒ¡áƒ¢áƒ';
+$labels['welcome'] = 'მáƒáƒ’ესáƒáƒšáƒ›áƒ”ბáƒáƒ— $product';
+$labels['username'] = 'მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელი';
+$labels['password'] = 'პáƒáƒ áƒáƒšáƒ˜';
+$labels['server'] = 'სერვერი';
+$labels['login'] = 'შესვლáƒ';
+$labels['logout'] = 'გáƒáƒ›áƒáƒ¡áƒ•áƒšáƒ';
+$labels['mail'] = 'ელ–ფáƒáƒ¡áƒ¢áƒ';
$labels['settings'] = 'პáƒáƒ áƒáƒ›áƒ”ტრები';
$labels['addressbook'] = 'მისáƒáƒ›áƒáƒ áƒ—ები';
-
-// mailbox names
-$labels['inbox'] = 'მიღებული';
+$labels['inbox'] = 'მიღებული';
$labels['drafts'] = 'დრáƒáƒ”ბითი';
-$labels['sent'] = 'გáƒáƒ’ზáƒáƒ•áƒœáƒ˜áƒšáƒ”ბი';
-$labels['trash'] = 'წáƒáƒ¨áƒšáƒ˜áƒšáƒ”ბი';
-$labels['junk'] = 'სპáƒáƒ›áƒ˜';
-
-// message listing
+$labels['sent'] = 'გáƒáƒ’ზáƒáƒ•áƒœáƒ˜áƒšáƒ”ბი';
+$labels['trash'] = 'წáƒáƒ¨áƒšáƒ˜áƒšáƒ”ბი';
+$labels['junk'] = 'სპáƒáƒ›áƒ˜';
$labels['subject'] = 'სáƒáƒ—áƒáƒ£áƒ áƒ˜';
-$labels['from'] = 'გáƒáƒ›áƒ’ზáƒáƒ•áƒœáƒ˜';
-$labels['to'] = 'მიმღები';
-$labels['cc'] = 'კáƒáƒžáƒ˜áƒ';
-$labels['bcc'] = 'ფáƒáƒ áƒ£áƒšáƒ˜';
+$labels['from'] = 'გáƒáƒ›áƒ’ზáƒáƒ•áƒœáƒ˜';
+$labels['to'] = 'მიმღები';
+$labels['cc'] = 'კáƒáƒžáƒ˜áƒ';
+$labels['bcc'] = 'ფáƒáƒ áƒ£áƒšáƒ˜';
$labels['replyto'] = 'დáƒáƒ‘რუნებáƒ';
-$labels['date'] = 'თáƒáƒ áƒ˜áƒ¦áƒ˜';
-$labels['size'] = 'ზáƒáƒ›áƒ';
+$labels['date'] = 'თáƒáƒ áƒ˜áƒ¦áƒ˜';
+$labels['size'] = 'ზáƒáƒ›áƒ';
$labels['priority'] = 'პრიáƒáƒ áƒ˜áƒ¢áƒ”ტი';
$labels['organization'] = 'áƒáƒ áƒ’áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ';
-
-// aliases
-$labels['reply-to'] = $labels['replyto'];
-
+$labels['reply-to'] = 'დáƒáƒ‘რუნებáƒ';
$labels['mailboxlist'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეები';
$labels['messagesfromto'] = 'შეტყáƒáƒ‘ინებრ$from $to დáƒáƒœ $count';
$labels['messagenrof'] = 'შეტყáƒáƒ‘ინებრ$nr დáƒáƒœ $count';
-
-$labels['moveto'] = 'გáƒáƒ“áƒáƒ¢áƒáƒœáƒ...';
+$labels['moveto'] = 'გáƒáƒ“áƒáƒ¢áƒáƒœáƒ...';
$labels['download'] = 'გáƒáƒ“მáƒáƒ¬áƒ”რáƒ';
-
$labels['filename'] = 'ფáƒáƒ˜áƒšáƒ˜áƒ¡ სáƒáƒ®áƒ”ლი';
$labels['filesize'] = 'ფáƒáƒ˜áƒšáƒ˜áƒ¡ ზáƒáƒ›áƒ';
-
$labels['preferhtml'] = 'რáƒáƒ’áƒáƒ áƒª HTML';
$labels['htmlmessage'] = 'HTML შეტყáƒáƒ‘ინებáƒ';
$labels['prettydate'] = 'კáƒáƒ áƒ’ი თáƒáƒ áƒ˜áƒ¦áƒ”ბი';
-
$labels['addtoaddressbook'] = 'მისáƒáƒ›áƒáƒ áƒ—ებში დáƒáƒ›áƒáƒ¢áƒ”ბáƒ';
-
-// weekdays short
$labels['sun'] = 'კვ';
$labels['mon'] = 'áƒáƒ ';
$labels['tue'] = 'სáƒáƒ›';
@@ -78,160 +61,132 @@ $labels['wed'] = 'áƒáƒ—ხ';
$labels['thu'] = 'ხუთ';
$labels['fri'] = 'პáƒáƒ ';
$labels['sat'] = 'შáƒáƒ‘';
-
-// weekdays long
-$labels['sunday'] = 'კვირáƒ';
-$labels['monday'] = 'áƒáƒ áƒ¨áƒáƒ‘áƒáƒ—ი';
-$labels['tuesday'] = 'სáƒáƒ›áƒ¨áƒáƒ‘áƒáƒ—ი';
+$labels['sunday'] = 'კვირáƒ';
+$labels['monday'] = 'áƒáƒ áƒ¨áƒáƒ‘áƒáƒ—ი';
+$labels['tuesday'] = 'სáƒáƒ›áƒ¨áƒáƒ‘áƒáƒ—ი';
$labels['wednesday'] = 'áƒáƒ—ხშáƒáƒ‘áƒáƒ—ი';
-$labels['thursday'] = 'ხუთშáƒáƒ‘áƒáƒ—ი';
-$labels['friday'] = 'პáƒáƒ áƒáƒ¡áƒ™áƒ”ვი';
-$labels['saturday'] = 'შáƒáƒ‘áƒáƒ—ი';
-
+$labels['thursday'] = 'ხუთშáƒáƒ‘áƒáƒ—ი';
+$labels['friday'] = 'პáƒáƒ áƒáƒ¡áƒ™áƒ”ვი';
+$labels['saturday'] = 'შáƒáƒ‘áƒáƒ—ი';
$labels['today'] = 'დღეს';
-
-// toolbar buttons
-$labels['checkmail'] = 'შემáƒáƒ¬áƒ›áƒ”ბრáƒáƒ®áƒáƒš შეტყáƒáƒ‘ინებáƒáƒ–ე';
-$labels['writenewmessage'] = 'áƒáƒ®áƒáƒšáƒ˜ შეტყáƒáƒ‘ინებáƒ';
-$labels['replytomessage'] = 'პáƒáƒ¡áƒ£áƒ®áƒ˜';
+$labels['checkmail'] = 'შემáƒáƒ¬áƒ›áƒ”ბრáƒáƒ®áƒáƒš შეტყáƒáƒ‘ინებáƒáƒ–ე';
+$labels['writenewmessage'] = 'áƒáƒ®áƒáƒšáƒ˜ შეტყáƒáƒ‘ინებáƒ';
+$labels['replytomessage'] = 'პáƒáƒ¡áƒ£áƒ®áƒ˜';
$labels['replytoallmessage'] = 'პáƒáƒ¡áƒ£áƒ®áƒ˜ ყველáƒáƒ¡';
-$labels['forwardmessage'] = 'გáƒáƒ“áƒáƒ’ზáƒáƒ•áƒœáƒ';
-$labels['deletemessage'] = 'წáƒáƒ¨áƒšáƒ';
+$labels['forwardmessage'] = 'გáƒáƒ“áƒáƒ’ზáƒáƒ•áƒœáƒ';
+$labels['deletemessage'] = 'წáƒáƒ¨áƒšáƒ';
$labels['movemessagetotrash'] = 'შეტყáƒáƒ‘ინების წáƒáƒ¨áƒšáƒ˜áƒšáƒ”ბში გáƒáƒ“áƒáƒ¢áƒáƒœáƒ';
-$labels['printmessage'] = 'შეტყáƒáƒ‘ინების áƒáƒ›áƒáƒ‘ეჭვდáƒ';
-$labels['previousmessage'] = 'წინრშეტყáƒáƒ‘ინების ნáƒáƒ®áƒ•áƒ';
+$labels['printmessage'] = 'შეტყáƒáƒ‘ინების áƒáƒ›áƒáƒ‘ეჭვდáƒ';
+$labels['previousmessage'] = 'წინრშეტყáƒáƒ‘ინების ნáƒáƒ®áƒ•áƒ';
$labels['previousmessages'] = 'წინრშეტყáƒáƒ‘ინებების ნáƒáƒ®áƒ•áƒ';
-$labels['firstmessage'] = 'პირველი შეტყáƒáƒ‘ინების ნáƒáƒ®áƒ•áƒ';
-$labels['firstmessages'] = 'პრველი შეტყáƒáƒ‘ინებები';
-$labels['nextmessage'] = 'შემდეგი შეტყáƒáƒ‘ინების ნáƒáƒ®áƒ•áƒ';
-$labels['nextmessages'] = 'შემდეგი შეტყáƒáƒ‘ინებების ნáƒáƒ®áƒ•áƒ';
-$labels['lastmessage'] = 'ბáƒáƒšáƒ შეტყáƒáƒ‘ინების ნáƒáƒ®áƒ•áƒ';
-$labels['lastmessages'] = 'ბáƒáƒšáƒ შეტყáƒáƒ‘ინებების ნáƒáƒ®áƒ•áƒ';
-$labels['backtolist'] = 'უკáƒáƒœ ჩáƒáƒ›áƒáƒœáƒáƒ—ვáƒáƒšáƒ¨áƒ˜';
-$labels['viewsource'] = 'შიგთáƒáƒ•áƒ¡áƒ˜';
-
+$labels['firstmessage'] = 'პირველი შეტყáƒáƒ‘ინების ნáƒáƒ®áƒ•áƒ';
+$labels['firstmessages'] = 'პრველი შეტყáƒáƒ‘ინებები';
+$labels['nextmessage'] = 'შემდეგი შეტყáƒáƒ‘ინების ნáƒáƒ®áƒ•áƒ';
+$labels['nextmessages'] = 'შემდეგი შეტყáƒáƒ‘ინებების ნáƒáƒ®áƒ•áƒ';
+$labels['lastmessage'] = 'ბáƒáƒšáƒ შეტყáƒáƒ‘ინების ნáƒáƒ®áƒ•áƒ';
+$labels['lastmessages'] = 'ბáƒáƒšáƒ შეტყáƒáƒ‘ინებების ნáƒáƒ®áƒ•áƒ';
+$labels['backtolist'] = 'უკáƒáƒœ ჩáƒáƒ›áƒáƒœáƒáƒ—ვáƒáƒšáƒ¨áƒ˜';
+$labels['viewsource'] = 'შიგთáƒáƒ•áƒ¡áƒ˜';
+$labels['markmessages'] = 'მáƒáƒœáƒ˜áƒ¨áƒœáƒ”თ შეტყáƒáƒ‘ინებები';
+$labels['markread'] = 'რáƒáƒ’áƒáƒ áƒª წáƒáƒ™áƒ˜áƒ—ხული';
+$labels['markunread'] = 'რáƒáƒ’áƒáƒ áƒª წáƒáƒ£áƒ™áƒ˜áƒ—ხáƒáƒ•áƒ˜';
$labels['select'] = 'მáƒáƒœáƒ˜áƒ¨áƒ•áƒœáƒ';
$labels['all'] = 'ყველáƒ';
$labels['none'] = 'áƒáƒ áƒªáƒ”რთი';
$labels['unread'] = 'წáƒáƒ£áƒ™áƒ˜áƒ—ხáƒáƒ•áƒ˜';
-
$labels['compact'] = 'შეკუმშვáƒ';
$labels['empty'] = 'გáƒáƒªáƒáƒ áƒ˜áƒ”ლებáƒ';
$labels['purge'] = 'გáƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒ”ბáƒ';
-
$labels['quota'] = 'შეზღუდვáƒ';
-$labels['unknown'] = 'უცნáƒáƒ‘ი';
-$labels['unlimited'] = 'შეუზღუდáƒáƒ•áƒ˜';
-
-$labels['quicksearch'] = 'სწრáƒáƒ¤áƒ˜ ძიებáƒ';
-$labels['resetsearch'] = 'ძიების გáƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒ”ბáƒ';
-
-
-// message compose
-$labels['compose'] = 'შეტყáƒáƒ‘ინების დáƒáƒ¬áƒ”რáƒ';
-$labels['sendmessage'] = 'შეტყáƒáƒ‘ინების გáƒáƒ’ზáƒáƒ•áƒœáƒ';
-$labels['savemessage'] = 'დრáƒáƒ”ბით შენáƒáƒ®áƒ•áƒ';
-$labels['addattachment'] = 'ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—ვáƒ';
-$labels['charset'] = 'კáƒáƒ“ირებáƒ';
-$labels['editortype'] = 'რედáƒáƒ¥áƒ¢áƒáƒ áƒ˜';
-$labels['returnreceipt'] = 'პáƒáƒ¡áƒ£áƒ®áƒ˜áƒ¡ მáƒáƒ—ხáƒáƒ•áƒœáƒ';
-
+$labels['unknown'] = 'უცნáƒáƒ‘ი';
+$labels['unlimited'] = 'შეუზღუდáƒáƒ•áƒ˜';
+$labels['quicksearch'] = 'სწრáƒáƒ¤áƒ˜ ძიებáƒ';
+$labels['resetsearch'] = 'ძიების გáƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒ”ბáƒ';
+$labels['compose'] = 'შეტყáƒáƒ‘ინების დáƒáƒ¬áƒ”რáƒ';
+$labels['savemessage'] = 'დრáƒáƒ”ბით შენáƒáƒ®áƒ•áƒ';
+$labels['sendmessage'] = 'შეტყáƒáƒ‘ინების გáƒáƒ’ზáƒáƒ•áƒœáƒ';
+$labels['addattachment'] = 'ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—ვáƒ';
+$labels['charset'] = 'კáƒáƒ“ირებáƒ';
+$labels['editortype'] = 'რედáƒáƒ¥áƒ¢áƒáƒ áƒ˜';
+$labels['returnreceipt'] = 'პáƒáƒ¡áƒ£áƒ®áƒ˜áƒ¡ მáƒáƒ—ხáƒáƒ•áƒœáƒ';
$labels['checkspelling'] = 'áƒáƒ áƒ—áƒáƒ’რáƒáƒ¤áƒ˜áƒ£áƒšáƒ˜ შემáƒáƒ¬áƒ›áƒ”ბáƒ';
$labels['resumeediting'] = 'რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბის გáƒáƒ’რძელებáƒ';
-$labels['revertto'] = 'გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ';
-
+$labels['revertto'] = 'გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ';
$labels['attachments'] = 'გზáƒáƒ•áƒœáƒ˜áƒšáƒ”ბი';
$labels['upload'] = 'áƒáƒ¢áƒ•áƒ˜áƒ áƒ—ვáƒ';
-$labels['close'] = 'დáƒáƒ®áƒ£áƒ áƒ•áƒ';
-
-$labels['low'] = 'დáƒáƒ‘áƒáƒšáƒ˜';
-$labels['lowest'] = 'უდáƒáƒ‘ლესი';
-$labels['normal'] = 'სáƒáƒ¨áƒ£áƒáƒšáƒ';
-$labels['high'] = 'მáƒáƒ¦áƒáƒšáƒ˜';
+$labels['close'] = 'დáƒáƒ®áƒ£áƒ áƒ•áƒ';
+$labels['low'] = 'დáƒáƒ‘áƒáƒšáƒ˜';
+$labels['lowest'] = 'უდáƒáƒ‘ლესი';
+$labels['normal'] = 'სáƒáƒ¨áƒ£áƒáƒšáƒ';
+$labels['high'] = 'მáƒáƒ¦áƒáƒšáƒ˜';
$labels['highest'] = 'უმáƒáƒ¦áƒšáƒ”სი';
-
-$labels['nosubject'] = '(უსáƒáƒ—áƒáƒ£áƒ áƒ)';
+$labels['nosubject'] = '(უსáƒáƒ—áƒáƒ£áƒ áƒ)';
$labels['showimages'] = 'გáƒáƒ›áƒáƒ¡áƒáƒ®áƒ£áƒšáƒ”ბის ჩვენებáƒ';
-
$labels['htmltoggle'] = 'HTML';
$labels['plaintoggle'] = 'ტექსტური';
-
$labels['addcc'] = 'დáƒáƒáƒ›áƒáƒ¢áƒ” კáƒáƒžáƒ˜áƒ';
$labels['addbcc'] = 'დáƒáƒáƒ›áƒáƒ¢áƒ” ფáƒáƒ áƒ£áƒšáƒ˜ კáƒáƒžáƒ˜áƒ';
$labels['addreplyto'] = 'დáƒáƒáƒ›áƒáƒ¢áƒ” გáƒáƒ›áƒáƒ›áƒ’ზáƒáƒ•áƒœáƒ˜';
-
-
-// address boook
-$labels['name'] = 'სრული სáƒáƒ®áƒ”ლი';
+$labels['mdnrequest'] = 'გáƒáƒ›áƒáƒ›áƒ’ზáƒáƒ•áƒœáƒ¡ სურს შეიტყáƒáƒ¡ წერილის მიღებáƒ. გსურთ შეáƒáƒ¢áƒ§áƒáƒ‘ინáƒáƒ— გáƒáƒ›áƒáƒ›áƒ’ზáƒáƒ•áƒœáƒ¡?';
+$labels['receiptread'] = 'გზáƒáƒ•áƒœáƒ˜áƒšáƒ˜áƒ¡ დáƒáƒ‘რუნებáƒ';
+$labels['yourmessage'] = 'ეს áƒáƒ áƒ˜áƒ¡ მიღების დáƒáƒ¡áƒ¢áƒ£áƒ áƒ˜ თქვენს შეტყáƒáƒ‘ინებáƒáƒ–ე';
+$labels['receiptnote'] = 'გáƒáƒœáƒ›áƒáƒ áƒ¢áƒ”ბáƒ: ეს ნიშნáƒáƒ•áƒ¡ რáƒáƒ› áƒáƒ“რესáƒáƒ¢áƒ›áƒ მიიღრშეტყáƒáƒ‘ინებáƒ. მáƒáƒ’რáƒáƒ›, áƒáƒ  ნიშნáƒáƒ•áƒ¡ რáƒáƒ› წáƒáƒ˜áƒ™áƒ˜áƒ—ხრáƒáƒœ გáƒáƒ˜áƒ’რტექსტი';
+$labels['name'] = 'სრული სáƒáƒ®áƒ”ლი';
$labels['firstname'] = 'სáƒáƒ®áƒ”ლი';
-$labels['surname'] = 'გვáƒáƒ áƒ˜';
-$labels['email'] = 'ელ–ფáƒáƒ¡áƒ¢áƒ';
-
+$labels['surname'] = 'გვáƒáƒ áƒ˜';
+$labels['email'] = 'ელ–ფáƒáƒ¡áƒ¢áƒ';
$labels['addcontact'] = 'კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბში დáƒáƒ›áƒáƒ¢áƒ”ბáƒ';
$labels['editcontact'] = 'კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ˜áƒ¡ რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბáƒ';
-
-$labels['edit'] = 'რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბáƒ';
+$labels['edit'] = 'რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბáƒ';
$labels['cancel'] = 'გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ';
-$labels['save'] = 'შენáƒáƒ®áƒ•áƒ';
+$labels['save'] = 'შენáƒáƒ®áƒ•áƒ';
$labels['delete'] = 'წáƒáƒ¨áƒšáƒ';
-
-$labels['newcontact'] = 'კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ˜áƒ¡ შექმნáƒ';
-$labels['deletecontact'] = 'მáƒáƒœáƒ˜áƒ¨áƒœáƒ”ლი კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ˜áƒ¡ წáƒáƒ¨áƒšáƒ';
-$labels['composeto'] = 'ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ გáƒáƒ’ზáƒáƒ•áƒœáƒ შერჩეულ áƒáƒ“რესáƒáƒ¢áƒ”ბთáƒáƒœ';
+$labels['newcontact'] = 'კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ˜áƒ¡ შექმნáƒ';
+$labels['deletecontact'] = 'მáƒáƒœáƒ˜áƒ¨áƒœáƒ”ლი კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ˜áƒ¡ წáƒáƒ¨áƒšáƒ';
+$labels['composeto'] = 'ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ გáƒáƒ’ზáƒáƒ•áƒœáƒ შერჩეულ áƒáƒ“რესáƒáƒ¢áƒ”ბთáƒáƒœ';
$labels['contactsfromto'] = 'კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბი $from დáƒáƒœ $to ში $count';
-$labels['print'] = 'დáƒáƒ‘ეჭვდáƒ';
-$labels['export'] = 'ექსპáƒáƒ áƒ¢áƒ˜';
-
-$labels['previouspage'] = 'წინáƒáƒ¡ ჩვენებáƒ';
-$labels['firstpage'] = 'პირველის ჩვენებáƒ';
-$labels['nextpage'] = 'შემდეგის ჩვენებáƒ';
-$labels['lastpage'] = 'ბáƒáƒšáƒáƒ¡ ჩვენებáƒ';
-
+$labels['print'] = 'დáƒáƒ‘ეჭვდáƒ';
+$labels['export'] = 'ექსპáƒáƒ áƒ¢áƒ˜';
+$labels['previouspage'] = 'წინáƒáƒ¡ ჩვენებáƒ';
+$labels['firstpage'] = 'პირველის ჩვენებáƒ';
+$labels['nextpage'] = 'შემდეგის ჩვენებáƒ';
+$labels['lastpage'] = 'ბáƒáƒšáƒáƒ¡ ჩვენებáƒ';
$labels['groups'] = 'ჯგუფები';
$labels['personaladrbook'] = 'პერსáƒáƒœáƒáƒšáƒ£áƒ áƒ˜ მისáƒáƒ›áƒáƒ áƒ—ები';
-
-
-// settings
-$labels['settingsfor'] = 'პáƒáƒ áƒáƒ›áƒ”ტრები';
-
-$labels['preferences'] = 'პáƒáƒ áƒáƒ›áƒ”ტრები';
-$labels['userpreferences'] = 'მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის პáƒáƒ áƒáƒ›áƒ”ტრები';
-$labels['editpreferences'] = 'მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის პáƒáƒ áƒáƒ›áƒ”ტრების რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბáƒ';
-
-$labels['identities'] = 'პრáƒáƒ¤áƒ˜áƒšáƒ”ბი';
-$labels['manageidentities'] = 'პრáƒáƒ¤áƒ˜áƒšáƒ”ბის მáƒáƒ áƒ—ვáƒ';
-$labels['newidentity'] = 'áƒáƒ®áƒáƒšáƒ˜ პრáƒáƒ¤áƒ˜áƒšáƒ˜';
-
-$labels['newitem'] = 'áƒáƒ®áƒáƒšáƒ˜';
-$labels['edititem'] = 'რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბáƒ';
-
-$labels['setdefault'] = 'რáƒáƒ’áƒáƒ áƒª ზáƒáƒ’áƒáƒ’áƒáƒ“';
-$labels['language'] = 'ენáƒ';
-$labels['timezone'] = 'დრáƒáƒ˜áƒ—ი ზáƒáƒœáƒ';
-$labels['pagesize'] = 'სტრიქáƒáƒœáƒ˜ გვერდზე';
+$labels['settingsfor'] = 'პáƒáƒ áƒáƒ›áƒ”ტრები';
+$labels['preferences'] = 'პáƒáƒ áƒáƒ›áƒ”ტრები';
+$labels['userpreferences'] = 'მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის პáƒáƒ áƒáƒ›áƒ”ტრები';
+$labels['editpreferences'] = 'მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის პáƒáƒ áƒáƒ›áƒ”ტრების რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბáƒ';
+$labels['identities'] = 'პრáƒáƒ¤áƒ˜áƒšáƒ”ბი';
+$labels['manageidentities'] = 'პრáƒáƒ¤áƒ˜áƒšáƒ”ბის მáƒáƒ áƒ—ვáƒ';
+$labels['newidentity'] = 'áƒáƒ®áƒáƒšáƒ˜ პრáƒáƒ¤áƒ˜áƒšáƒ˜';
+$labels['newitem'] = 'áƒáƒ®áƒáƒšáƒ˜';
+$labels['edititem'] = 'რედáƒáƒ¥áƒ¢áƒ˜áƒ áƒ”ბáƒ';
+$labels['setdefault'] = 'რáƒáƒ’áƒáƒ áƒª ზáƒáƒ’áƒáƒ’áƒáƒ“';
+$labels['language'] = 'ენáƒ';
+$labels['timezone'] = 'დრáƒáƒ˜áƒ—ი ზáƒáƒœáƒ';
+$labels['pagesize'] = 'სტრიქáƒáƒœáƒ˜ გვერდზე';
$labels['signature'] = 'ხელმáƒáƒ¬áƒ”რáƒ';
-$labels['dstactive'] = 'დრáƒáƒ˜áƒ¡ გáƒáƒ“áƒáƒ§áƒ•áƒáƒœáƒ';
+$labels['dstactive'] = 'დრáƒáƒ˜áƒ¡ გáƒáƒ“áƒáƒ§áƒ•áƒáƒœáƒ';
$labels['htmleditor'] = 'შეტყáƒáƒ‘ინების შექმნრHTML –ში';
$labels['htmlsignature'] = 'HTML ხელმáƒáƒ¬áƒ”რáƒ';
$labels['previewpane'] = 'ჩვენებáƒ';
-
-$labels['autosavedraft'] = 'áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒ˜ შენáƒáƒ®áƒ•áƒ';
-$labels['everynminutes'] = 'ყáƒáƒ•áƒ”ლ $n წუთში';
-$labels['never'] = 'áƒáƒ áƒáƒ¡áƒ“რáƒáƒ¡';
-
-$labels['folder'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე';
-$labels['folders'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეები';
-$labels['foldername'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ის დáƒáƒ¡áƒáƒ®áƒ”ლებáƒ';
-$labels['subscribed'] = 'გáƒáƒ›áƒáƒªáƒ”რილიáƒ';
-$labels['create'] = 'შექმნáƒ';
-$labels['createfolder'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ის შექმნáƒ';
+$labels['autosavedraft'] = 'áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒ˜ შენáƒáƒ®áƒ•áƒ';
+$labels['everynminutes'] = 'ყáƒáƒ•áƒ”ლ $n წუთში';
+$labels['never'] = 'áƒáƒ áƒáƒ¡áƒ“რáƒáƒ¡';
+$labels['folder'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე';
+$labels['folders'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეები';
+$labels['foldername'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ის დáƒáƒ¡áƒáƒ®áƒ”ლებáƒ';
+$labels['subscribed'] = 'გáƒáƒ›áƒáƒªáƒ”რილიáƒ';
+$labels['messagecount'] = 'შეტყáƒáƒ‘ინებები';
+$labels['create'] = 'შექმნáƒ';
+$labels['createfolder'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ის შექმნáƒ';
$labels['rename'] = 'სáƒáƒ®áƒ”ლის გáƒáƒ“áƒáƒ áƒ¥áƒ›áƒ”ვáƒ';
$labels['renamefolder'] = 'სáƒáƒ®áƒ”ლის გáƒáƒ“áƒáƒ áƒ¥áƒ›áƒ”ვრსáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ისთვის';
-$labels['deletefolder'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ის წáƒáƒ¨áƒšáƒ';
-$labels['managefolders'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეების მáƒáƒ áƒ—ვáƒ';
-
+$labels['deletefolder'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ის წáƒáƒ¨áƒšáƒ';
+$labels['managefolders'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეების მáƒáƒ áƒ—ვáƒ';
$labels['sortby'] = 'დáƒáƒšáƒáƒ’ებáƒ';
-$labels['sortasc'] = 'დáƒáƒšáƒáƒ’ებრზრდáƒáƒ“áƒáƒ‘ით';
+$labels['sortasc'] = 'დáƒáƒšáƒáƒ’ებრზრდáƒáƒ“áƒáƒ‘ით';
$labels['sortdesc'] = 'დáƒáƒšáƒáƒ’ებრკლებáƒáƒ“áƒáƒ‘ით';
?>
diff --git a/program/localization/ge/messages.inc b/program/localization/ge/messages.inc
index c45574246..d2c29ca21 100755
--- a/program/localization/ge/messages.inc
+++ b/program/localization/ge/messages.inc
@@ -18,7 +18,7 @@
*/
$messages = array();
-$messages['loginfailed'] = 'შესვლრშეუძლებელიáƒ';
+$messages['loginfailed'] = 'შესვლრშეუძლებელიáƒ';
$messages['cookiesdisabled'] = 'თქვენი ბრáƒáƒ£áƒ–ერი კუკიებს áƒáƒ  პáƒáƒ¡áƒ£áƒ®áƒáƒ‘ს';
$messages['sessionerror'] = 'თქვენი სესირáƒáƒ áƒ˜áƒ¡ მცდáƒáƒ áƒ˜ áƒáƒœ ვáƒáƒ“áƒáƒ’áƒáƒ¡áƒ£áƒšáƒ˜';
$messages['imaperror'] = 'IMAP სერვერთáƒáƒœ დáƒáƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ”ბრშეუძლებელიáƒ';
@@ -43,16 +43,16 @@ $messages['sendingfailed'] = 'შეტყáƒáƒ‘ინებრვერ გáƒ
$messages['errorsaving'] = 'შენáƒáƒ®áƒ•áƒ˜áƒ¡ დრáƒáƒ¡ მáƒáƒ®áƒ“რშეცდáƒáƒ›áƒ';
$messages['errormoving'] = 'შეტყáƒáƒ‘ინების გáƒáƒ“áƒáƒ¢áƒáƒœáƒ შეუძლებელიáƒ';
$messages['errordeleting'] = 'შეტყáƒáƒ‘ინების წáƒáƒ¨áƒšáƒ შეუძლებელიáƒ';
-$messages['deletecontactconfirm'] = 'ნáƒáƒ›áƒ“ვილáƒáƒ“ გსურთ მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბის წáƒáƒ¨áƒšáƒ?';
+$messages['deletecontactconfirm'] = 'ნáƒáƒ›áƒ“ვილáƒáƒ“ გსურთ მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბის წáƒáƒ¨áƒšáƒ?';
$messages['deletemessagesconfirm'] = 'ნáƒáƒ›áƒ“ვილáƒáƒ“ გსურთ მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ შეტყáƒáƒ‘ინებების წáƒáƒ¨áƒšáƒ?';
-$messages['deletefolderconfirm'] = 'ნáƒáƒ›áƒ“ვილáƒáƒ“ გსურთ áƒáƒ› სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ის წáƒáƒ¨áƒšáƒ?';
-$messages['purgefolderconfirm'] = 'ნáƒáƒ›áƒ“ვილáƒáƒ“ გსურთ ყველრშეტყáƒáƒ‘ინების წáƒáƒ¨áƒšáƒ áƒáƒ¦áƒœáƒ˜áƒ¨áƒœáƒ£áƒš სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეში?';
+$messages['deletefolderconfirm'] = 'ნáƒáƒ›áƒ“ვილáƒáƒ“ გსურთ áƒáƒ› სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ის წáƒáƒ¨áƒšáƒ?';
+$messages['purgefolderconfirm'] = 'ნáƒáƒ›áƒ“ვილáƒáƒ“ გსურთ ყველრშეტყáƒáƒ‘ინების წáƒáƒ¨áƒšáƒ áƒáƒ¦áƒœáƒ˜áƒ¨áƒœáƒ£áƒš სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეში?';
$messages['formincomplete'] = 'ყველრველი áƒáƒ  áƒáƒ áƒ˜áƒ¡ შევსებული';
$messages['noemailwarning'] = 'მიუთითეთ სწáƒáƒ áƒ˜ ელ–ფáƒáƒ¡áƒ¢áƒ˜áƒ¡ მისáƒáƒ›áƒáƒ áƒ—ი';
-$messages['nonamewarning'] = 'მიუთითეთ სáƒáƒ®áƒ”ლი';
+$messages['nonamewarning'] = 'მიუთითეთ სáƒáƒ®áƒ”ლი';
$messages['nopagesizewarning'] = 'მიუთითეთ ფურცლის ზáƒáƒ›áƒ';
$messages['norecipientwarning'] = 'მიუთითეთ მიმღები';
-$messages['nosubjectwarning'] = 'გსურთ თუ áƒáƒ áƒ შეტყáƒáƒ‘ინების გáƒáƒ’ზáƒáƒ•áƒœáƒ უსáƒáƒ—áƒáƒ£áƒ áƒáƒ“?';
+$messages['nosubjectwarning'] = 'გსურთ თუ áƒáƒ áƒ შეტყáƒáƒ‘ინების გáƒáƒ’ზáƒáƒ•áƒœáƒ უსáƒáƒ—áƒáƒ£áƒ áƒáƒ“?';
$messages['nobodywarning'] = 'გსურთ თუ áƒáƒ áƒ შეტყáƒáƒ‘ინების გáƒáƒ’ზáƒáƒ•áƒœáƒ უტექსტáƒáƒ“?';
$messages['notsentwarning'] = 'შეტყáƒáƒ‘ინებრვერ იქნრგáƒáƒ’ზáƒáƒ•áƒœáƒ˜áƒšáƒ˜. გსურთ თუ áƒáƒ áƒ გზáƒáƒ•áƒœáƒ˜áƒšáƒ˜áƒ¡ გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ?';
$messages['noldapserver'] = 'მიუთითეთ LDAP სერვერი ძიებისთვის';
@@ -74,5 +74,9 @@ $messages['copyerror'] = 'ვერცერთი მისáƒáƒ›áƒáƒ áƒ—ი á
$messages['sourceisreadonly'] = 'áƒáƒ¦áƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ მისáƒáƒ›áƒáƒ áƒ—ის მხáƒáƒšáƒáƒ“ წáƒáƒ™áƒ˜áƒ—ხვáƒáƒ შესáƒáƒ«áƒšáƒ”ბელი';
$messages['errorsavingcontact'] = 'სáƒáƒ™áƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ მისáƒáƒ›áƒáƒ áƒ—ის შენáƒáƒ®áƒ•áƒ შეუძლებელიáƒ';
$messages['movingmessage'] = 'შეტყáƒáƒ‘ინების გáƒáƒ“áƒáƒ¢áƒáƒœáƒ...';
+$messages['receiptsent'] = 'წáƒáƒ áƒ›áƒáƒ¢áƒ”ბით გáƒáƒ˜áƒ’ზáƒáƒ•áƒœáƒ';
+$messages['errorsendingreceipt'] = 'áƒáƒ  გáƒáƒ˜áƒ’ზáƒáƒ•áƒœáƒ';
+$messages['nodeletelastidentity'] = 'წáƒáƒ¨áƒšáƒ შეუძლებელიáƒ, ის თქვენთვის ერთáƒáƒ“ერთიáƒ';
+$messages['addsubfolderhint'] = 'სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე შეიქმნებრრáƒáƒ’áƒáƒ áƒª ქვესáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒš სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეში';
?>
diff --git a/program/localization/hu/messages.inc b/program/localization/hu/messages.inc
index 1af1cd5f5..d1154b85e 100644
--- a/program/localization/hu/messages.inc
+++ b/program/localization/hu/messages.inc
@@ -11,7 +11,7 @@
| |
+-----------------------------------------------------------------------+
| Author: Levente Farkas <lfarkas at lfarkas dot org> |
- | Ervin Hegedüs <airween@damson.hu> |
+ | Ervin Hegedüs <airween@damson.hu> |
+-----------------------------------------------------------------------+
@version $Id$
@@ -19,65 +19,65 @@
*/
$messages = array();
-$messages['loginfailed'] = 'Sikertelen belépés';
-$messages['cookiesdisabled'] = 'A böngészõ nem támogatja a sütik használatát';
-$messages['sessionerror'] = 'Érvénytelen vagy lejárt munkamenet';
-$messages['imaperror'] = 'Nem sikerült a kapcsolódás az IMAP szerverhez';
-$messages['nomessagesfound'] = 'A fiók nem tartalmaz leveleket';
-$messages['loggedout'] = 'Sikeres kijelentkezés. Viszont látásra!';
-$messages['mailboxempty'] = 'A fiók üres';
-$messages['loading'] = 'Betöltés...';
-$messages['loadingdata'] = 'Az adatok betöltése...';
-$messages['checkingmail'] = 'Új üzenetek keresése...';
-$messages['sendingmessage'] = 'Az üzenet küldése...';
-$messages['messagesent'] = 'Az üzenet elküldve';
-$messages['savingmessage'] = 'Az üzenet mentése...';
-$messages['messagesaved'] = 'Az üzenet elmentve a Sablonokhoz';
-$messages['successfullysaved'] = 'A mentés sikerült';
-$messages['addedsuccessfully'] = 'A cím hozzáadása a címjegyzékhez megtörtént';
-$messages['contactexists'] = 'A kapcsolat már létezik ezzel az e-mail címmel';
-$messages['blockedimages'] = 'Biztonsági okokból a távoli képek letöltése tiltott.';
-$messages['encryptedmessage'] = 'Az üzenet titkosított, emiatt nem tudom megjeleníteni.';
+$messages['loginfailed'] = 'Sikertelen belépés';
+$messages['cookiesdisabled'] = 'A böngésző nem támogatja a sütik használatát';
+$messages['sessionerror'] = 'Érvénytelen vagy lejárt munkamenet';
+$messages['imaperror'] = 'Nem sikerült a kapcsolódás az IMAP szerverhez';
+$messages['nomessagesfound'] = 'A fiók nem tartalmaz leveleket';
+$messages['loggedout'] = 'Sikeres kijelentkezés. Viszont látásra!';
+$messages['mailboxempty'] = 'A fiók üres';
+$messages['loading'] = 'Betöltés...';
+$messages['loadingdata'] = 'Az adatok betöltése...';
+$messages['checkingmail'] = 'Új üzenetek keresése...';
+$messages['sendingmessage'] = 'Az üzenet küldése...';
+$messages['messagesent'] = 'Az üzenet elküldve';
+$messages['savingmessage'] = 'Az üzenet mentése...';
+$messages['messagesaved'] = 'Az üzenet elmentve a Sablonokhoz';
+$messages['successfullysaved'] = 'A mentés sikerült';
+$messages['addedsuccessfully'] = 'A cím hozzáadása a címjegyzékhez megtörtént';
+$messages['contactexists'] = 'A kapcsolat már létezik ezzel az e-mail címmel';
+$messages['blockedimages'] = 'Biztonsági okokból a távoli képek letöltése tiltott.';
+$messages['encryptedmessage'] = 'Az üzenet titkosított, emiatt nem tudom megjeleníteni.';
$messages['nocontactsfound'] = 'Nincs kapcsolat';
-$messages['contactnotfound'] = 'A kiválasztott kapcsolat nem található';
-$messages['sendingfailed'] = 'Az üzenet elküldése nem sikerült';
-$messages['errorsaving'] = 'A mentés során hiba lépett fel';
-$messages['errormoving'] = 'Az üzenetet nem sikerült áthelyezni';
-$messages['errordeleting'] = 'Az üzenetet nem sikerült törölni';
-$messages['deletecontactconfirm'] = 'Biztos, hogy törölni szeretnéd a kijelölt címe(ke)t?';
-$messages['deletemessagesconfirm'] = 'Biztos, hogy törölni szeretnéd a kijelölt üzenete(ke)t?';
-$messages['deletefolderconfirm'] = 'Biztos, hogy törölni szeretnéd ezt a mappát?';
-$messages['purgefolderconfirm'] = 'Biztos vagy benne, hogy az összes üzenet törölhetõ?';
-$messages['formincomplete'] = 'Az ûrlap hiányosan lett kitöltve';
-$messages['noemailwarning'] = 'Adj meg egy valós e-mail címet';
+$messages['contactnotfound'] = 'A kiválasztott kapcsolat nem található';
+$messages['sendingfailed'] = 'Az üzenet elküldése nem sikerült';
+$messages['errorsaving'] = 'A mentés során hiba lépett fel';
+$messages['errormoving'] = 'Az üzenetet nem sikerült áthelyezni';
+$messages['errordeleting'] = 'Az üzenetet nem sikerült törölni';
+$messages['deletecontactconfirm'] = 'Biztos, hogy törölni szeretnéd a kijelölt címe(ke)t?';
+$messages['deletemessagesconfirm'] = 'Biztos, hogy törölni szeretnéd a kijelölt üzenete(ke)t?';
+$messages['deletefolderconfirm'] = 'Biztos, hogy törölni szeretnéd ezt a mappát?';
+$messages['purgefolderconfirm'] = 'Biztos vagy benne, hogy az összes üzenet törölhető?';
+$messages['formincomplete'] = 'Az űrlap hiányosan lett kitöltve';
+$messages['noemailwarning'] = 'Adj meg egy valós e-mail címet';
$messages['nonamewarning'] = 'Adj meg egy nevet';
-$messages['nopagesizewarning'] = 'Add meg a papír méretét';
-$messages['norecipientwarning'] = 'Legalább egy címzettet adj meg';
-$messages['nosubjectwarning'] = 'A "Tárgy" mezõ üres. Szeretnéd most kitölteni?';
-$messages['nobodywarning'] = 'Elküldöd az üzenetet tárgy nélkül?';
-$messages['notsentwarning'] = 'Az üzenet még nem küldtem el. Eldobod az üzenetet?';
-$messages['noldapserver'] = 'Adj meg egy LDAP szervert a kereséshez';
-$messages['nocontactsreturned'] = 'Nem találtam kapcsolatot';
-$messages['nosearchname'] = 'Add meg a kapcsolat nevét vagy e-mail címét';
-$messages['searchsuccessful'] = '$nr üzenetet találtam';
-$messages['searchnomatch'] = 'Nincs találat';
-$messages['searching'] = 'Keresés...';
-$messages['checking'] = 'Ellenõrzés...';
-$messages['nospellerrors'] = 'Nem találtam helyesírási hibát';
-$messages['folderdeleted'] = 'A mappa sikeresen törölve';
-$messages['deletedsuccessfully'] = 'Törölve';
-$messages['converting'] = 'Formázás eltávolítása az üzenetbõl...';
-$messages['messageopenerror'] = 'Nem tudom letölteni a leveleket a szerverrõl';
-$messages['fileuploaderror'] = 'Feltöltés sikertelen';
-$messages['filesizeerror'] = 'A feltöltött file mérete meghaladja a maximális méretet $size';
-$messages['copysuccess'] = 'Sikeresen másoltunk $nr címet';
-$messages['copyerror'] = 'Nem tudtunk másolni egyetlen címet sem';
-$messages['sourceisreadonly'] = 'Ez a címforrás csak olvasható';
-$messages['errorsavingcontact'] = 'Nem tudtuk menteni a kapcsolat címét';
-$messages['movingmessage'] = 'Üzenet mozgatása...';
-$messages['receiptsent'] = 'Az Olvasási Értesítést elküldtük';
-$messages['errorsendingreceipt'] = 'Az Olvasási Értesítést nem sikerült elküldeni';
-$messages['nodeletelastidentity'] = 'Nem törölheti ezt a profilt, ez az egyetlen';
-$messages['addsubfolderhint'] = 'Az új könyvtárat az aktuálisan kiválasztott alkönyvtáraként fogjuk létrehozni';
+$messages['nopagesizewarning'] = 'Add meg a papír méretét';
+$messages['norecipientwarning'] = 'Legalább egy címzettet adj meg';
+$messages['nosubjectwarning'] = 'A "Tárgy" mező üres. Szeretnéd most kitölteni?';
+$messages['nobodywarning'] = 'Elküldöd az üzenetet tárgy nélkül?';
+$messages['notsentwarning'] = 'Az üzenet még nem küldtem el. Eldobod az üzenetet?';
+$messages['noldapserver'] = 'Adj meg egy LDAP szervert a kereséshez';
+$messages['nocontactsreturned'] = 'Nem találtam kapcsolatot';
+$messages['nosearchname'] = 'Add meg a kapcsolat nevét vagy e-mail címét';
+$messages['searchsuccessful'] = '$nr üzenetet találtam';
+$messages['searchnomatch'] = 'Nincs találat';
+$messages['searching'] = 'Keresés...';
+$messages['checking'] = 'Ellenőrzés...';
+$messages['nospellerrors'] = 'Nem találtam helyesírási hibát';
+$messages['folderdeleted'] = 'A mappa sikeresen törölve';
+$messages['deletedsuccessfully'] = 'Törölve';
+$messages['converting'] = 'Formázás eltávolítása az üzenetből...';
+$messages['messageopenerror'] = 'Nem tudom letölteni a leveleket a szerverről';
+$messages['fileuploaderror'] = 'Feltöltés sikertelen';
+$messages['filesizeerror'] = 'A feltöltött file mérete meghaladja a maximális méretet $size';
+$messages['copysuccess'] = 'Sikeresen másoltunk $nr címet';
+$messages['copyerror'] = 'Nem tudtunk másolni egyetlen címet sem';
+$messages['sourceisreadonly'] = 'Ez a címforrás csak olvasható';
+$messages['errorsavingcontact'] = 'Nem tudtuk menteni a kapcsolat címét';
+$messages['movingmessage'] = 'Üzenet mozgatása...';
+$messages['receiptsent'] = 'Az Olvasási Értesítést elküldtük';
+$messages['errorsendingreceipt'] = 'Az Olvasási Értesítést nem sikerült elküldeni';
+$messages['nodeletelastidentity'] = 'Nem törölheti ezt a profilt, ez az egyetlen';
+$messages['addsubfolderhint'] = 'Az új könyvtárat az aktuálisan kiválasztott alkönyvtáraként fogjuk létrehozni';
?> \ No newline at end of file
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 80007f4ba..a11f889c7 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -54,6 +54,7 @@
'it' => 'Italiano',
'ja' => 'Japanese (日本語)',
'kr' => 'Korean',
+ 'ku' => 'Kurdish (Kurmancî)',
'lv' => 'Latvian',
'lt' => 'Lithuanian',
'mk' => 'Macedonian',
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
new file mode 100644
index 000000000..3edd3e559
--- /dev/null
+++ b/program/localization/ku/labels.inc
@@ -0,0 +1,189 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/ku/labels.inc |
+ | |
+ | Language file of the RoundCube Webmail client |
+ | Copyright (C) 2006, RoundQube Dev. - Switzerland |
+ | Licensed under the GNU GPL |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Amed Çeko Jiyan <amedcj@kurdistan.name> |
+ +-----------------------------------------------------------------------+
+
+*/
+
+$labels = array();
+$labels['welcome'] = 'Bixêr hatî $product \\\'ê';
+$labels['username'] = 'Bikarhêner';
+$labels['password'] = 'Nasnav';
+$labels['server'] = 'Pêşkêşkar';
+$labels['login'] = 'Têkevê';
+$labels['logout'] = 'Derkeve';
+$labels['mail'] = 'E-Peyam';
+$labels['settings'] = 'Mîhengên Takekesî';
+$labels['addressbook'] = 'Lênûska Navnîşanan';
+$labels['inbox'] = 'Hatî';
+$labels['drafts'] = 'Hilanînî';
+$labels['sent'] = 'Şandî';
+$labels['trash'] = 'Çop';
+$labels['junk'] = 'Biikêrnehatî';
+$labels['subject'] = 'Mijar';
+$labels['from'] = 'Åžandyar';
+$labels['to'] = 'Standyar';
+$labels['cc'] = 'Kopiya Karbon';
+$labels['bcc'] = 'Kopiya karbon a Veşartî';
+$labels['replyto'] = 'Navnîşanên Standyar';
+$labels['date'] = 'Dîrok';
+$labels['size'] = 'Mezinahî';
+$labels['priority'] = 'Girîngî';
+$labels['organization'] = 'Sazî';
+$labels['reply-to'] = 'Navnîşanên Standyar';
+$labels['mailboxlist'] = 'Peldank';
+$labels['messagesfromto'] = 'Peyam $count ên di navbera $from - $to';
+$labels['messagenrof'] = '$nr a peyama $count';
+$labels['moveto'] = 'bibe...';
+$labels['download'] = 'daxe';
+$labels['filename'] = 'Navê pelê';
+$labels['filesize'] = 'Mezinahiya pelê';
+$labels['preferhtml'] = 'Wekî HTML nîşan bide';
+$labels['htmlmessage'] = 'Peyama HTML';
+$labels['prettydate'] = 'Kurtenivîsa Dîrokê';
+$labels['addtoaddressbook'] = 'Têxe lênûska navnîşanan';
+$labels['sun'] = 'YÅŸ';
+$labels['mon'] = 'DÅŸ';
+$labels['tue'] = 'SÅŸ';
+$labels['wed'] = 'Çş';
+$labels['thu'] = 'PÅŸ';
+$labels['fri'] = 'ÃŽn';
+$labels['sat'] = 'Åže';
+$labels['sunday'] = 'YekÅŸem';
+$labels['monday'] = 'DuÅŸem';
+$labels['tuesday'] = 'Sêşem';
+$labels['wednesday'] = 'Çarşem';
+$labels['thursday'] = 'Pêncşem';
+$labels['friday'] = 'ÃŽn';
+$labels['saturday'] = 'Şemî';
+$labels['today'] = 'ÃŽro';
+$labels['checkmail'] = 'Li peyamên nû venihêre';
+$labels['writenewmessage'] = 'Peyameke nû biafirîne';
+$labels['replytomessage'] = 'Bersivê bide peyamê';
+$labels['replytoallmessage'] = 'Bersivê ji bo hemû kesên ku ev peyan standine bişîne';
+$labels['forwardmessage'] = 'Bersivê bide peyamê';
+$labels['deletemessage'] = 'Peyamê jê bibe';
+$labels['movemessagetotrash'] = 'Peyamê dake çopê';
+$labels['printmessage'] = 'Vê peyamê çap bike';
+$labels['previousmessage'] = 'Peyama berê nîşan bide';
+$labels['previousmessages'] = 'Peyamên berê nîşan bide';
+$labels['firstmessage'] = 'Peyama yekemîn nîşan bide';
+$labels['firstmessages'] = 'Peyamên yekemîn nîşan bide';
+$labels['nextmessage'] = 'Peyama di rêzê de nîşan bide';
+$labels['nextmessages'] = 'Peyamên di rêzê de nîşan bide';
+$labels['lastmessage'] = 'Peyama dawî nîşan bide';
+$labels['lastmessages'] = 'Peyamên dawî nîşan bide';
+$labels['backtolist'] = 'Vegere lîsteya peyaman';
+$labels['viewsource'] = 'Çavkaniyê nîşan bide';
+$labels['markmessages'] = 'Peyamê nîşan bike';
+$labels['markread'] = 'Wekî xwendî';
+$labels['markunread'] = 'Wekî nexwendî';
+$labels['select'] = 'Hilbijêre';
+$labels['all'] = 'Hemû';
+$labels['none'] = 'Ne yek jî';
+$labels['unread'] = 'Nexwendî';
+$labels['compact'] = 'Kompakt';
+$labels['empty'] = 'Vala Bike';
+$labels['purge'] = 'Jê bibe';
+$labels['quota'] = 'Bikaranîna dîskê';
+$labels['unknown'] = 'nayê zanîn';
+$labels['unlimited'] = 'bêsînor';
+$labels['quicksearch'] = 'Lêgerîna bilez';
+$labels['resetsearch'] = 'Lêgerînê reset bike';
+$labels['compose'] = 'Peyamekê biafirîne';
+$labels['savemessage'] = 'Hilîne';
+$labels['sendmessage'] = 'Peyamê niha bişîne';
+$labels['addattachment'] = 'Pelekê lê zêde bike';
+$labels['charset'] = 'Curetîp';
+$labels['editortype'] = 'Cureyê serastkat';
+$labels['returnreceipt'] = 'Rapora Vegerînê';
+$labels['checkspelling'] = 'Kontrola rastnivîsê';
+$labels['resumeediting'] = 'Serastkirinê bidomîne';
+$labels['revertto'] = 'Şûnde bîne';
+$labels['attachments'] = 'Pêvek';
+$labels['upload'] = 'Bar bike';
+$labels['close'] = 'Bigire';
+$labels['low'] = 'Nizm';
+$labels['lowest'] = 'Nizmtirîn';
+$labels['normal'] = 'Asayî';
+$labels['high'] = 'Bilind';
+$labels['highest'] = 'Bilintirîn';
+$labels['nosubject'] = '(bê mijar)';
+$labels['showimages'] = 'Xuyakirina wêneyan';
+$labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'Deqa tazî';
+$labels['addcc'] = 'Cc Têxê';
+$labels['addbcc'] = 'Bcc Têxê';
+$labels['addreplyto'] = 'Bibersivîne têxê';
+$labels['mdnrequest'] = 'Şandyara/ê vê peyamê xwest dema ku te peyam vekir, jê re hişyarî here. Dixwazî jê re hişyarî here?';
+$labels['receiptread'] = 'Rapora Vegerînê (xwendî)';
+$labels['yourmessage'] = 'Ev rapora vegerîna peyama te ye';
+$labels['receiptnote'] = 'Nîşe: Ev dide zanîn ka peyama te şand hat xwendin an na. Naveroka peyamê bi mîgogerî nayê zanîn.';
+$labels['name'] = 'Navê xuya dibe';
+$labels['firstname'] = 'Nav';
+$labels['surname'] = 'PaÅŸnav';
+$labels['email'] = 'E-Peyam';
+$labels['addcontact'] = 'Têkiliyeke nû têxê';
+$labels['editcontact'] = 'Têkiliyê serast bike';
+$labels['edit'] = 'Serast bike';
+$labels['cancel'] = 'Betal';
+$labels['save'] = 'Tomar bike';
+$labels['delete'] = 'Jê Bibe';
+$labels['newcontact'] = 'kardeke nû a têkiliyê biafirîne';
+$labels['deletecontact'] = 'Têkiliyên hilbijartî jê bibe';
+$labels['composeto'] = 'Ji têkiliya hilbijartî re peyam bişîne';
+$labels['contactsfromto'] = 'Têkiliyên $count ên di navbera $from - $to de';
+$labels['print'] = 'çap bike';
+$labels['export'] = 'Derxe';
+$labels['previouspage'] = 'Seta berê nîşan bide';
+$labels['firstpage'] = 'Seta yekemîn nîşan bide';
+$labels['nextpage'] = 'Seta di rêzê de nîşan bide';
+$labels['lastpage'] = 'Seta dawî nîşan bide';
+$labels['groups'] = 'Kom';
+$labels['personaladrbook'] = 'Navnîşanên Takekesî';
+$labels['settingsfor'] = 'Mîheng ji bo';
+$labels['preferences'] = 'Vebijêrk';
+$labels['userpreferences'] = 'Vebijêrkên bikarhêner';
+$labels['editpreferences'] = 'Vebijêrkên bikarhêner serast bike';
+$labels['identities'] = 'Nasname';
+$labels['manageidentities'] = 'Nasnameyên vê hesabê serast bike';
+$labels['newidentity'] = 'Nasnameya nû';
+$labels['newitem'] = 'Parçeya nû';
+$labels['edititem'] = 'Parçeyê serast bike';
+$labels['setdefault'] = 'Wekî standard tomar bike';
+$labels['language'] = 'Ziman';
+$labels['timezone'] = 'Herêma demê';
+$labels['pagesize'] = 'Hejmara peyamên her rûpelekê';
+$labels['signature'] = 'Åžanenav';
+$labels['dstactive'] = 'Demjimêra havînî';
+$labels['htmleditor'] = 'Peyameke HTML biafirîne';
+$labels['htmlsignature'] = 'Åžanenava HTML';
+$labels['previewpane'] = 'Panela berê nîşan bide';
+$labels['autosavedraft'] = 'Xweber hilîne';
+$labels['everynminutes'] = 'her $n çirke';
+$labels['never'] = 'qet';
+$labels['folder'] = 'Peldank';
+$labels['folders'] = 'Peldank';
+$labels['foldername'] = 'Navê peldankê';
+$labels['subscribed'] = 'Ni ÅŸanenav';
+$labels['messagecount'] = 'Peyam';
+$labels['create'] = 'Biafirîne';
+$labels['createfolder'] = 'Peldankeke nû biafirîne';
+$labels['rename'] = 'Nav biguherîne';
+$labels['renamefolder'] = 'Navê peldankê biguherîne';
+$labels['deletefolder'] = 'Peldankê jê bibe';
+$labels['managefolders'] = 'Rêveberiya peldankan';
+$labels['sortby'] = 'Şêweyê rêzkirinê';
+$labels['sortasc'] = 'Wekî zêde dibe';
+$labels['sortdesc'] = 'Wekî kêm dibe';
+
+?>
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
new file mode 100644
index 000000000..fe1ca3260
--- /dev/null
+++ b/program/localization/ku/messages.inc
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/ku/messages.inc |
+ | |
+ | Language file of the RoundCube Webmail client |
+ | Copyright (C) 2006, RoundQube Dev. - Switzerland |
+ | Licensed under the GNU GPL |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Amed çeko Jiyan <amedcj@kurdistan.name> |
+ +-----------------------------------------------------------------------+
+
+*/
+
+$messages = array();
+$messages['loginfailed'] = 'Têketin têk çû';
+$messages['cookiesdisabled'] = 'Geroka te destûrê nade çerezan';
+$messages['sessionerror'] = 'Danişîna te çewt e an jî bi dawî bûye';
+$messages['imaperror'] = 'Girêdana pêşkêşkara IMAP têk çû';
+$messages['nomessagesfound'] = 'Di vê peyamdankê de tu peyam nehat dîtin';
+$messages['loggedout'] = 'Te danişînî bi dawî anî. Oxir be!';
+$messages['mailboxempty'] = 'Peyamdank vala ye';
+$messages['loading'] = 'Tê barkirin...';
+$messages['loadingdata'] = 'Dane tên barkirin...';
+$messages['checkingmail'] = 'Li peyamên nû vedinihêre...';
+$messages['sendingmessage'] = 'Peyamê dişîne...';
+$messages['messagesent'] = 'Peyam hate ÅŸandin';
+$messages['savingmessage'] = 'Peyam tê hilanîn...';
+$messages['messagesaved'] = 'Peyam di Hilanînî de hat hilanîn';
+$messages['successfullysaved'] = 'Hat hilanîn';
+$messages['addedsuccessfully'] = 'Têkilî li navnîşanan hat zêdekirin';
+$messages['contactexists'] = 'Têkiliyeke bi vê navnîşanê jixwe heye';
+$messages['blockedimages'] = 'Ji bo ewlekariya te wêneyên cuda yên vê peyamê hatin astenkirin.';
+$messages['encryptedmessage'] = 'Ev peyamenek şîfrekirî ye, bibore, nayê vekirin!';
+$messages['nocontactsfound'] = 'Tu têkiliyek nehat dîtin';
+$messages['contactnotfound'] = 'Têkiliya dihat xwestin nehat dîtin';
+$messages['sendingfailed'] = 'Peyam nehat ÅŸandin';
+$messages['errorsaving'] = 'Di tomarkirinê de çewtiyek derket';
+$messages['errormoving'] = 'Ciyê peyamê nehat guherandin';
+$messages['errordeleting'] = 'Peyam nehat jêbirin';
+$messages['deletecontactconfirm'] = 'Ji dil dixwazî têkiliya/ên nîşankirî jê bibî?';
+$messages['deletemessagesconfirm'] = 'Ji dil dixwazî peya/ên nîşankirî jê bibî?';
+$messages['deletefolderconfirm'] = 'Ji dil dixwazî vê peldankê jê bibî?';
+$messages['purgefolderconfirm'] = 'Ji dil dixwazî hemû peyamên di vê peldankê de jê bibî?';
+$messages['formincomplete'] = 'Form bi temamî nehat tijekirin';
+$messages['noemailwarning'] = 'Tika ye, navnîşaneke rast têkevê';
+$messages['nonamewarning'] = 'Tika ye, navekî têkevê';
+$messages['nopagesizewarning'] = 'Tika ye, mezinahiyeke pelê têkevê';
+$messages['norecipientwarning'] = 'Tika ye, herî kêm standyarekê têkevê';
+$messages['nosubjectwarning'] = 'Qada "Mijar"ê vala ye. Dixwazî niha tiştekî lê binivîsî?';
+$messages['nobodywarning'] = 'Peyamê bê nivîs bişeyînî?';
+$messages['notsentwarning'] = 'Peyam nehat şandin. Dixwazî peyamê pişTgo bikî?';
+$messages['noldapserver'] = 'Tika ye, ji bo lêgerînê pêşkêşkareke Idap têkevê';
+$messages['nocontactsreturned'] = 'Tu têkilî nehat dîtin';
+$messages['nosearchname'] = 'Tika ye, nav an jî navnîşaneke têkiliyê têkevê';
+$messages['searchsuccessful'] = '$nr peyam hat(in) dîtin';
+$messages['searchnomatch'] = 'Di lêgerînê de tu tişt nehat dîtin';
+$messages['searching'] = 'Digere...';
+$messages['checking'] = 'Vedinihêre...';
+$messages['nospellerrors'] = 'Tu şaşiyeke rastnivîsê nehat dîtin';
+$messages['folderdeleted'] = 'Peldank hat jêbirin';
+$messages['deletedsuccessfully'] = 'Hat jêbirin';
+$messages['converting'] = 'Formatkirin ji peyamê tê birin...';
+$messages['messageopenerror'] = 'Peyam ji pêşkêşkar nehat barkirin';
+$messages['fileuploaderror'] = 'Barkirina pelê têk çû';
+$messages['filesizeerror'] = 'Pel pir mezin e. Herî zêde divê $size be';
+$messages['copysuccess'] = '$nr navnîşan hat(in) jibergirtin';
+$messages['copyerror'] = 'Tu navnîşan nehat jibergirtin';
+$messages['sourceisreadonly'] = 'Çavkaniya vê navnîşanê tenê-xwendin e';
+$messages['errorsavingcontact'] = 'Navnîşana têkiliyê nehat barkirin';
+$messages['movingmessage'] = 'Ciyê peyamê tê guhertin...';
+$messages['receiptsent'] = 'Rapora şandina serkeftî';
+$messages['errorsendingreceipt'] = 'Rapor nehat ÅŸandin';
+$messages['nodeletelastidentity'] = 'Nikarî vê nasnameyê jê bibî. Ew ya dawî ye.';
+$messages['addsubfolderhint'] = 'Ev peldank wê wekî binepeldanka ya heyî bê afirandin';
+
+?>
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index b7fe8c07b..d5be822f7 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -22,7 +22,7 @@ $labels['welcome'] = 'Welkom bij $product';
$labels['username'] = 'Gebruikersnaam';
$labels['password'] = 'Wachtwoord';
$labels['server'] = 'Server';
-$labels['login'] = 'Login';
+$labels['login'] = 'Inloggen';
$labels['logout'] = 'Uitloggen';
$labels['mail'] = 'E-Mail';
$labels['settings'] = 'Persoonlijke Instellingen';
@@ -35,7 +35,7 @@ $labels['junk'] = 'SPAM';
$labels['subject'] = 'Onderwerp';
$labels['from'] = 'Afzender';
$labels['to'] = 'Ontvanger';
-$labels['cc'] = 'kopie';
+$labels['cc'] = 'Kopie';
$labels['bcc'] = 'Bcc';
$labels['replyto'] = 'Antwoord-aan';
$labels['date'] = 'Datum';
@@ -106,7 +106,7 @@ $labels['compose'] = 'Maak een bericht';
$labels['savemessage'] = 'Bewaar als concept';
$labels['sendmessage'] = 'Verstuur het bericht nu';
$labels['addattachment'] = 'Voeg een bijlage toe';
-$labels['charset'] = 'karakterset';
+$labels['charset'] = 'Karakterset';
$labels['editortype'] = 'Opmaak';
$labels['returnreceipt'] = 'Ontvangstbevestiging';
$labels['checkspelling'] = 'Controleer spelling';
diff --git a/program/localization/pl/labels.inc b/program/localization/pl/labels.inc
index fae0f5367..bcc2e561e 100644
--- a/program/localization/pl/labels.inc
+++ b/program/localization/pl/labels.inc
@@ -131,8 +131,8 @@ $labels['plaintoggle'] = 'Zwykły tekst';
$labels['addcc'] = 'Dodaj Cc';
$labels['addbcc'] = 'Dodaj Bcc';
$labels['addreplyto'] = 'Dodaj Reply-To';
-$labels['mdnrequest'] = 'Nadawca poprosił o potwierdzenie przeczytania tej wiadomości. Czy chcesz go powiadomić?';
-$labels['receiptread'] = 'Potwierdzenie odbioru';
+$labels['mdnrequest'] = 'Nadawca zażądał potwierdzenia przeczytania tej wiadomości. Czy chcesz go powiadomić?';
+$labels['receiptread'] = 'Potwierdzenie otrzymania';
$labels['yourmessage'] = 'To jest potwierdzenie dostarczenia Twojej wiadomości';
$labels['receiptnote'] = 'Uwaga: To potwierdzenie dostarczenia wiadomości oznacza tylko, że wiadomość została wyświetlona na komputerze adresata. Nie ma żadnej gwarancji, że odbiorca przeczytał czy też zrozumiał treść wiadomości.';
$labels['name'] = 'Nazwa';
diff --git a/program/localization/pl/messages.inc b/program/localization/pl/messages.inc
index 3834e82af..6b2ab9682 100644
--- a/program/localization/pl/messages.inc
+++ b/program/localization/pl/messages.inc
@@ -52,8 +52,8 @@ $messages['deletemessagesconfirm'] = 'Czy na pewno chcesz usunąć wybrane wiado
$messages['deletefolderconfirm'] = 'Czy na pewno chcesz usunąć wybrany folder?';
$messages['purgefolderconfirm'] = 'Czy na pewno chcesz usunąć wszystkie wiadomości w tym folderze?';
$messages['formincomplete'] = 'Uzupełnij formularz!';
-$messages['noemailwarning'] = 'Wpisz poprawny adres e-mail!';
-$messages['nonamewarning'] = 'Podaj imiÄ™!';
+$messages['noemailwarning'] = 'Podaj poprawny adres e-mail!';
+$messages['nonamewarning'] = 'Podaj nazwÄ™!';
$messages['nopagesizewarning'] = 'Podaj poprawną wartość!';
$messages['norecipientwarning'] = 'Podaj co najmniej jednego odbiorcÄ™!';
$messages['nosubjectwarning'] = 'Nie podano tematu wiadomości. Czy chcesz go teraz uzupełnić?';
diff --git a/program/localization/se/labels.inc b/program/localization/se/labels.inc
index 47cf768b1..b8152d659 100644
--- a/program/localization/se/labels.inc
+++ b/program/localization/se/labels.inc
@@ -136,7 +136,7 @@ $labels['receiptnote'] = 'Notera: Det här kvittot berättar bara att meddelande
$labels['name'] = 'Visa namn';
$labels['firstname'] = 'Förnamn';
$labels['surname'] = 'Efternamn';
-$labels['email'] = 'Meddelande';
+$labels['email'] = 'E-post';
$labels['addcontact'] = 'Lägg till ny kontakt';
$labels['editcontact'] = 'Redigera kontakt';
$labels['edit'] = 'Redigera';
@@ -191,4 +191,4 @@ $labels['sortby'] = 'Sortera på';
$labels['sortasc'] = 'Sortera stigande';
$labels['sortdesc'] = 'Sortera fallande';
-?> \ No newline at end of file
+?>
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index da1682ec8..6abadd8fc 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -30,8 +30,8 @@ $labels['addressbook'] = '通讯录';
$labels['inbox'] = '收件箱';
$labels['drafts'] = 'è‰ç¨¿ç®±';
$labels['sent'] = 'å·²å‘é€é‚®ä»¶';
-$labels['trash'] = '垃圾邮件';
-$labels['junk'] = '回收箱';
+$labels['trash'] = '回收站';
+$labels['junk'] = '垃圾邮件';
$labels['subject'] = '主题';
$labels['from'] = 'å‘件人';
$labels['to'] = '收件人';
@@ -99,8 +99,8 @@ $labels['unlimited'] = 'æ— é™åˆ¶';
$labels['quicksearch'] = '快速查找';
$labels['resetsearch'] = 'é‡æ–°æŸ¥æ‰¾';
$labels['compose'] = '写新邮件';
-$labels['sendmessage'] = 'ç«‹å³å‘é€';
$labels['savemessage'] = '暂存至è‰ç¨¿ç®±';
+$labels['sendmessage'] = 'ç«‹å³å‘é€';
$labels['addattachment'] = '添加附件';
$labels['charset'] = '字符集';
$labels['editortype'] = '编辑器类型';
@@ -154,7 +154,7 @@ $labels['edititem'] = '修改æ¡ç›®';
$labels['setdefault'] = '默认值';
$labels['language'] = '语言';
$labels['timezone'] = '时区';
-$labels['pagesize'] = '第页邮件数é‡';
+$labels['pagesize'] = 'æ¯é¡µé‚®ä»¶æ•°é‡';
$labels['signature'] = 'ç­¾å';
$labels['dstactive'] = 'å¤ä»¤æ—¶';
$labels['htmleditor'] = '使用HTML编辑器';
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index cf885b071..0450d4000 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -73,5 +73,10 @@ $messages['copysuccess'] = 'æˆåŠŸå¤åˆ¶ $nr 个地å€';
$messages['copyerror'] = '无法å¤åˆ¶åœ°å€';
$messages['sourceisreadonly'] = 'æºåœ°å€ä¸ºåªè¯»';
$messages['errorsavingcontact'] = '无法ä¿å­˜è”系人的地å€';
+$messages['movingmessage'] = '移动邮件到...';
+$messages['receiptsent'] = 'æˆåŠŸå‘é€äº†ä¸€ä¸ªå·²è¯»å›žæ‰§';
+$messages['errorsendingreceipt'] = '无法å‘é€å›žæ‰§';
+$messages['nodeletelastidentity'] = '无法删除这个身份,这是最åŽä¸€ä¸ªã€‚';
+$messages['addsubfolderhint'] = '文件夹将被作为所选中文件夹的å­ç›®å½•';
?>
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 71d2197d8..fd3743e2a 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -90,7 +90,11 @@ if (!empty($msg_uid))
// similar as in program/steps/mail/show.inc
$MESSAGE = array('UID' => $msg_uid);
$MESSAGE['headers'] = &$IMAP->get_headers($msg_uid);
- $MESSAGE['structure'] = &$IMAP->get_structure($msg_uid);
+ $MESSAGE['structure'] = &$IMAP->get_structure($msg_uid);
+
+ if (!empty($MESSAGE['headers']->charset))
+ $IMAP->set_charset($MESSAGE['headers']->charset);
+
$MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject);
$MESSAGE['parts'] = $IMAP->get_mime_numbers($MESSAGE['structure']);
@@ -889,7 +893,7 @@ if ($result = $CONTACTS->list_records())
{
while ($sql_arr = $result->iterate())
if ($sql_arr['email'])
- $a_contacts[] = format_email_recipient($sql_arr['email'], JQ($sql_arr['name']));
+ $a_contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
}
if (isset($CONFIG['ldap_public']))
{
@@ -914,7 +918,7 @@ if (isset($CONFIG['ldap_public']))
$email = $results->records[$i]['email'];
$name = $results->records[$i]['name'];
- $a_contacts[] = format_email_recipient($email, JQ($name));
+ $a_contacts[] = format_email_recipient($email, $name);
}
}
$LDAP->close();
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index b1ce4bd4e..79e0248c3 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -695,10 +695,10 @@ function rcmail_print_body($part, $safe=FALSE, $plain=FALSE)
$quotation = '';
$q = 0;
- if (preg_match('/^(>+\s*)/', $line, $regs))
+ if (preg_match('/^(>+\s*)+/', $line, $regs))
{
- $q = strlen(preg_replace('/\s/', '', $regs[1]));
- $line = substr($line, strlen($regs[1]));
+ $q = strlen(preg_replace('/\s/', '', $regs[0]));
+ $line = substr($line, strlen($regs[0]));
if ($q > $quote_level)
$quotation = str_repeat('<blockquote>', $q - $quote_level);
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 21b5b4308..ddd3ea897 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -212,12 +212,16 @@ if (!empty($_POST['_receipt']))
// additional headers
$headers['Message-ID'] = $message_id;
$headers['X-Sender'] = $from;
-$headers['Received'] = wordwrap('from ' .
- (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
- gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR'].'] via ' : '') .
- gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR'].'] with ' .
- $_SERVER['SERVER_PROTOCOL'].' ('.$_SERVER['REQUEST_METHOD'].'); ' . date('r'),
- 69, rcmail_header_delm() . "\t");
+
+if ($CONFIG['http_received_header'])
+{
+ $nldlm = rcmail_header_delm() . "\t";
+ $headers['Received'] = wordwrap('from ' . (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
+ gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR'].']'.$nldlm.' via ' : '') .
+ gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR'].']'.$nldlm.'with ' .
+ $_SERVER['SERVER_PROTOCOL'].' ('.$_SERVER['REQUEST_METHOD'].'); ' . date('r'),
+ 69, $nldlm);
+}
if (!empty($CONFIG['useragent']))
$headers['User-Agent'] = $CONFIG['useragent'];
@@ -245,6 +249,11 @@ if ($isHtml)
// add a plain text version of the e-mail as an alternative part.
$h2t = new html2text($message_body);
$plainTextPart = wordwrap($h2t->get_text(), 998, "\r\n", true);
+ if (!strlen($plainTextPart))
+ {
+ // empty message body breaks attachment handling in drafts
+ $plainTextPart = "\r\n";
+ }
$MAIL_MIME->setTXTBody(html_entity_decode($plainTextPart, ENT_COMPAT, 'utf-8'));
// look for "emoticon" images from TinyMCE and copy into message as attachments
@@ -254,6 +263,11 @@ else
{
$message_body = wordwrap($message_body, 75, "\r\n");
$message_body = wordwrap($message_body, 998, "\r\n", true);
+ if (!strlen($message_body))
+ {
+ // empty message body breaks attachment handling in drafts
+ $message_body = "\r\n";
+ }
$MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
}
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 5cd5e8360..27d26603f 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -30,6 +30,10 @@ if ($_GET['_uid'])
$MESSAGE = array('UID' => get_input_value('_uid', RCUBE_INPUT_GET));
$MESSAGE['headers'] = $IMAP->get_headers($MESSAGE['UID']);
+ // set message charset as default
+ if (!empty($MESSAGE['headers']->charset))
+ $IMAP->set_charset($MESSAGE['headers']->charset);
+
// go back to list if message not found (wrong UID)
if (!$MESSAGE['headers'])
{
diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index c88b165b6..7c32b89ca 100644
--- a/program/steps/mail/viewsource.inc
+++ b/program/steps/mail/viewsource.inc
@@ -5,7 +5,7 @@
| program/steps/mail/viewsource.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -22,19 +22,21 @@
// similar code as in program/steps/mail/get.inc
if ($uid = get_input_value('_uid', RCUBE_INPUT_GET))
- {
- header('Content-Type: text/plain');
- //@ob_end_clean();
+{
+ $headers = $IMAP->get_headers($uid);
+ $charset = $headers->charset ? $headers->charset : $IMAP->default_charset;
+ header("Content-Type: text/plain; charset={$charset}");
$IMAP->print_raw_body($uid);
- }
+}
else
- {
- raise_error(array('code' => 500,
- 'type' => 'php',
- 'message' => 'Message UID '.$uid.' not found'),
- TRUE,
- TRUE);
- }
+{
+ raise_error(array(
+ 'code' => 500,
+ 'type' => 'php',
+ 'message' => 'Message UID '.$uid.' not found'),
+ true,
+ true);
+}
exit;
?>
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index a0666cd9d..befc1d7a0 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -67,14 +67,16 @@ function rcmail_user_prefs_form($attrib)
$select_timezone = new select(array('name' => '_timezone', 'id' => $field_id));
$select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11');
$select_timezone->add('(GMT -10:00) Hawaii', '-10');
+ $select_timezone->add('(GMT -9:30) Marquesas Islands', '-9.5');
$select_timezone->add('(GMT -9:00) Alaska', '-9');
$select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8');
$select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7');
$select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6');
$select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
- $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz', '-4');
- $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
+ $select_timezone->add('(GMT -4:30) Caracas', '-4.5');
+ $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), La Paz', '-4');
$select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5');
+ $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
$select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
$select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
$select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
@@ -88,13 +90,18 @@ function rcmail_user_prefs_form($attrib)
$select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5');
$select_timezone->add('(GMT +5:45) Kathmandu', '5.75');
$select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
+ $select_timezone->add('(GMT +6:30) Cocos Islands, Myanmar', '6.5');
$select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
$select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
+ $select_timezone->add('(GMT +8:45) Caiguna, Eucla, Border Village', '8.75');
$select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
$select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5');
$select_timezone->add('(GMT +10:00) EAST/AEST: Sydney, Guam, Vladivostok', '10');
+ $select_timezone->add('(GMT +10:30) New South Wales', '10.5');
$select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
+ $select_timezone->add('(GMT +11:30) Norfolk Island', '11.5');
$select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
+ $select_timezone->add('(GMT +12:45) Chatham Islands', '12.75');
$select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13');
$select_timezone->add('(GMT +14:00) Kiribati', '14');
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 9caff5c85..9cf188a41 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -28,8 +28,8 @@ $OUTPUT->include_script('list.js');
// subscribe to one or more mailboxes
if ($_action=='subscribe')
{
- if ($mboxes = get_input_value('_mboxes', RCUBE_INPUT_POST))
- $IMAP->subscribe($mboxes);
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))
+ $IMAP->subscribe(array($mbox));
if ($OUTPUT->ajax_call)
$OUTPUT->remote_response('// subscribed');
@@ -38,8 +38,8 @@ if ($_action=='subscribe')
// unsubscribe one or more mailboxes
else if ($_action=='unsubscribe')
{
- if ($mboxes = get_input_value('_mboxes', RCUBE_INPUT_POST))
- $IMAP->unsubscribe($mboxes);
+ if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))
+ $IMAP->unsubscribe(array($mbox));
if ($OUTPUT->ajax_call)
$OUTPUT->remote_response('// unsubscribed');