From af3c045ecf4865361981f4c9aa392dfe1f93ac90 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 03 Dec 2010 05:58:40 -0500
Subject: [PATCH] - New Folder Manager UI - Fix invalid Request when creating a folder (#1487443) - Add folder size and quota indicator in folder manager (#1485780) - Add possibility to move a subfolder into root folder (#1486791)
---
program/localization/bg_BG/labels.inc | 4
program/localization/cy_GB/labels.inc | 4
program/localization/fr_FR/labels.inc | 4
program/include/main.inc | 68 +
program/localization/hy_AM/labels.inc | 4
program/localization/de_CH/messages.inc | 3
skins/default/mail.css | 19
skins/default/templates/folderedit.html | 24
program/localization/it_IT/labels.inc | 4
program/localization/ko_KR/messages.inc | 3
program/localization/ca_ES/labels.inc | 4
program/localization/sr_CS/messages.inc | 1
program/localization/el_GR/messages.inc | 3
program/localization/es_AR/messages.inc | 3
program/localization/ka_GE/labels.inc | 4
program/localization/is_IS/labels.inc | 4
program/localization/ast/messages.inc | 3
program/localization/da_DK/labels.inc | 4
program/localization/ja_JP/labels.inc | 4
program/localization/eu_ES/messages.inc | 1
program/localization/cs_CZ/labels.inc | 4
program/localization/fa/labels.inc | 4
program/localization/kh_KH/messages.inc | 3
program/localization/de_DE/messages.inc | 3
program/localization/nb_NO/messages.inc | 3
program/localization/az_AZ/labels.inc | 4
program/localization/pt_BR/messages.inc | 3
program/localization/nl_NL/labels.inc | 4
program/localization/sv_SE/messages.inc | 3
program/localization/es_AR/labels.inc | 4
program/localization/lt_LT/labels.inc | 4
program/localization/ka_GE/messages.inc | 3
skins/default/templates/folders.html | 62 +
program/localization/nb_NO/labels.inc | 4
program/localization/en_US/messages.inc | 12
program/localization/sk_SK/messages.inc | 3
program/js/app.js | 299 ++-----
program/localization/pt_PT/messages.inc | 3
program/localization/bn_BD/labels.inc | 4
program/localization/sl_SI/messages.inc | 3
program/localization/fr_FR/messages.inc | 3
program/localization/nl_BE/labels.inc | 4
program/localization/ko_KR/labels.inc | 4
program/localization/id_ID/messages.inc | 3
program/localization/az_AZ/messages.inc | 3
program/localization/nn_NO/messages.inc | 3
program/localization/sk_SK/labels.inc | 4
program/localization/ta_IN/labels.inc | 4
program/localization/ro_RO/labels.inc | 4
program/localization/es_ES/labels.inc | 4
skins/default/iehacks.css | 8
program/localization/en_GB/labels.inc | 4
program/localization/ja_JP/messages.inc | 3
program/localization/ps/labels.inc | 4
program/localization/zh_TW/messages.inc | 3
program/localization/cy_GB/messages.inc | 3
program/localization/ne_NP/labels.inc | 4
program/localization/ms_MY/labels.inc | 4
program/localization/cs_CZ/messages.inc | 3
program/localization/fa/messages.inc | 3
program/localization/ga_IE/labels.inc | 4
program/localization/ku/messages.inc | 1
program/localization/mr_IN/messages.inc | 3
program/localization/ru_RU/labels.inc | 4
program/localization/nn_NO/labels.inc | 4
program/localization/ca_ES/messages.inc | 3
program/localization/et_EE/messages.inc | 3
program/localization/en_GB/messages.inc | 3
program/localization/br/labels.inc | 4
program/localization/gl_ES/messages.inc | 3
program/localization/lt_LT/messages.inc | 3
program/steps/settings/folders.inc | 370 ++++++++++
program/localization/mr_IN/labels.inc | 4
program/localization/he_IL/messages.inc | 3
program/localization/ro_RO/messages.inc | 3
program/localization/gl_ES/labels.inc | 4
program/localization/uk_UA/labels.inc | 4
program/localization/eu_ES/labels.inc | 4
program/localization/hu_HU/messages.inc | 3
program/localization/et_EE/labels.inc | 4
program/localization/pt_PT/labels.inc | 4
program/localization/bg_BG/messages.inc | 3
program/localization/pl_PL/messages.inc | 12
program/localization/el_GR/labels.inc | 4
program/localization/hy_AM/messages.inc | 3
program/localization/ru_RU/messages.inc | 3
program/localization/uk_UA/messages.inc | 3
program/localization/ar_SA/labels.inc | 4
program/localization/hr_HR/labels.inc | 4
program/localization/id_ID/labels.inc | 4
program/localization/de_CH/labels.inc | 4
program/localization/ast/labels.inc | 4
program/localization/mk_MK/labels.inc | 4
program/localization/de_DE/labels.inc | 4
index.php | 17
program/localization/fa_AF/messages.inc | 3
program/localization/si_LK/messages.inc | 1
program/localization/tr_TR/messages.inc | 3
program/localization/pl_PL/labels.inc | 11
program/localization/vi_VN/labels.inc | 4
program/localization/ms_MY/messages.inc | 1
program/localization/sv_SE/labels.inc | 4
CHANGELOG | 4
program/localization/sr_CS/labels.inc | 4
program/localization/he_IL/labels.inc | 4
program/localization/sq_AL/messages.inc | 1
program/localization/zh_CN/messages.inc | 3
program/localization/bn_BD/messages.inc | 3
program/localization/bs_BA/labels.inc | 4
program/localization/sl_SI/labels.inc | 4
program/steps/settings/save_folder.inc | 176 ++++
program/localization/es_ES/messages.inc | 3
program/localization/ku/labels.inc | 4
program/localization/th_TH/labels.inc | 4
program/localization/hi_IN/labels.inc | 4
program/localization/eo/labels.inc | 4
program/localization/sq_AL/labels.inc | 4
skins/default/common.css | 14
program/localization/ps/messages.inc | 3
program/localization/nl_NL/messages.inc | 3
program/localization/nl_BE/messages.inc | 3
program/localization/mk_MK/messages.inc | 3
program/localization/da_DK/messages.inc | 3
program/steps/settings/edit_folder.inc | 294 ++++++++
program/localization/lv_LV/messages.inc | 3
program/localization/pt_BR/labels.inc | 4
program/localization/zh_TW/labels.inc | 4
program/steps/mail/func.inc | 59 -
program/localization/fa_AF/labels.inc | 4
program/localization/it_IT/messages.inc | 3
program/localization/ar_SA/messages.inc | 3
program/localization/ta_IN/messages.inc | 3
program/localization/kh_KH/labels.inc | 4
program/localization/eo/messages.inc | 1
program/localization/fi_FI/messages.inc | 3
program/localization/hr_HR/messages.inc | 3
/dev/null | 41 -
program/localization/fi_FI/labels.inc | 4
program/include/rcube_imap.php | 57 +
program/localization/hu_HU/labels.inc | 4
program/localization/lv_LV/labels.inc | 4
skins/default/settings.css | 112 --
program/localization/si_LK/labels.inc | 4
program/localization/en_US/labels.inc | 11
program/localization/tr_TR/labels.inc | 4
program/localization/zh_CN/labels.inc | 4
146 files changed, 1,222 insertions(+), 879 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index e0947c9..6044c02 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,10 @@
- Fix cursor position on compose form in Webkit browsers (#1486674)
- Fix setting charset of attachment filenames (#1487122)
- Allow setting autocomplete attribute for all inputs separately (#1487313)
+- New Folder Manager UI
+- Fix invalid Request when creating a folder (#1487443)
+- Add folder size and quota indicator in folder manager (#1485780)
+- Add possibility to move a subfolder into root folder (#1486791)
RELEASE 0.5-BETA
----------------
diff --git a/index.php b/index.php
index 6e774f8..47b08ef 100644
--- a/index.php
+++ b/index.php
@@ -218,16 +218,15 @@
'group-addmembers' => 'groups.inc',
'group-delmembers' => 'groups.inc',
),
-
+
'settings' => array(
- 'folders' => 'manage_folders.inc',
- 'create-folder' => 'manage_folders.inc',
- 'rename-folder' => 'manage_folders.inc',
- 'delete-folder' => 'manage_folders.inc',
- 'subscribe' => 'manage_folders.inc',
- 'unsubscribe' => 'manage_folders.inc',
- 'enable-threading' => 'manage_folders.inc',
- 'disable-threading' => 'manage_folders.inc',
+ 'folders' => 'folders.inc',
+ 'rename-folder' => 'folders.inc',
+ 'delete-folder' => 'folders.inc',
+ 'subscribe' => 'folders.inc',
+ 'unsubscribe' => 'folders.inc',
+ 'purge' => 'folders.inc',
+ 'folder-size' => 'folders.inc',
'add-identity' => 'edit_identity.inc',
)
);
diff --git a/program/include/main.inc b/program/include/main.inc
index 7ea4ae2..6d4e19c 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1314,8 +1314,13 @@
$p += array('maxlength' => 100, 'realnames' => false);
$a_mailboxes = array();
-
- foreach ($RCMAIL->imap->list_mailboxes() as $folder)
+
+ if ($p['unsubscribed'])
+ $list = $RCMAIL->imap->list_unsubscribed();
+ else
+ $list = $RCMAIL->imap->list_mailboxes();
+
+ foreach ($list as $folder)
if (empty($p['exceptions']) || !in_array($folder, $p['exceptions']))
rcmail_build_folder_tree($a_mailboxes, $folder, $RCMAIL->imap->get_hierarchy_delimiter());
@@ -1551,6 +1556,65 @@
}
+function rcmail_quota_display($attrib)
+{
+ global $OUTPUT;
+
+ if (!$attrib['id'])
+ $attrib['id'] = 'rcmquotadisplay';
+
+ if(isset($attrib['display']))
+ $_SESSION['quota_display'] = $attrib['display'];
+
+ $OUTPUT->add_gui_object('quotadisplay', $attrib['id']);
+
+ $quota = rcmail_quota_content($attrib);
+
+ $OUTPUT->add_script('$(document).ready(function(){
+ rcmail.set_quota('.json_serialize($quota).')});', 'foot');
+
+ return html::span($attrib, '');
+}
+
+
+function rcmail_quota_content($attrib=NULL)
+{
+ global $RCMAIL;
+
+ $quota = $RCMAIL->imap->get_quota();
+ $quota = $RCMAIL->plugins->exec_hook('quota', $quota);
+
+ $quota_result = (array) $quota;
+ $quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
+
+ if (!$quota['total'] && $RCMAIL->config->get('quota_zero_as_unlimited')) {
+ $quota_result['title'] = rcube_label('unlimited');
+ $quota_result['percent'] = 0;
+ }
+ else if ($quota['total']) {
+ if (!isset($quota['percent']))
+ $quota_result['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100));
+
+ $title = sprintf('%s / %s (%.0f%%)',
+ show_bytes($quota['used'] * 1024), show_bytes($quota['total'] * 1024),
+ $quota_result['percent']);
+
+ $quota_result['title'] = $title;
+
+ if ($attrib['width'])
+ $quota_result['width'] = $attrib['width'];
+ if ($attrib['height'])
+ $quota_result['height'] = $attrib['height'];
+ }
+ else {
+ $quota_result['title'] = rcube_label('unknown');
+ $quota_result['percent'] = 0;
+ }
+
+ return $quota_result;
+}
+
+
/**
* Output HTML editor scripts
*
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 212e886..dd9f81b 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2553,6 +2553,9 @@
$to_mbox = $this->mod_mailbox($to_mbox);
$from_mbox = strlen($from_mbox) ? $this->mod_mailbox($from_mbox) : $this->mailbox;
+ if ($to_mbox === $from_mbox)
+ return false;
+
list($uids, $all_mode) = $this->_parse_uids($uids, $from_mbox);
// exit if no message uids are specified
@@ -3009,6 +3012,26 @@
/**
+ * Get mailbox size (size of all messages in a mailbox)
+ *
+ * @param string $name Mailbox name
+ * @return int Mailbox size in bytes, False on error
+ */
+ function get_mailbox_size($name)
+ {
+ $name = $this->mod_mailbox($name);
+
+ // @TODO: could we try to use QUOTA here?
+ $result = $this->conn->fetchHeaderIndex($name, '1:*', 'SIZE', false);
+
+ if (is_array($result))
+ $result = array_sum($result);
+
+ return $result;
+ }
+
+
+ /**
* Subscribe to a specific mailbox(es)
*
* @param array $a_mboxes Mailbox name(s)
@@ -3043,48 +3066,42 @@
/**
* Create a new mailbox on the server and register it in local cache
*
- * @param string $name New mailbox name (as utf-7 string)
+ * @param string $name New mailbox name
* @param boolean $subscribe True if the new mailbox should be subscribed
- * @param string Name of the created mailbox, false on error
+ * @param boolean True on success
*/
function create_mailbox($name, $subscribe=false)
{
- $result = false;
-
- // reduce mailbox name to 100 chars
- $name = substr($name, 0, 100);
+ $result = false;
$abs_name = $this->mod_mailbox($name);
- $result = $this->conn->createFolder($abs_name);
+ $result = $this->conn->createFolder($abs_name);
// try to subscribe it
if ($result && $subscribe)
$this->subscribe($name);
- return $result ? $name : false;
+ return $result;
}
/**
* Set a new name to an existing mailbox
*
- * @param string $mbox_name Mailbox to rename (as utf-7 string)
- * @param string $new_name New mailbox name (as utf-7 string)
- * @return string Name of the renames mailbox, False on error
+ * @param string $mbox_name Mailbox to rename
+ * @param string $new_name New mailbox name
+ * @return boolean True on success
*/
function rename_mailbox($mbox_name, $new_name)
{
$result = false;
- // encode mailbox name and reduce it to 100 chars
- $name = substr($new_name, 0, 100);
-
// make absolute path
- $mailbox = $this->mod_mailbox($mbox_name);
- $abs_name = $this->mod_mailbox($name);
+ $mailbox = $this->mod_mailbox($mbox_name);
+ $abs_name = $this->mod_mailbox($new_name);
// check if mailbox is subscribed
$a_subscribed = $this->_list_mailboxes();
- $subscribed = in_array($mailbox, $a_subscribed);
+ $subscribed = in_array($mailbox, $a_subscribed);
// unsubscribe folder
if ($subscribed)
@@ -3113,14 +3130,14 @@
if ($result && $subscribed)
$this->conn->subscribe($abs_name);
- return $result ? $name : false;
+ return $result;
}
/**
* Remove mailboxes from server
*
- * @param string|array $mbox_name sMailbox name(s) string/array
+ * @param string|array $mbox_name Mailbox name(s) string/array
* @return boolean True on success
*/
function delete_mailbox($mbox_name)
@@ -3208,7 +3225,7 @@
}
else {
$a_folders = $this->conn->listMailboxes('', $mbox);
- }
+ }
if (is_array($a_folders) && in_array($mbox, $a_folders)) {
$this->icache[$key][] = $mbox;
diff --git a/program/js/app.js b/program/js/app.js
index cc5da4e..b14c665 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -343,8 +343,15 @@
this.enable_command('add', this.env.identities_level < 2);
this.enable_command('save', 'delete', 'edit', 'toggle-editor', true);
}
- else if (this.env.action=='folders')
- this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', 'enable-threading', 'disable-threading', true);
+ else if (this.env.action=='folders') {
+ this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', true);
+ }
+ else if (this.env.action == 'edit-folder' && this.gui_objects.editform) {
+ this.enable_command('save', 'folder-size', true);
+ parent.rcmail.env.messagecount = this.env.messagecount;
+ parent.rcmail.enable_command('purge', this.env.messagecount);
+ $("input[type='text']").first().select();
+ }
if (this.gui_objects.identitieslist) {
this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist, {multiselect:false, draggable:false, keyboard:false});
@@ -1125,7 +1132,7 @@
else if (delay)
window.setTimeout(function(){ rcmail.reload(); }, delay);
else if (window.location)
- location.href = this.env.comm_path;
+ location.href = this.env.comm_path + (this.env.action ? '&_action='+this.env.action : '');
};
// Add variable to GET string, replace old value if exists
@@ -1534,7 +1541,7 @@
if (this.task == 'mail')
allow = (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
else if (this.task == 'settings')
- allow = (id != this.env.folder);
+ allow = (id != this.env.mailbox);
else if (this.task == 'addressbook') {
if (id != this.env.source && this.env.contactfolders[id]) {
if (this.env.contactfolders[id].type == 'group') {
@@ -2735,24 +2742,23 @@
this.expunge_mailbox = function(mbox)
{
- var lock = false;
- var add_url = '';
+ var lock = false,
+ url = '_mbox='+urlencode(mbox);
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
lock = this.set_busy(true, 'loading');
- add_url = '&_reload=1';
+ url += '&_reload=1';
}
// send request to server
- var url = '_mbox='+urlencode(mbox);
- this.http_post('expunge', url+add_url, lock);
+ this.http_post('expunge', url, lock);
};
this.purge_mailbox = function(mbox)
{
- var lock = false;
- var add_url = '';
+ var lock = false,
+ url = '_mbox='+urlencode(mbox);
if (!confirm(this.get_label('purgefolderconfirm')))
return false;
@@ -2760,13 +2766,11 @@
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
lock = this.set_busy(true, 'loading');
- add_url = '&_reload=1';
+ url += '&_reload=1';
}
// send request to server
- var url = '_mbox='+urlencode(mbox);
- this.http_post('purge', url+add_url, lock);
- return true;
+ this.http_post('purge', url, lock);
};
// test if purge command is allowed
@@ -3980,16 +3984,12 @@
this.init_subscription_list = function()
{
var p = this;
- this.subscription_list = new rcube_list_widget(this.gui_objects.subscriptionlist, {multiselect:false, draggable:true, keyboard:false, toggleselect:true});
+ this.subscription_list = new rcube_list_widget(this.gui_objects.subscriptionlist,
+ {multiselect:false, draggable:true, keyboard:false, toggleselect:true});
this.subscription_list.addEventListener('select', function(o){ p.subscription_select(o); });
this.subscription_list.addEventListener('dragstart', function(o){ p.drag_active = true; });
this.subscription_list.addEventListener('dragend', function(o){ p.subscription_move_folder(o); });
this.subscription_list.row_init = function (row) {
- var anchors = row.obj.getElementsByTagName('a');
- if (anchors[0])
- anchors[0].onclick = function() { p.command('rename-folder', row.id); return false; };
- if (anchors[1])
- anchors[1].onclick = function() { p.command('delete-folder', row.id); return false; };
row.obj.onmouseover = function() { p.focus_subscription(row.id); };
row.obj.onmouseout = function() { p.unfocus_subscription(row.id); };
};
@@ -4066,18 +4066,18 @@
delim = RegExp.escape(this.env.delimiter),
reg = RegExp('['+delim+']?[^'+delim+']+$');
- if (this.drag_active && this.env.folder && (row = document.getElementById(id)))
+ if (this.drag_active && this.env.mailbox && (row = document.getElementById(id)))
if (this.env.subscriptionrows[id] &&
(folder = this.env.subscriptionrows[id][0])) {
if (this.check_droptarget(folder) &&
- !this.env.subscriptionrows[this.get_folder_row_id(this.env.folder)][2] &&
- (folder != this.env.folder.replace(reg, '')) &&
- (!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter))))) {
+ !this.env.subscriptionrows[this.get_folder_row_id(this.env.mailbox)][2] &&
+ (folder != this.env.mailbox.replace(reg, '')) &&
+ (!folder.match(new RegExp('^'+RegExp.escape(this.env.mailbox+this.env.delimiter))))) {
this.set_env('dstfolder', folder);
$(row).addClass('droptarget');
}
}
- else if (this.env.folder.match(new RegExp(delim))) {
+ else if (this.env.mailbox.match(new RegExp(delim))) {
this.set_env('dstfolder', this.env.delimiter);
$(this.subscription_list.frame).addClass('droptarget');
}
@@ -4097,15 +4097,19 @@
this.subscription_select = function(list)
{
var id, folder;
- if ((id = list.get_single_selection()) &&
- this.env.subscriptionrows['rcmrow'+id] &&
- (folder = this.env.subscriptionrows['rcmrow'+id][0]))
- this.set_env('folder', folder);
- else
- this.set_env('folder', null);
- if (this.gui_objects.createfolderhint)
- $(this.gui_objects.createfolderhint).html(this.env.folder ? this.get_label('addsubfolderhint') : '');
+ if (list && (id = list.get_single_selection()) &&
+ (folder = this.env.subscriptionrows['rcmrow'+id])
+ ) {
+ this.set_env('mailbox', folder[0]);
+ this.show_folder(folder[0]);
+ this.enable_command('delete-folder', !folder[2]);
+ }
+ else {
+ this.env.mailbox = null;
+ this.show_contentframe(false);
+ this.enable_command('delete-folder', 'purge', false);
+ }
};
this.subscription_move_folder = function(list)
@@ -4113,129 +4117,35 @@
var delim = RegExp.escape(this.env.delimiter),
reg = RegExp('['+delim+']?[^'+delim+']+$');
- if (this.env.folder && this.env.dstfolder && (this.env.dstfolder != this.env.folder) &&
- (this.env.dstfolder != this.env.folder.replace(reg, ''))) {
- var reg = new RegExp('[^'+delim+']*['+delim+']', 'g');
- var basename = this.env.folder.replace(reg, '');
- var newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
+ if (this.env.mailbox && this.env.dstfolder && (this.env.dstfolder != this.env.mailbox) &&
+ (this.env.dstfolder != this.env.mailbox.replace(reg, ''))
+ ) {
+ reg = new RegExp('[^'+delim+']*['+delim+']', 'g');
+ var lock = this.set_busy(true, 'foldermoving'),
+ basename = this.env.mailbox.replace(reg, ''),
+ newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
- var lock = this.set_busy(true, 'foldermoving');
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname), lock);
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.mailbox)+'&_folder_newname='+urlencode(newname), lock);
}
this.drag_active = false;
this.unfocus_subscription(this.get_folder_row_id(this.env.dstfolder));
};
// tell server to create and subscribe a new mailbox
- this.create_folder = function(name)
+ this.create_folder = function()
{
- if (this.edit_folder)
- this.reset_folder_rename();
-
- var form;
- if ((form = this.gui_objects.editform) && form.elements['_folder_name']) {
- name = form.elements['_folder_name'].value;
-
- if (name.indexOf(this.env.delimiter)>=0) {
- alert(this.get_label('forbiddencharacter')+' ('+this.env.delimiter+')');
- return false;
- }
-
- if (this.env.folder && name != '')
- name = this.env.folder+this.env.delimiter+name;
-
- var lock = this.set_busy(true, 'foldercreating');
- this.http_post('create-folder', '_name='+urlencode(name), lock);
- }
- else if (form.elements['_folder_name'])
- form.elements['_folder_name'].focus();
- };
-
- // start renaming the mailbox name.
- // this will replace the name string with an input field
- this.rename_folder = function(id)
- {
- var temp, row, form;
-
- // reset current renaming
- if (temp = this.edit_folder) {
- this.reset_folder_rename();
- if (temp == id)
- return;
- }
-
- if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id))) {
- var delim = RegExp.escape(this.env.delimiter),
- reg = new RegExp('.*['+delim+']');
-
- this.name_input = document.createElement('input');
- this.name_input.type = 'text';
- this.name_input.value = this.env.subscriptionrows[id][0].replace(reg, '');
-
- reg = new RegExp('['+delim+']?[^'+delim+']+$');
- this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
- this.name_input.onkeydown = function(e){ rcmail.name_input_keydown(e); };
-
- row.cells[0].replaceChild(this.name_input, row.cells[0].firstChild);
- this.edit_folder = id;
- this.name_input.select();
-
- if (form = this.gui_objects.editform)
- form.onsubmit = function(){ return false; };
- }
- };
-
- // remove the input field and write the current mailbox name to the table cell
- this.reset_folder_rename = function()
- {
- var cell = this.name_input ? this.name_input.parentNode : null;
-
- if (cell && this.edit_folder && this.env.subscriptionrows[this.edit_folder])
- $(cell).html(this.env.subscriptionrows[this.edit_folder][1]);
-
- this.edit_folder = null;
- };
-
- // handler for keyboard events on the input field
- this.name_input_keydown = function(e)
- {
- var key = rcube_event.get_keycode(e);
-
- // enter
- if (key==13) {
- var newname = this.name_input ? this.name_input.value : null;
- if (this.edit_folder && newname) {
- if (newname.indexOf(this.env.delimiter)>=0) {
- alert(this.get_label('forbiddencharacter')+' ('+this.env.delimiter+')');
- return false;
- }
-
- if (this.name_input.__parent)
- newname = this.name_input.__parent + this.env.delimiter + newname;
-
- var lock = this.set_busy(true, 'folderrenaming');
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname), lock);
- }
- }
- // escape
- else if (key==27)
- this.reset_folder_rename();
+ this.show_folder('', this.env.mailbox);
};
// delete a specific mailbox with all its messages
- this.delete_folder = function(id)
+ this.delete_folder = function(name)
{
- var folder = this.env.subscriptionrows[id][0];
-
- if (this.edit_folder)
- this.reset_folder_rename();
+ var id = this.get_folder_row_id(name ? name : this.env.mailbox),
+ folder = this.env.subscriptionrows[id][0];
if (folder && confirm(this.get_label('deletefolderconfirm'))) {
var lock = this.set_busy(true, 'folderdeleting');
- this.http_post('delete-folder', '_mboxes='+urlencode(folder), lock);
- this.set_env('folder', null);
-
- $(this.gui_objects.createfolderhint).html('');
+ this.http_post('delete-folder', '_mbox='+urlencode(folder), lock);
}
};
@@ -4292,18 +4202,8 @@
// set messages count to zero
row.cells[1].innerHTML = '*';
- // update subscription/threading checkboxes
+ // update subscription checkbox
$('input[name="_subscribed[]"]', row).val(name).attr('checked', true);
- $('input[name="_threaded[]"]', row).val(name).attr('checked', false);
-
- var elem;
- // add new folder to rename-folder list and clear input field
- if (form = this.gui_objects.editform) {
- if (elem = form.elements['_folder_oldname'])
- elem.options[elem.options.length] = new Option(name, name);
- if (elem = form.elements['_folder_name'])
- elem.value = '';
- }
}
this.init_subscription_list();
@@ -4317,72 +4217,37 @@
// replace an existing table row with a new folder line
this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
{
- var form, elm,
- id = this.get_folder_row_id(oldfolder),
+ var id = this.get_folder_row_id(oldfolder),
row = document.getElementById(id);
// replace an existing table row (if found)
this.add_folder_row(newfolder, display_name, row, before);
-
- // rename folder in rename-folder dropdown
- if ((form = this.gui_objects.editform) && (elm = form.elements['_folder_oldname'])) {
- for (var i=0; i<elm.options.length; i++) {
- if (elm.options[i].value == oldfolder) {
- elm.options[i].text = display_name;
- elm.options[i].value = newfolder;
- break;
- }
- }
-
- form.elements['_folder_newname'].value = '';
- }
};
// remove the table row of a specific mailbox from the table
// (the row will not be removed, just hidden)
this.remove_folder_row = function(folder)
{
- var form, elm, row, id = this.get_folder_row_id(folder);
+ var row, id = this.get_folder_row_id(folder);
if (id && (row = document.getElementById(id)))
row.style.display = 'none';
-
- // remove folder from rename-folder list
- if ((form = this.gui_objects.editform) && (elm = form.elements['_folder_oldname'])) {
- for (var i=0; i<elm.options.length; i++) {
- if (elm.options[i].value == folder) {
- elm.options[i] = null;
- break;
- }
- }
- }
-
- if (form && (elm = form.elements['_folder_newname']))
- elm.value = '';
};
this.subscribe = function(folder)
{
- if (folder)
- this.http_post('subscribe', '_mbox='+urlencode(folder));
+ if (folder) {
+ var lock = this.display_message('foldersubscribing', 'loading');
+ this.http_post('subscribe', '_mbox='+urlencode(folder), lock);
+ }
};
this.unsubscribe = function(folder)
{
- if (folder)
- this.http_post('unsubscribe', '_mbox='+urlencode(folder));
- };
-
- this.enable_threading = function(folder)
- {
- if (folder)
- this.http_post('enable-threading', '_mbox='+urlencode(folder));
- };
-
- this.disable_threading = function(folder)
- {
- if (folder)
- this.http_post('disable-threading', '_mbox='+urlencode(folder));
+ if (folder) {
+ var lock = this.display_message('folderunsubscribing', 'loading');
+ this.http_post('unsubscribe', '_mbox='+urlencode(folder), lock);
+ }
};
// helper method to find a specific mailbox row ID
@@ -4401,7 +4266,7 @@
var cell, td,
new_row = document.createElement('tr');
- for(var n=0; n<row.cells.length; n++) {
+ for (var n=0; n<row.cells.length; n++) {
cell = row.cells[n];
td = document.createElement('td');
@@ -4417,6 +4282,42 @@
return new_row;
};
+ // when user select a folder in manager
+ this.show_folder = function(folder, path, force)
+ {
+ var target = window,
+ url = '&_action=edit-folder&_mbox='+urlencode(folder);
+
+ if (path)
+ url += '&_path='+urlencode(path);
+
+ if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
+ target = window.frames[this.env.contentframe];
+ url += '&_framed=1';
+ }
+
+ if (String(target.location.href).indexOf(url) >= 0 && !force) {
+ this.show_contentframe(true);
+ }
+ else {
+ if (!this.env.frame_lock) {
+ (parent.rcmail ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
+ }
+ target.location.href = this.env.comm_path+url;
+ }
+ };
+
+ this.folder_size = function(folder)
+ {
+ var lock = this.set_busy(true, 'loading');
+ this.http_post('folder-size', '_mbox='+urlencode(folder), lock);
+ };
+
+ this.folder_size_update = function(size)
+ {
+ $('#folder-size').replaceWith(size);
+ };
+
/*********************************************************/
/********* GUI functionality *********/
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index f54bb52..04b36ea 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -308,13 +308,9 @@
$labels['folder'] = 'مجلد';
$labels['folders'] = 'مجلدات';
$labels['foldername'] = 'اسم المجلد';
-$labels['subscribed'] = 'مشترك';
$labels['messagecount'] = 'الرسائل';
$labels['create'] = 'أنشئ';
$labels['createfolder'] = 'أنشئ مجلد جديد';
-$labels['rename'] = 'إعادة التسمية';
-$labels['renamefolder'] = 'إعادة تسمية المجلد';
-$labels['deletefolder'] = 'احذف المجلد';
$labels['managefolders'] = 'إدارة المجلدات';
$labels['specialfolders'] = 'المجلّدات المُميّزة';
$labels['sortby'] = 'ترتيب بحسب';
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index d9b9a90..25c5f42 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -54,9 +54,7 @@
$messages['deletemessagesconfirm'] = 'هل تريد حذف الرسائل المحددة؟';
$messages['deletefolderconfirm'] = 'هل تريد حقاً حذف هذا المجلد؟';
$messages['purgefolderconfirm'] = 'هل تريد حقاً حذف جميع الرسائل في هذا المجلد؟';
-$messages['foldercreating'] = 'جاري إنشاء المجلد...';
$messages['folderdeleting'] = 'جاري حذف المجلد...';
-$messages['folderrenaming'] = 'جاري إعادة تسمية المجلد...';
$messages['foldermoving'] = 'جاري نقل المجلد...';
$messages['formincomplete'] = 'لم يتم تعبئة بيانات الاستمارة بالكامل';
$messages['noemailwarning'] = 'الرجاء إدخال عنوان بريد إلكتروني صالح';
@@ -91,7 +89,6 @@
$messages['receiptsent'] = 'أرسل إيصال الاستلام بنجاح';
$messages['errorsendingreceipt'] = 'تعذر إرسال إيصال الاستلام';
$messages['nodeletelastidentity'] = 'لا يمكن حذف هذا السجل حيث أنه الوحيد المتبقي.';
-$messages['addsubfolderhint'] = 'سيتم إنشاء هذا المجلد كمجلد فرعي للمحدد.';
$messages['forbiddencharacter'] = 'اسم المجلّد يحتوي حروفاً ممنوعة';
$messages['selectimportfile'] = 'رجاء اختر ملفاً لرفعه';
$messages['addresswriterror'] = 'دفتر العناوين المحدد غير قابل للكتابة';
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index 752d643..d136603 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -261,13 +261,9 @@
$labels['folder'] = 'Bandexa';
$labels['folders'] = 'Bandexes';
$labels['foldername'] = 'Nome de bandexa';
-$labels['subscribed'] = 'Soscrita';
$labels['messagecount'] = 'Mensaxes';
$labels['create'] = 'Facer';
$labels['createfolder'] = 'Facer una bandexa nueva';
-$labels['rename'] = 'Renomar';
-$labels['renamefolder'] = 'Renomar bandexa';
-$labels['deletefolder'] = 'Desaniciar bandexa';
$labels['managefolders'] = 'Alministrar bandexes';
$labels['specialfolders'] = 'Bandexes especiales';
$labels['sortby'] = 'Ordenar por';
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index c292ccf..cbc4276 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -54,9 +54,7 @@
$messages['deletemessagesconfirm'] = '¿Tas seguru de desaniciar los mensaxes que marcaste?';
$messages['deletefolderconfirm'] = '¿Tas seguru de desaniciar esta bandexa?';
$messages['purgefolderconfirm'] = '¿Tas seguru de desaniciar tolos mensaxes d\'esta bandexa?';
-$messages['foldercreating'] = 'Faciendo la bandexa...';
$messages['folderdeleting'] = 'Desaniciando la bandexa...';
-$messages['folderrenaming'] = 'Renomando la bandexa...';
$messages['foldermoving'] = 'Moviendo la bandexa...';
$messages['formincomplete'] = 'Tienes de rellenar tolos campos del formulariu';
$messages['noemailwarning'] = 'Por favor, dame un corréu válidu';
@@ -89,7 +87,6 @@
$messages['receiptsent'] = 'Unviose correchamente l\'avisu de llectura.';
$messages['errorsendingreceipt'] = 'Nun fui a unviar l\'avisu de llectura.';
$messages['nodeletelastidentity'] = 'Nun puedo desaniciar esa identidá porque ye la última.';
-$messages['addsubfolderhint'] = 'Esta bandexa va ser subandexa de la que ta marcada';
$messages['forbiddencharacter'] = 'El nome de la bandexa tien un caráuter que nun val';
$messages['selectimportfile'] = 'Por favor escueye el ficheru que quies xubir';
$messages['addresswriterror'] = 'Nun puedo escribir nel llibru de direiciones qu\'escoyisti';
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 4e7d9d4..7128a02 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -306,13 +306,9 @@
$labels['folder'] = 'Qovluq';
$labels['folders'] = 'Qovluqlar';
$labels['foldername'] = 'Qovluq adı';
-$labels['subscribed'] = 'İmzalanıb';
$labels['messagecount'] = 'Məktublar';
$labels['create'] = 'Yarad';
$labels['createfolder'] = 'Yeni qovluq yarad';
-$labels['rename'] = 'Adını dəyiş';
-$labels['renamefolder'] = 'Qovluğun adını dəyiş';
-$labels['deletefolder'] = 'Qovluğu sil';
$labels['managefolders'] = 'Qovluqlarla iş';
$labels['specialfolders'] = 'Xüsusi qovluqlar';
$labels['sortby'] = 'Çeşidlə';
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index ef5ca5d..dcef7c5 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -52,9 +52,7 @@
$messages['deletemessagesconfirm'] = 'Seçilən məktubu (məktubları) silməyə əminsiniz?';
$messages['deletefolderconfirm'] = 'Bu qovluğu silməyə əminsiniz?';
$messages['purgefolderconfirm'] = 'Bu qovluqdakı bütün məktubları silməyə əminsiniz?';
-$messages['foldercreating'] = 'Qovluğun yaradılır...';
$messages['folderdeleting'] = 'Qovluğ silinir...';
-$messages['folderrenaming'] = 'Qovluğun adə dəyişir...';
$messages['foldermoving'] = 'Qovluq köçürülür...';
$messages['formincomplete'] = 'Bütün sətrlər doldurulmayıb';
$messages['noemailwarning'] = 'Lütfən, düzgün e-poçt ünvanı daxil edin';
@@ -89,7 +87,6 @@
$messages['receiptsent'] = 'Oxunulma haqda bildiriş göndərildi';
$messages['errorsendingreceipt'] = 'Oxunulma haqda bildiriş göndərilmədi';
$messages['nodeletelastidentity'] = 'Siz bu kimliyi silə bilməzsiniz. Bu axırıncıdır. ';
-$messages['addsubfolderhint'] = 'Bu qovluq hazırki qovluqda alt qovluq olaraq yaradıldı';
$messages['forbiddencharacter'] = 'Qovlu adı qadağan olunmuş simvollar təşkil edir';
$messages['selectimportfile'] = 'Yüklənilən faylı seçin';
$messages['addresswriterror'] = 'Seçilmiş ünvan kitabçası yaddaşa yazıla bilməz';
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index e380d2f..81c106e 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -326,13 +326,9 @@
$labels['folder'] = 'Папка';
$labels['folders'] = 'Папки';
$labels['foldername'] = 'Име на папката';
-$labels['subscribed'] = 'Използвай';
$labels['messagecount'] = 'Писма';
$labels['create'] = 'Създай';
$labels['createfolder'] = 'Направи нова папка';
-$labels['rename'] = 'Преименувай';
-$labels['renamefolder'] = 'Преименувай папката';
-$labels['deletefolder'] = 'Изтрий';
$labels['managefolders'] = 'Настройки на папките';
$labels['specialfolders'] = 'Служебни папки';
$labels['sortby'] = 'Сортирай по';
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index 187d0de..c5bc90f 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -56,9 +56,7 @@
$messages['deletemessagesconfirm'] = 'Искате ли да изтриете маркираните съобщения?';
$messages['deletefolderconfirm'] = 'Искате ли да изтриете тази папка?';
$messages['purgefolderconfirm'] = 'Искате ли да изтриете всички писма в тази папка?';
-$messages['foldercreating'] = 'Създаване на папка...';
$messages['folderdeleting'] = 'Изтриване на папка...';
-$messages['folderrenaming'] = 'Преименуване на папка...';
$messages['foldermoving'] = 'Преместване на папка...';
$messages['formincomplete'] = 'Не сте попълнили всички полета';
$messages['noemailwarning'] = 'Моля, въведете валиден e-mail адрес';
@@ -95,7 +93,6 @@
$messages['receiptsent'] = 'Обратната разписка е изпратена.';
$messages['errorsendingreceipt'] = 'Грешка при изпращането на обратна разписка.';
$messages['nodeletelastidentity'] = 'Не можете да изтриете тази самоличност, трябва да имате поне една.';
-$messages['addsubfolderhint'] = 'Тази папка ще бъде създадена като подпапка на текущо избраната';
$messages['forbiddencharacter'] = 'Името на папката съдържа непозволени символи';
$messages['selectimportfile'] = 'Моля изберете файл за качване';
$messages['addresswriterror'] = 'Избраната адресна книга не може да бъде записвана';
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index 3917eec..f783d80 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -243,13 +243,9 @@
$labels['folder'] = 'ফোল্ডার/মেইলবক্স';
$labels['folders'] = 'ফোল্ডার/মেইলবক্স';
$labels['foldername'] = 'ফোল্ডার/মেইলবক্স এর নাম';
-$labels['subscribed'] = 'গ্রহনকারি(Subscribed) ';
$labels['messagecount'] = 'মেইল/চিঠি';
$labels['create'] = 'প্রস্তুত করুন';
$labels['createfolder'] = 'নতুন ফোল্ডার / মেইলবক্স প্রস্তুত করুন';
-$labels['rename'] = 'নাম বদলান';
-$labels['renamefolder'] = 'ফোল্ডার/মেইলবক্স এর নাম বদলান';
-$labels['deletefolder'] = 'ফোল্ডার/মেইলবক্স ফেলে দিন';
$labels['managefolders'] = 'ফোল্ডার/মেইলবক্স গুলো কে গুছান';
$labels['specialfolders'] = 'বিশেষ ফোল্ডার/মেইলবক্স';
$labels['sortby'] = 'সাজান';
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index 1026969..6383242 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -46,9 +46,7 @@
$messages['deletemessagesconfirm'] = 'আপনি কি আসলেই এই চিঠি(গুলো) ফেলো দিতে চান?';
$messages['deletefolderconfirm'] = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স ফেলো দিতে চান?';
$messages['purgefolderconfirm'] = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স এর সব চিঠি ফেলো দিতে চান?';
-$messages['foldercreating'] = 'ফোল্ডার/মেইলবক্স প্রস্তুত করা হচ্ছে';
$messages['folderdeleting'] = 'ফোল্ডার/মেইলবক্স ফেলে দেওয়া হচ্ছে';
-$messages['folderrenaming'] = 'ফোল্ডার/মেইলবক্স এর নাম বদলানো হচ্ছে';
$messages['foldermoving'] = 'ফোল্ডার/মেইলবক্স সরানো হচ্ছে';
$messages['formincomplete'] = 'আপনি সবগুলো জিনিষ লেখেননি';
$messages['noemailwarning'] = 'একটি সঠিক ই-মেইল লিখুন';
@@ -81,7 +79,6 @@
$messages['receiptsent'] = 'ঠিকঠাক মতো ফিরতি রশিদ পাঠানো হয়েছে';
$messages['errorsendingreceipt'] = 'রশিদ পাঠানো গেলোনা';
$messages['nodeletelastidentity'] = 'আপনি এই পরিচিতি ফেলতে পারবেন না কারন এইটায় বর্তমানে আপনার একমাত্র পরিচিতি। ';
-$messages['addsubfolderhint'] = 'এই ফোল্ডারটি বর্তমান ফোল্ডার এর সাব-ফোল্ডার হিসাবে তৈরি হবে';
$messages['forbiddencharacter'] = 'ফোল্ডার এর নামের মধ্যে নিষিদ্ধ অক্ষর আছে';
$messages['selectimportfile'] = 'একটা ফাইল বেছে নিন তোলার জন্য';
$messages['addresswriterror'] = 'বেছে নেওয়া ঠিকানার বইটিতে লেখাযায় না';
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index f80ed34..bd95df5 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -168,12 +168,8 @@
$labels['folder'] = 'Renkell';
$labels['folders'] = 'Renkelloù';
$labels['foldername'] = 'Anv ar renkell';
-$labels['subscribed'] = 'Koumananer';
$labels['create'] = 'Krouiñ';
$labels['createfolder'] = 'Krouiñ ur renkell nevez';
-$labels['rename'] = 'Adanviñ';
-$labels['renamefolder'] = 'Adanviñ ar renkell';
-$labels['deletefolder'] = 'Dilemel ar renkell';
$labels['managefolders'] = 'Aozañ ar renkelloù';
$labels['sortby'] = 'Rummañ dre';
$labels['sortasc'] = 'Rumm diagentad';
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index 6d2ae5d..a0e5d72 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -218,12 +218,8 @@
$labels['folder'] = 'Fascikla';
$labels['folders'] = 'Fascikle';
$labels['foldername'] = 'Ime fascikle';
-$labels['subscribed'] = 'Pretplaćen';
$labels['create'] = 'Napravi';
$labels['createfolder'] = 'Napravi novu fasciklu';
-$labels['rename'] = 'Preimenuj';
-$labels['renamefolder'] = 'Preimenuj fasciklu';
-$labels['deletefolder'] = 'Obriši fasciklu';
$labels['managefolders'] = 'Podesi fasciklu';
$labels['sortby'] = 'Sortiraj po';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 3022887..cda48e7 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -313,13 +313,9 @@
$labels['folder'] = 'Carpeta';
$labels['folders'] = 'Carpetes';
$labels['foldername'] = 'Nom de carpeta';
-$labels['subscribed'] = 'Subscriure\'s';
$labels['messagecount'] = 'Missatges';
$labels['create'] = 'Crea';
$labels['createfolder'] = 'Crea nova carpeta';
-$labels['rename'] = 'Canvia el nom';
-$labels['renamefolder'] = 'Canvia el nom de la carpeta';
-$labels['deletefolder'] = 'Suprimeix carpeta';
$labels['managefolders'] = 'Gestiona carpetes';
$labels['specialfolders'] = 'Carpetes Especials';
$labels['sortby'] = 'Ordena per';
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index aa50657..bea1269 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -56,9 +56,7 @@
$messages['deletemessagesconfirm'] = 'Esteu segurs de voler suprimir el(s) missatge(s) selecionat(s)?';
$messages['deletefolderconfirm'] = 'Esteu segurs de voler suprimir aquesta carpeta?';
$messages['purgefolderconfirm'] = 'Esteu segurs de voler suprimir tots els missatges d\'aquesta carpeta?';
-$messages['foldercreating'] = 'Creant la carpeta...';
$messages['folderdeleting'] = 'Suprimint la carpeta...';
-$messages['folderrenaming'] = 'Reanomenant la carpeta...';
$messages['foldermoving'] = 'Movent la carpeta...';
$messages['formincomplete'] = 'El formulari no ha sigut emplenat totalment';
$messages['noemailwarning'] = 'Introduïu una adreça d\'e-mail vàlida';
@@ -93,7 +91,6 @@
$messages['receiptsent'] = 'Confirmació de lectura enviada satisfactòriament';
$messages['errorsendingreceipt'] = 'No es pot enviar la confirmació';
$messages['nodeletelastidentity'] = 'No podeu suprimir aquesta identitat, és l\'última.';
-$messages['addsubfolderhint'] = 'Aquesta carpeta serà creada com a subcarpeta de la seleccionada actualment';
$messages['forbiddencharacter'] = 'El nom de carpeta conté un caràcter prohibit';
$messages['selectimportfile'] = 'Si us plau, seleccioneu un fitxer per pujar';
$messages['addresswriterror'] = 'La llibreta d\'adreces seleccionada no és modificable';
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index e0363c4..9434609 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -315,13 +315,9 @@
$labels['folder'] = 'Složka';
$labels['folders'] = 'Složky';
$labels['foldername'] = 'Jméno složky';
-$labels['subscribed'] = 'Vybráno';
$labels['messagecount'] = 'Počet zpráv';
$labels['create'] = 'Vytvořit';
$labels['createfolder'] = 'Vytvořit novou složku';
-$labels['rename'] = 'Přejmenovat';
-$labels['renamefolder'] = 'Přejmenovat složku';
-$labels['deletefolder'] = 'Smazat složku';
$labels['managefolders'] = 'Spravovat složky';
$labels['specialfolders'] = 'Speciální složky';
$labels['sortby'] = 'Seřadit podle';
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index b8f53af..6569ddc 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -58,9 +58,7 @@
$messages['deletemessagesconfirm'] = 'Opravdu chcete smazat označené zprávy?';
$messages['deletefolderconfirm'] = 'Chcete opravdu smazat tento adresář?';
$messages['purgefolderconfirm'] = 'Opravdu chcete smazat všechny zprávy v této složce?';
-$messages['foldercreating'] = 'Vytvářím složku...';
$messages['folderdeleting'] = 'Odstraňuji složku...';
-$messages['folderrenaming'] = 'Přejmenovávám složku...';
$messages['foldermoving'] = 'Přesouvám složku...';
$messages['formincomplete'] = 'Formulář nebyl korektně vyplněn';
$messages['noemailwarning'] = 'Zadejte, prosím, platnou e-mailovou adresu';
@@ -97,7 +95,6 @@
$messages['receiptsent'] = 'Potvrzení o přřijetí zprávy odesláno';
$messages['errorsendingreceipt'] = 'Potvrzení o přijetí zprávy nebylo možné odeslat';
$messages['nodeletelastidentity'] = 'Alespoň jedna identita musí být ponechána. Identitu nelze odstranit.';
-$messages['addsubfolderhint'] = 'Tato složka bude vytvořena jako podsložka aktuálně zvolené složky';
$messages['forbiddencharacter'] = 'Název složky obsahuje zakázaný znak';
$messages['selectimportfile'] = 'Prosím vyberte soubor k nahrání';
$messages['addresswriterror'] = 'Vybraný seznam kontaktů není zapisovatelný';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index d504673..1dbf88d 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -323,13 +323,9 @@
$labels['folder'] = 'Ffolder';
$labels['folders'] = 'Ffolderi';
$labels['foldername'] = 'Enw ffolder';
-$labels['subscribed'] = 'Tanysgrifwyd';
$labels['messagecount'] = 'Negeseuon';
$labels['create'] = 'Creu';
$labels['createfolder'] = 'Creu ffolder newydd';
-$labels['rename'] = 'Ailenwi';
-$labels['renamefolder'] = 'Ailenwi ffolder';
-$labels['deletefolder'] = 'Dileu ffolder';
$labels['managefolders'] = 'Rheoli ffolderi';
$labels['specialfolders'] = 'Ffolderi arbennig';
$labels['sortby'] = 'Trefnu yn ôl';
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 9445eb4..fe51544 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -52,9 +52,7 @@
$messages['deletemessagesconfirm'] = 'Ydych chi wir am ddileu y neges(euon) ddewiswyd?';
$messages['deletefolderconfirm'] = 'Ydych chi wir am ddileu y ffolder yma?';
$messages['purgefolderconfirm'] = 'Ydych chi wir am ddileu yr holl negeseuon yn y ffolder yma?';
-$messages['foldercreating'] = 'Yn creu ffolder...';
$messages['folderdeleting'] = 'Yn dileu ffolder...';
-$messages['folderrenaming'] = 'Yn ailenwi ffolder...';
$messages['foldermoving'] = 'Yn symud ffolder...';
$messages['formincomplete'] = 'Nid oedd y ffurflen wedi ei gwblhau yn llawn';
$messages['noemailwarning'] = 'Rhowch gyfeiriad e-bost dilys';
@@ -91,7 +89,6 @@
$messages['receiptsent'] = 'Danfonwyd cadarnhad derbyn yn llwyddiannus';
$messages['errorsendingreceipt'] = 'Methwyd danfon cadarnhad derbyn';
$messages['nodeletelastidentity'] = 'Allwch chi ddim dileu\'r personoliaeth yma, hwn yw\'r un olaf.';
-$messages['addsubfolderhint'] = 'Mi fydd y ffolder yma\'n cael ei greu fel is-ffolder o\'r un sydd wedi ei ddewis ar hyn o bryd';
$messages['forbiddencharacter'] = 'Mae enw\'r ffolder yn cynnwys llythyren annerbynniol';
$messages['selectimportfile'] = 'Dewiswch ffeil i\'w lwytho fyny';
$messages['addresswriterror'] = 'Nid yw\'n bosib ysgrifennu i\'r llyfr cyfeiriadau ';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 6d45c04..69790e2 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -305,13 +305,9 @@
$labels['folder'] = 'Mappe';
$labels['folders'] = 'Mapper';
$labels['foldername'] = 'Mappenavn';
-$labels['subscribed'] = 'Abonneret';
$labels['messagecount'] = 'Beskeder';
$labels['create'] = 'Opret';
$labels['createfolder'] = 'Opret ny mappe';
-$labels['rename'] = 'Omdøb';
-$labels['renamefolder'] = 'Omdøb mappe';
-$labels['deletefolder'] = 'Slet mappe';
$labels['managefolders'] = 'Administrér mapper';
$labels['specialfolders'] = 'Specielle mapper';
$labels['sortby'] = 'Sortér efter';
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index e66099c..74d70b7 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Vil du virkelig slette den/de valgte besked(er)?';
$messages['deletefolderconfirm'] = 'Vil du virkelig slette den valgte mappe';
$messages['purgefolderconfirm'] = 'Vil du virkelig slette alle beskeder i denne mappe?';
-$messages['foldercreating'] = 'Opretter mappen...';
$messages['folderdeleting'] = 'Sletter mappen...';
-$messages['folderrenaming'] = 'Omdøber mappen...';
$messages['foldermoving'] = 'Flytter mappen...';
$messages['formincomplete'] = 'Formularen var ikke fuldstændig fyldt ud';
$messages['noemailwarning'] = 'Indtast venligst en gyldig e-mail adresse';
@@ -92,7 +90,6 @@
$messages['receiptsent'] = 'Kvittering for læsning er sendt';
$messages['errorsendingreceipt'] = 'Kvitteringen kunne ikke sendes';
$messages['nodeletelastidentity'] = 'Du kan ikke slette denne identitet, da det er den eneste der er tilbage.';
-$messages['addsubfolderhint'] = 'Denne mappe vil blive oprettet som en undermappe til den mappe der er valgt i øjeblikket.';
$messages['forbiddencharacter'] = 'Mappe-navnet indeholder ugyldige tegn';
$messages['selectimportfile'] = 'Vælg venligst den fil der skal uploades';
$messages['addresswriterror'] = 'Der kan ikke skrives i den valgte adressebog';
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 5c2bc6d..12b17c3 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -326,13 +326,9 @@
$labels['folder'] = 'Ordner';
$labels['folders'] = 'Ordner';
$labels['foldername'] = 'Ordnername';
-$labels['subscribed'] = 'Abonniert';
$labels['messagecount'] = 'Nachrichten';
$labels['create'] = 'Erstellen';
$labels['createfolder'] = 'Neuen Ordner erstellen';
-$labels['rename'] = 'Umbenennen';
-$labels['renamefolder'] = 'Ordner umbenennen';
-$labels['deletefolder'] = 'Ordner löschen';
$labels['managefolders'] = 'Ordner verwalten';
$labels['specialfolders'] = 'Spezialordner';
$labels['sortby'] = 'Sortieren nach';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 56f3a45..c1adbd3 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
$messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?';
$messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
-$messages['foldercreating'] = 'Erstelle Ordner...';
$messages['folderdeleting'] = 'Lösche Ordner...';
-$messages['folderrenaming'] = 'Nenne Ordner um...';
$messages['foldermoving'] = 'Verschiebe Ordner...';
$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt';
$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
@@ -94,7 +92,6 @@
$messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet';
$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden';
$messages['nodeletelastidentity'] = 'Diese Identität kann nicht gelöscht werden, da dies die letzte ist.';
-$messages['addsubfolderhint'] = 'Wird als Unterordner des aktuell selektierten Ordners erstellt';
$messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen';
$messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus';
$messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 791c323..c5d5c50 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -326,13 +326,9 @@
$labels['folder'] = 'Ordner';
$labels['folders'] = 'Ordner';
$labels['foldername'] = 'Ordnername';
-$labels['subscribed'] = 'Abonniert';
$labels['messagecount'] = 'Nachrichten';
$labels['create'] = 'Erstellen';
$labels['createfolder'] = 'Neuen Ordner erstellen';
-$labels['rename'] = 'Umbenennen';
-$labels['renamefolder'] = 'Ordner umbenennen';
-$labels['deletefolder'] = 'Ordner löschen';
$labels['managefolders'] = 'Ordner verwalten';
$labels['specialfolders'] = 'Spezialordner';
$labels['sortby'] = 'Sortieren nach';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 7f563a7..eed9b50 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
$messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?';
$messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
-$messages['foldercreating'] = 'Erstelle Ordner...';
$messages['folderdeleting'] = 'Lösche Ordner...';
-$messages['folderrenaming'] = 'Nenne Ordner um...';
$messages['foldermoving'] = 'Verschiebe Ordner...';
$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt';
$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
@@ -94,7 +92,6 @@
$messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet';
$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden';
$messages['nodeletelastidentity'] = 'Diese Identität kann nicht gelöscht werden, da dies die letzte ist.';
-$messages['addsubfolderhint'] = 'Wird als Unterordner des aktuell selektierten Ordners erstellt';
$messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen';
$messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus';
$messages['addresswriterror'] = 'Das ausgewählte Adressbuch kann nicht verändert werden';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index 5303a08..f013d48 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -234,13 +234,9 @@
$labels['folder'] = 'Φάκελος';
$labels['folders'] = 'Φάκελοι';
$labels['foldername'] = 'Όνομα φακέλου';
-$labels['subscribed'] = 'Εγγραφή';
$labels['messagecount'] = 'Μηνύματα';
$labels['create'] = 'Δημιουργία';
$labels['createfolder'] = 'Δημιουργία νέου φακέλου';
-$labels['rename'] = 'Μετονομασία';
-$labels['renamefolder'] = 'Μετονομασία φακέλου';
-$labels['deletefolder'] = 'Διαγραφή φακέλου';
$labels['managefolders'] = 'Διαχείριση φακέλων';
$labels['specialfolders'] = 'Ειδικοί Φάκελοι';
$labels['sortby'] = 'Ταξινόμηση κατά';
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index de617ce..0e781ad 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -52,9 +52,7 @@
$messages['deletemessagesconfirm'] = 'Θέλετε να διαγράψετε το συγκεκριμένο μήνυμα/τα;';
$messages['deletefolderconfirm'] = 'Θέλετε να διαγράψετε το συγκεκριμένο φάκελο;';
$messages['purgefolderconfirm'] = 'Θέλετε να διαγράψετε όλα τα μηνύματα στο συγκεκριμένο φάκελο;';
-$messages['foldercreating'] = 'Δημιουργία φακέλου';
$messages['folderdeleting'] = 'Διαγραφή φακέλου';
-$messages['folderrenaming'] = 'Μετονομασία φακέλου';
$messages['foldermoving'] = 'Μεταφορά φακέλου';
$messages['formincomplete'] = 'Η φόρμα δεν έχει συμπληρωθεί πλήρως';
$messages['noemailwarning'] = 'Παρακαλώ εισάγετε έγκυρη διεύθυνση email';
@@ -88,7 +86,6 @@
$messages['receiptsent'] = 'Επιτυχής αποστολή αναφοράς ανάγνωσης';
$messages['errorsendingreceipt'] = 'Αποστολή αναφοράς απέτυχε';
$messages['nodeletelastidentity'] = 'Δε μπορείτε να διαγράψετε αυτήν την ταυτότητα, είναι η τελευταία.';
-$messages['addsubfolderhint'] = 'Αυτός ο φάκελος θα δημιουργηθεί ως υποφάκελος του επιλεγμένου';
$messages['forbiddencharacter'] = 'Η ονομασία φακέλου περιέχει μη επιτρεπτό χαρακτήρα';
$messages['selectimportfile'] = 'Επιλέξτε αρχείο για ανέβασμα';
$messages['addresswriterror'] = 'Η επιλεγμένη ατζέντα διευθύνσεων δεν είνα εγγράψιμη';
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 07ad87f..cd61ed6 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -326,13 +326,9 @@
$labels['folder'] = 'Folder';
$labels['folders'] = 'Folders';
$labels['foldername'] = 'Folder name';
-$labels['subscribed'] = 'Subscribed';
$labels['messagecount'] = 'Messages';
$labels['create'] = 'Create';
$labels['createfolder'] = 'Create new folder';
-$labels['rename'] = 'Rename';
-$labels['renamefolder'] = 'Rename folder';
-$labels['deletefolder'] = 'Delete folder';
$labels['managefolders'] = 'Manage folders';
$labels['specialfolders'] = 'Special Folders';
$labels['sortby'] = 'Sort by';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index b33514d..5c1286e 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?';
$messages['deletefolderconfirm'] = 'Do you really want to delete this folder?';
$messages['purgefolderconfirm'] = 'Do you really want to delete all messages in this folder?';
-$messages['foldercreating'] = 'Creating folder...';
$messages['folderdeleting'] = 'Deleting folder...';
-$messages['folderrenaming'] = 'Renaming folder...';
$messages['foldermoving'] = 'Moving folder...';
$messages['formincomplete'] = 'The form was not completely filled out';
$messages['noemailwarning'] = 'Please enter a valid email address';
@@ -94,7 +92,6 @@
$messages['receiptsent'] = 'Successfully sent a read receipt';
$messages['errorsendingreceipt'] = 'Could not send the receipt';
$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['addsubfolderhint'] = 'This folder will be created as subfolder of the currently selected one';
$messages['forbiddencharacter'] = 'Folder name contains a forbidden character';
$messages['selectimportfile'] = 'Please select a file to upload';
$messages['addresswriterror'] = 'The selected address book is not writeable';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index a212e65..6b759bb 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -383,15 +383,18 @@
$labels['folder'] = 'Folder';
$labels['folders'] = 'Folders';
$labels['foldername'] = 'Folder name';
-$labels['subscribed'] = 'Subscribed';
$labels['messagecount'] = 'Messages';
$labels['create'] = 'Create';
$labels['createfolder'] = 'Create new folder';
-$labels['rename'] = 'Rename';
-$labels['renamefolder'] = 'Rename folder';
-$labels['deletefolder'] = 'Delete folder';
$labels['managefolders'] = 'Manage folders';
$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
$labels['sortby'] = 'Sort by';
$labels['sortasc'] = 'Sort ascending';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index 0f87c05..d47f555 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -55,10 +55,10 @@
$messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?';
$messages['deletefolderconfirm'] = 'Do you really want to delete this folder?';
$messages['purgefolderconfirm'] = 'Do you really want to delete all messages in this folder?';
-$messages['foldercreating'] = 'Creating folder...';
$messages['folderdeleting'] = 'Deleting folder...';
-$messages['folderrenaming'] = 'Renaming folder...';
$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
$messages['formincomplete'] = 'The form was not completely filled out';
$messages['noemailwarning'] = 'Please enter a valid email address';
$messages['nonamewarning'] = 'Please enter a name';
@@ -78,6 +78,9 @@
$messages['checking'] = 'Checking...';
$messages['nospellerrors'] = 'No spelling errors found';
$messages['folderdeleted'] = 'Folder successfully deleted';
+$messages['foldersubscribed'] = 'Folder successfully subscribed';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed';
+$messages['folderpurged'] = 'Folder successfully purged';
$messages['deletedsuccessfully'] = 'Successfully deleted';
$messages['converting'] = 'Removing formatting...';
$messages['messageopenerror'] = 'Could not load message from server';
@@ -94,7 +97,6 @@
$messages['receiptsent'] = 'Successfully sent a read receipt';
$messages['errorsendingreceipt'] = 'Could not send the receipt';
$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['addsubfolderhint'] = 'This folder will be created as subfolder of the currently selected one';
$messages['forbiddencharacter'] = 'Folder name contains a forbidden character';
$messages['selectimportfile'] = 'Please select a file to upload';
$messages['addresswriterror'] = 'The selected address book is not writeable';
@@ -128,5 +130,9 @@
$messages['messagecopied'] = 'Message(s) copied successfully';
$messages['messagemarked'] = 'Message(s) marked successfully';
$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion';
+$messages['namecannotbeempty'] = 'Name cannot be empty';
+$messages['nametoolong'] = 'Name is too long';
+$messages['folderupdated'] = 'Folder updated successfully';
+$messages['foldercreated'] = 'Folder created successfully';
?>
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index df21704..ee3041a 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -216,13 +216,9 @@
$labels['folder'] = 'Dosierujo';
$labels['folders'] = 'Dosierujoj';
$labels['foldername'] = 'Dosierujo-nomo';
-$labels['subscribed'] = 'Abonata';
$labels['messagecount'] = 'Mesaĝoj';
$labels['create'] = 'Kreu';
$labels['createfolder'] = 'Kreu novan dosierujon';
-$labels['rename'] = 'Renomu';
-$labels['renamefolder'] = 'Renomu dosierujon';
-$labels['deletefolder'] = 'Forigu dosierujon';
$labels['managefolders'] = 'Administru dosierujon';
$labels['sortby'] = 'Ordigu per';
$labels['sortasc'] = 'Ordigu kreskante';
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index 956aed0..4aa8522 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -75,7 +75,6 @@
$messages['receiptsent'] = 'Sukcese sendis konfirmon';
$messages['errorsendingreceipt'] = 'Ne povis sendi konfirmon';
$messages['nodeletelastidentity'] = 'Vi ne povas forigi ĉi tiun identon, ĉar ĝi estas la lasta';
-$messages['addsubfolderhint'] = 'Ĉi tiu dosierujo estos farita kiel subdosierujo de la nune elektita dosierujo';
$messages['forbiddencharacter'] = 'Dosierujo-nomo enhavas malpermesitan karaktron';
?>
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index 6c2d16b..8827276 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -297,13 +297,9 @@
$labels['folder'] = 'Carpeta';
$labels['folders'] = 'Carpetas';
$labels['foldername'] = 'Nombre de carpeta';
-$labels['subscribed'] = 'Suscripta';
$labels['messagecount'] = 'Mensajes';
$labels['create'] = 'Crear';
$labels['createfolder'] = 'Crear nueva carpeta';
-$labels['rename'] = 'Renombrar';
-$labels['renamefolder'] = 'Renombrar carpeta';
-$labels['deletefolder'] = 'Eliminar carpeta';
$labels['managefolders'] = 'Administrar carpetas';
$labels['specialfolders'] = 'Carpetas Especiales';
$labels['sortby'] = 'Ordenar por';
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 3843494..3319b60 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -57,9 +57,7 @@
$messages['deletemessagesconfirm'] = '¿Realmente quiere eliminar los mensajes seleccionados?';
$messages['deletefolderconfirm'] = '¿Realmente quiere eliminar esta carpeta?';
$messages['purgefolderconfirm'] = '¿Realmente quiere eliminar todos los mensajes de esta carpeta?';
-$messages['foldercreating'] = 'Creando carpeta...';
$messages['folderdeleting'] = 'Eliminando carpeta...';
-$messages['folderrenaming'] = 'Renombrando carpeta...';
$messages['foldermoving'] = 'Moviendo carpeta...';
$messages['formincomplete'] = 'No se han llenado todos los campos del formulario';
$messages['noemailwarning'] = 'Por favor, introduzca un e-mail válido';
@@ -94,7 +92,6 @@
$messages['receiptsent'] = 'La notificación de lectura se ha enviado con éxito.';
$messages['errorsendingreceipt'] = 'No se ha podido enviar la notificación de lectura.';
$messages['nodeletelastidentity'] = 'No se puede borrar esta identidad puesto que es la última.';
-$messages['addsubfolderhint'] = 'Esta carpeta se creará como una subcarpeta dentro de la carpeta seleccionada';
$messages['forbiddencharacter'] = 'El nombre de la carpeta contiene un carácter prohibido';
$messages['selectimportfile'] = 'Por favor, seleccione el archivo a subir';
$messages['addresswriterror'] = 'La libreta de direcciones seleccionada es de solo-lectura';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index 2d79ed5..da69beb 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -328,13 +328,9 @@
$labels['folder'] = 'Bandeja';
$labels['folders'] = 'Bandejas';
$labels['foldername'] = 'Nombre de bandeja';
-$labels['subscribed'] = 'Suscrita';
$labels['messagecount'] = 'Mensajes';
$labels['create'] = 'Crear';
$labels['createfolder'] = 'Crear nueva bandeja';
-$labels['rename'] = 'Renombrar';
-$labels['renamefolder'] = 'Renombrar bandeja';
-$labels['deletefolder'] = 'Eliminar bandeja';
$labels['managefolders'] = 'Administrar bandejas';
$labels['specialfolders'] = 'Bandejas Especiales';
$labels['sortby'] = 'Ordenar por';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 6749151..24014a7 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -57,9 +57,7 @@
$messages['deletemessagesconfirm'] = '¿Realmente quiere eliminar los mensajes seleccionados?';
$messages['deletefolderconfirm'] = '¿Realmente quiere eliminar esta carpeta?';
$messages['purgefolderconfirm'] = '¿Realmente quiere eliminar todos los mensajes de esta carpeta?';
-$messages['foldercreating'] = 'Creando carpeta...';
$messages['folderdeleting'] = 'Borrando carpeta...';
-$messages['folderrenaming'] = 'Renombrando carpeta...';
$messages['foldermoving'] = 'Moviendo carpeta...';
$messages['formincomplete'] = 'No ha rellenado todos los campos del formulario';
$messages['noemailwarning'] = 'Por favor, introduzca un e-mail válido';
@@ -96,7 +94,6 @@
$messages['receiptsent'] = 'La notificación de lectura se ha enviado con éxito.';
$messages['errorsendingreceipt'] = 'No se ha podido enviar la notificación de lectura.';
$messages['nodeletelastidentity'] = 'No se puede borrar esta identidad puesto que es la última.';
-$messages['addsubfolderhint'] = 'Esta carpeta se creará como una subcarpeta dentro de la carpeta seleccionada';
$messages['forbiddencharacter'] = 'El nombre de la carpeta contiene un carácter prohibido';
$messages['selectimportfile'] = 'Por favor, seleccione un archivo para subir';
$messages['addresswriterror'] = 'No se puede escribir la dirección de contacto seleccionada';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 6f8434f..32749d1 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -328,13 +328,9 @@
$labels['folder'] = 'Kaust';
$labels['folders'] = 'Kaustad';
$labels['foldername'] = 'Kausta nimi';
-$labels['subscribed'] = 'Näitan';
$labels['messagecount'] = 'Kirju';
$labels['create'] = 'Loo';
$labels['createfolder'] = 'Uue kausta loomine';
-$labels['rename'] = 'Nimeta ümber';
-$labels['renamefolder'] = 'Nimeta olemasolev kaust ümber';
-$labels['deletefolder'] = 'Kustuta kaust';
$labels['managefolders'] = 'Halda kaustu';
$labels['specialfolders'] = 'Erilised kaustad';
$labels['sortby'] = 'Järjesta';
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 2a84659..eaebdbf 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -57,9 +57,7 @@
$messages['deletemessagesconfirm'] = 'Soovid valitud kirja(d) kustutada?';
$messages['deletefolderconfirm'] = 'Soovid selle kataloogi kindlasti kustutada?';
$messages['purgefolderconfirm'] = 'Soovid sellest kaustast kõik kirjad kustutada?';
-$messages['foldercreating'] = 'Loon kausta...';
$messages['folderdeleting'] = 'Kustutan kausta...';
-$messages['folderrenaming'] = 'Nimetan kausta ümber...';
$messages['foldermoving'] = 'Liigutan kausta...';
$messages['formincomplete'] = 'Vormi kõik väljad ei ole täidetud';
$messages['noemailwarning'] = 'Palun sisesta toimiv e-posti aadress';
@@ -96,7 +94,6 @@
$messages['receiptsent'] = 'Kättesaamiskinnitus saadetud';
$messages['errorsendingreceipt'] = 'Ei õnnestunud kättesaamiskinnitust saata';
$messages['nodeletelastidentity'] = 'See identiteet on viimane ja seda ei saa kustutada.';
-$messages['addsubfolderhint'] = 'See kataloog luuakse valitud kausta alamkataloogina.';
$messages['forbiddencharacter'] = 'Kausta nimi sisaldab keelatud sümbolit';
$messages['selectimportfile'] = 'Palun vali üleslaadimiseks fail';
$messages['addresswriterror'] = 'Valitud aadressiraamat pole kirjutatav';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 1572ce2..2dcb15f 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -220,13 +220,9 @@
$labels['folder'] = 'Karpeta';
$labels['folders'] = 'Karpetak';
$labels['foldername'] = 'Karpeta izena';
-$labels['subscribed'] = 'Harpideturik';
$labels['messagecount'] = 'Mezuak';
$labels['create'] = 'Sortu';
$labels['createfolder'] = 'Karpeta berria sortu';
-$labels['rename'] = 'Berrizendatu';
-$labels['renamefolder'] = 'Karpeta berrizendatu';
-$labels['deletefolder'] = 'Karpeta ezabatu';
$labels['managefolders'] = 'Karpeta kudeaketa';
$labels['specialfolders'] = 'Karpeta bereziak';
$labels['sortby'] = 'Honela ordenatu';
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index d3787af..df2af02 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -78,7 +78,6 @@
$messages['receiptsent'] = 'Ondo bidalia irakurritako agiria';
$messages['errorsendingreceipt'] = 'Ezin da agiria bidali';
$messages['nodeletelastidentity'] = 'Ezin da izaera hau ezabatu, zure bakarra da';
-$messages['addsubfolderhint'] = 'Aukeratutakoaren azpikarpeta bezala sortuko da karpeta hau';
$messages['forbiddencharacter'] = 'Karpeta izenak debekatutako karaktereak ditu';
?>
diff --git a/program/localization/fa/labels.inc b/program/localization/fa/labels.inc
index 3bf67a6..1df8743 100644
--- a/program/localization/fa/labels.inc
+++ b/program/localization/fa/labels.inc
@@ -247,13 +247,9 @@
$labels['folder'] = 'پوشه';
$labels['folders'] = 'پوشهها';
$labels['foldername'] = 'نام پوشه';
-$labels['subscribed'] = 'مورد اشتراک';
$labels['messagecount'] = 'پیغامها';
$labels['create'] = 'ایجاد';
$labels['createfolder'] = 'ایجاد پوشهی جدید';
-$labels['rename'] = 'تغییر نام';
-$labels['renamefolder'] = 'تغییر نام پوشه';
-$labels['deletefolder'] = 'حذف پوشه';
$labels['managefolders'] = 'مدیریت پوشهها';
$labels['specialfolders'] = 'پوشه های ویژه';
$labels['sortby'] = 'مرتبسازی بر اساس';
diff --git a/program/localization/fa/messages.inc b/program/localization/fa/messages.inc
index 69146df..1a9673a 100644
--- a/program/localization/fa/messages.inc
+++ b/program/localization/fa/messages.inc
@@ -50,9 +50,7 @@
$messages['deletemessagesconfirm'] = 'آیا واقعاً میخواهید پیغام (های) انتخاب شده را حذف کنید؟';
$messages['deletefolderconfirm'] = 'آیا واقعاً میخواهید این پوشه را حذف کنید؟';
$messages['purgefolderconfirm'] = 'آیا واقعاً میخواهید همهی پیغامهای داخل این پوشه را حذف کنید؟';
-$messages['foldercreating'] = '...در حال ایجاد پوشه ';
$messages['folderdeleting'] = '...در حال حذف پوشه ';
-$messages['folderrenaming'] = '...در حال تغییر نام پوشه ';
$messages['foldermoving'] = '...در حال انتقال پوشه ';
$messages['formincomplete'] = 'فرم کاملاً پر نشده بود';
$messages['noemailwarning'] = 'لطفاً یک نشانی ایمیل معتبر وارد کنید';
@@ -85,7 +83,6 @@
$messages['receiptsent'] = 'رسید خواندن با موفقیت ارسال شد';
$messages['errorsendingreceipt'] = 'ناتوان در ارسال رسید';
$messages['nodeletelastidentity'] = '.نمیتوانید این هویت را حذف کنید، زیرا آخرین هویت شماست';
-$messages['addsubfolderhint'] = 'پوشه به عنوان زیرپوشه ای ساخته خواهد شد که هم اکنون انتخاب شده است';
$messages['forbiddencharacter'] = 'نام پوشه شامل یک حرف غیر مجاز است';
$messages['selectimportfile'] = 'لطفاً فایل را جهت بارگذاری انتخاب کنید';
$messages['addresswriterror'] = 'در دفترچه تلفن انتخابی ، اجازه نوشتن ندارید';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 1fc3a01..2f88d28 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -283,13 +283,9 @@
$labels['folder'] = 'پوشه ';
$labels['folders'] = 'پوشه ها';
$labels['foldername'] = 'نام پوشه ';
-$labels['subscribed'] = 'مشترک ';
$labels['messagecount'] = 'پيغام ها ';
$labels['create'] = 'ایجاد کردن';
$labels['createfolder'] = 'ایجاد پوشه جدید';
-$labels['rename'] = 'تغيير نام ';
-$labels['renamefolder'] = 'تغييرنام پوشه ';
-$labels['deletefolder'] = 'حذف کردن پوشه ';
$labels['managefolders'] = 'اداره کردن پوشه ها ';
$labels['specialfolders'] = 'پوشه های مخصوص';
diff --git a/program/localization/fa_AF/messages.inc b/program/localization/fa_AF/messages.inc
index 17394ac..f298e0f 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -31,9 +31,7 @@
$messages['deletemessagesconfirm'] = 'آيا واقعاً شما ميخواهيد که پيغام هاي انتخاب شده را حذف کنيد؟ ';
$messages['deletefolderconfirm'] = 'آيا واقعاً شما ميخواهيد که اين پوشه را حذف کنيد؟ ';
$messages['purgefolderconfirm'] = 'آيا واقعاً شما ميخواهيد تمام پيغام های که در اين پوشه وجود دارد حذف کنيد؟ ';
-$messages['foldercreating'] = 'در حال ایجاد پوشه';
$messages['folderdeleting'] = 'در حال حذف پوشه';
-$messages['folderrenaming'] = 'در حال تغییر نام پوشه';
$messages['foldermoving'] = 'در حال انتقال پوشه';
$messages['formincomplete'] = 'فورمه بصورت مکمل خانه پري نه شده است ';
$messages['noemailwarning'] = 'لطفاً يک ايميل ادرس موجود را داخل کنيد ';
@@ -66,7 +64,6 @@
$messages['receiptsent'] = 'یک رسید برای ارسال کننده این پیام فرستاده شد.';
$messages['errorsendingreceipt'] = 'رسيد ارسال شده نتوانست ';
$messages['nodeletelastidentity'] = 'شما این شناخت نامه را حذف کرده نمیتوانید. این آخرین شناخت نامه شما است.';
-$messages['addsubfolderhint'] = 'این پوشه به حیث پوشه فرعی پوشه انتخاب شده فعلی ساخته خواهد شد.';
$messages['forbiddencharacter'] = 'نام پوشه دارای یک کرکتر ممنوعه است.';
$messages['selectimportfile'] = 'لطفاً یک فایل را برای آپلود کردن انتخاب نمایید.';
$messages['addresswriterror'] = 'کتابچه آدرس انتخاب شده دارای اجازه نامه نوشتاری نیست.';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index 31aaf83..e291e3a 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -304,13 +304,9 @@
$labels['folder'] = 'Kansio';
$labels['folders'] = 'Kansiot';
$labels['foldername'] = 'Kansion nimi';
-$labels['subscribed'] = 'Näytetään';
$labels['messagecount'] = 'Viestejä';
$labels['create'] = 'Luo uusi';
$labels['createfolder'] = 'Luo uusi kansio';
-$labels['rename'] = 'Nimeä uudelleen';
-$labels['renamefolder'] = 'Nimeä kansio uudelleen';
-$labels['deletefolder'] = 'Poista kansio';
$labels['managefolders'] = 'Kansioiden hallinta';
$labels['specialfolders'] = 'Erikoiskansiot';
$labels['sortby'] = 'Järjestä';
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index ddf98f4..641dedf 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Haluatko varmasti poistaa valitut viestit?';
$messages['deletefolderconfirm'] = 'Haluatko varmasti poistaa kansion?';
$messages['purgefolderconfirm'] = 'Haluatko varmasti poistaa kaikki viestit kansiosta?';
-$messages['foldercreating'] = 'Luodaan kansiota...';
$messages['folderdeleting'] = 'Poistetaan kansiota...';
-$messages['folderrenaming'] = 'Nimetään kansiota...';
$messages['foldermoving'] = 'Siirretään kansiota...';
$messages['formincomplete'] = 'Lomakkeen tiedot olivat puutteelliset';
$messages['noemailwarning'] = 'Anna sähköpostiosoite';
@@ -92,7 +90,6 @@
$messages['receiptsent'] = 'Lukukuittaus lähetetty onnistuneesti';
$messages['errorsendingreceipt'] = 'Lukukuittausta ei voitu lähettää';
$messages['nodeletelastidentity'] = 'Et voi poistaa tätä identiteettiä, koska se on ainoa jäljelläoleva';
-$messages['addsubfolderhint'] = 'Uusi kansio luodaan valitun kansion alikansiona';
$messages['forbiddencharacter'] = 'Kansion nimessä on kiellettyjä merkkejä';
$messages['selectimportfile'] = 'Valitse lähetettävä tiedosto';
$messages['addresswriterror'] = 'Valittuun osoitekirjaan ei voi kirjoittaa';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 8c65a43..e2bedfe 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -322,13 +322,9 @@
$labels['folder'] = 'Dossier';
$labels['folders'] = 'Dossiers';
$labels['foldername'] = 'Nom du dossier';
-$labels['subscribed'] = 'Abonné';
$labels['messagecount'] = 'Messages';
$labels['create'] = 'Créer';
$labels['createfolder'] = 'Créer un nouveau dossier';
-$labels['rename'] = 'Renommer';
-$labels['renamefolder'] = 'Renommer le dossier';
-$labels['deletefolder'] = 'Supprimer le dossier';
$labels['managefolders'] = 'Organiser les dossiers';
$labels['specialfolders'] = 'Dossiers spéciaux';
$labels['sortby'] = 'Trier par';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index af812ea..6623948 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -57,9 +57,7 @@
$messages['deletemessagesconfirm'] = 'Voulez-vous vraiment supprimer le(s) message(s) sélectionné(s) ?';
$messages['deletefolderconfirm'] = 'Voulez-vous vraiment effacer ce dossier ?';
$messages['purgefolderconfirm'] = 'Voulez-vous vraiment effacer tous les messages de ce dossier ?';
-$messages['foldercreating'] = 'Création du dossier...';
$messages['folderdeleting'] = 'Suppression du dossier...';
-$messages['folderrenaming'] = 'Renommage du dossier...';
$messages['foldermoving'] = 'Déplacement du dossier...';
$messages['formincomplete'] = 'Le formulaire n\'a pas été entièrement rempli';
$messages['noemailwarning'] = 'Veuillez spécifier un courriel valide';
@@ -96,7 +94,6 @@
$messages['receiptsent'] = 'L\'accusé de réception a bien été envoyé';
$messages['errorsendingreceipt'] = 'L\'accusé de réception n\'a pas pu être envoyé';
$messages['nodeletelastidentity'] = 'Vous ne pouvez pas effacer votre seule identité.';
-$messages['addsubfolderhint'] = 'Ce dossier sera créé comme sous-dossier de celui sélectionné.';
$messages['forbiddencharacter'] = 'Le nom du dossier contient un caractère interdit';
$messages['selectimportfile'] = 'Veuillez sélectionner un fichier à envoyer';
$messages['addresswriterror'] = 'Impossible d\'écrire dans le carnet d\'adresse sélectionné';
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index d6c5f05..7691bb4 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -164,12 +164,8 @@
$labels['folder'] = 'Fillteán';
$labels['folders'] = 'Fillteán';
$labels['foldername'] = 'Ainm fillteán';
-$labels['subscribed'] = 'Síntiú';
$labels['create'] = 'Cruthaigh';
$labels['createfolder'] = 'Cruthaigh fillteán nua';
-$labels['rename'] = 'Ainmnigh arís';
-$labels['renamefolder'] = 'Ainmnigh fillteán arís';
-$labels['deletefolder'] = 'Scrios fillteán';
$labels['managefolders'] = 'Stiúir na fillteán';
$labels['sortby'] = 'Sórtáil trí';
$labels['sortasc'] = 'Sórtáil in ord méadaitheach';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 1304ffc..adf53c6 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -323,13 +323,9 @@
$labels['folder'] = 'Cartafol';
$labels['folders'] = 'Cartafoles';
$labels['foldername'] = 'Nome do cartafol';
-$labels['subscribed'] = 'Subscrito';
$labels['messagecount'] = 'Mensaxes';
$labels['create'] = 'Crear';
$labels['createfolder'] = 'Crear novo cartafol';
-$labels['rename'] = 'Renomear';
-$labels['renamefolder'] = 'Renomear cartafol';
-$labels['deletefolder'] = 'Eliminar cartafol';
$labels['managefolders'] = 'Xestionar cartafoles';
$labels['specialfolders'] = 'Cartafoles especiais';
$labels['sortby'] = 'Ordenar por';
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 2b5e09d..02e3fd7 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -52,9 +52,7 @@
$messages['deletemessagesconfirm'] = 'Quere eliminar a(s) mensaxe(s) seleccionadas?';
$messages['deletefolderconfirm'] = 'Quere eliminar este cartafol?';
$messages['purgefolderconfirm'] = 'Quere eliminar tódalas mensaxes neste cartafol?';
-$messages['foldercreating'] = 'Creando o cartafol...';
$messages['folderdeleting'] = 'Eliminando o cartafol...';
-$messages['folderrenaming'] = 'Renomeando o cartafol...';
$messages['foldermoving'] = 'Movendo o cartafol...';
$messages['formincomplete'] = 'Non se cumprimentou completamente o formulario';
$messages['noemailwarning'] = 'Por favor, introduza un enderezo de correo electrónico válido';
@@ -91,7 +89,6 @@
$messages['receiptsent'] = 'A notificación da entrega enviouse correctamente';
$messages['errorsendingreceipt'] = 'Non foi posible enviar a notificación da entrega';
$messages['nodeletelastidentity'] = 'Non pode eliminar esta identidade, é a última';
-$messages['addsubfolderhint'] = 'Este cartafol vaise crear coma un subcartafol do seleccionado';
$messages['forbiddencharacter'] = 'O nome do cartafol contén un carácter non válido';
$messages['selectimportfile'] = 'Por favor, escolla un ficheiro para cargar';
$messages['addresswriterror'] = 'Non se pode escribir no caderno de enderezos que escolleu';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 0b03367..27b9a64 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -324,13 +324,9 @@
$labels['folder'] = 'תיק';
$labels['folders'] = 'תיקים';
$labels['foldername'] = 'שם תיק';
-$labels['subscribed'] = 'מנוי';
$labels['messagecount'] = 'הודעות';
$labels['create'] = 'יצירה';
$labels['createfolder'] = 'יצירת תיק חדש';
-$labels['rename'] = 'שינוי שם';
-$labels['renamefolder'] = 'שינוי שם תיק';
-$labels['deletefolder'] = 'מחיקת תיק';
$labels['managefolders'] = 'ניהול תיקים';
$labels['specialfolders'] = 'תיקים מיוחדים';
$labels['sortby'] = 'מיון לפי';
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 3b3f936..94056a4 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -54,9 +54,7 @@
$messages['deletemessagesconfirm'] = 'האם למחוק את ההודעות המסומנות?';
$messages['deletefolderconfirm'] = 'האם למחוק תיק זה?';
$messages['purgefolderconfirm'] = 'האם למחוק את כל ההודעות בתיק זה?';
-$messages['foldercreating'] = 'התיקיה נוצרת...';
$messages['folderdeleting'] = 'התיקיה נמחקת...';
-$messages['folderrenaming'] = 'שינוי שם תיקיה...';
$messages['foldermoving'] = 'העברת תיקיה...';
$messages['formincomplete'] = 'לא הוזנו כל השדות בטופס זה';
$messages['noemailwarning'] = 'נא להוסיף כתובת דוא\"ל חוקית';
@@ -93,7 +91,6 @@
$messages['receiptsent'] = 'אישור הקבלה נשלח בהצלחה';
$messages['errorsendingreceipt'] = 'לא ניתן לשלוח אישור קבלה';
$messages['nodeletelastidentity'] = 'זו הזהות האחרונה ולכן לא ניתן לבטלה';
-$messages['addsubfolderhint'] = 'תיקיה זו תוקם תחת התיקיה שנבחרה';
$messages['forbiddencharacter'] = 'שם התיקיה מכיל תוים אסורים';
$messages['selectimportfile'] = 'נא לבחור קובץ לייבוא';
$messages['addresswriterror'] = 'פנקס הכתובות שנבחר אינו ניתן לכתיבה';
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 6db8e02..38e3bdf 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -223,12 +223,8 @@
$labels['folder'] = 'फ़ोल्डर';
$labels['folders'] = 'फ़ोल्डर';
$labels['foldername'] = 'फ़ोल्डर नाम';
-$labels['subscribed'] = 'सबस्क्राईब किया गया';
$labels['create'] = 'बनाऐं';
$labels['createfolder'] = 'फ़ोलडर बनाऐं';
-$labels['rename'] = 'नाम बदलें';
-$labels['renamefolder'] = 'फ़ोलडर का नाम बदलें';
-$labels['deletefolder'] = 'फ़ोलडर मिटाऐं';
$labels['managefolders'] = 'फ़ोलडर को व्यवस्थित करें';
$labels['sortby'] = 'ऐसे तय करें';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index 1e919db..4c3e51b 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -326,13 +326,9 @@
$labels['folder'] = 'Mapa';
$labels['folders'] = 'Mape';
$labels['foldername'] = 'Ime mape';
-$labels['subscribed'] = 'Pretplata';
$labels['messagecount'] = 'Poruke';
$labels['create'] = 'Napravi';
$labels['createfolder'] = 'Napravi novu mapu';
-$labels['rename'] = 'Preimenuj';
-$labels['renamefolder'] = 'Preimenuj Mapu';
-$labels['deletefolder'] = 'Obriši Mapu';
$labels['managefolders'] = 'Podesi Mapu';
$labels['specialfolders'] = 'Specijalna Mapa';
$labels['sortby'] = 'Sortiraj po';
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index 4f4b7c5..7594efa 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -53,9 +53,7 @@
$messages['deletemessagesconfirm'] = 'Sigurno želite obrisati odabrane poruke?';
$messages['deletefolderconfirm'] = 'Želite li obrisati ovu mapu?';
$messages['purgefolderconfirm'] = 'Želite li obrisati sve poruke u mapi?';
-$messages['foldercreating'] = 'Kreiram mapu...';
$messages['folderdeleting'] = 'Brišem mapu...';
-$messages['folderrenaming'] = 'Mijenjam naziv mape...';
$messages['foldermoving'] = 'Premještam mapu...';
$messages['formincomplete'] = 'Obrazac nije u cjelosti popunjen';
$messages['noemailwarning'] = 'Unesite valjanu e-mail adresu';
@@ -89,7 +87,6 @@
$messages['receiptsent'] = 'Uspješno poslana potvrda (pročitano)';
$messages['errorsendingreceipt'] = 'Ne može poslati potvrdu';
$messages['nodeletelastidentity'] = 'Ne možete izbrisati zadnji identitet.';
-$messages['addsubfolderhint'] = 'Ova mapa će biti stvorena kao podmapa na trenutno označenoj';
$messages['forbiddencharacter'] = 'Naziv mape sadrži zabranjene znakove';
$messages['selectimportfile'] = 'Odaberite datoteku za prijenos';
$messages['addresswriterror'] = 'U odabrani adresar nije moguće zapisivat...';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index e255388..f7a00e6 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -327,13 +327,9 @@
$labels['folder'] = 'Mappa';
$labels['folders'] = 'Mappák';
$labels['foldername'] = 'Mappa neve';
-$labels['subscribed'] = 'Feliratkozás';
$labels['messagecount'] = 'Üzenet';
$labels['create'] = 'Létrehozás';
$labels['createfolder'] = 'Új mappa létrehozása';
-$labels['rename'] = 'Átnevezés';
-$labels['renamefolder'] = 'Mappa átnevezése';
-$labels['deletefolder'] = 'Mappa törlése';
$labels['managefolders'] = 'Mappák kezelése';
$labels['specialfolders'] = 'Különleges mappák';
$labels['sortby'] = 'Rendezés';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index 3f5d7de..c820bc2 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -57,9 +57,7 @@
$messages['deletemessagesconfirm'] = 'Biztos, hogy törölni szeretné a kijelölt üzenete(ke)t?';
$messages['deletefolderconfirm'] = 'Biztos, hogy törölni szeretné ezt a mappát?';
$messages['purgefolderconfirm'] = 'Biztos benne, hogy az összes üzenet törölhető?';
-$messages['foldercreating'] = 'Mappa létrehozása...';
$messages['folderdeleting'] = 'Mappa törlése...';
-$messages['folderrenaming'] = 'Mappa átnevezése...';
$messages['foldermoving'] = 'Mappa mozgatása...';
$messages['formincomplete'] = 'Az űrlap hiányosan lett kitöltve';
$messages['noemailwarning'] = 'Adjon meg egy valós e-mail címet';
@@ -94,7 +92,6 @@
$messages['receiptsent'] = 'Az olvasási visszaigazolás el lett küldve';
$messages['errorsendingreceipt'] = 'Az olvasási visszaigazolást nem sikerült elküldeni';
$messages['nodeletelastidentity'] = 'Nem törölheti ezt az azonosítót, ez az egyetlen';
-$messages['addsubfolderhint'] = 'Az új könyvtár az aktuálisan kiválasztott alkönyvtáraként lesz létrehozva';
$messages['forbiddencharacter'] = 'A mappa neve tiltott karaktert tartalmaz';
$messages['selectimportfile'] = 'Kérjük válassza ki a feltölteni kívánt fájlt';
$messages['addresswriterror'] = 'A kiválasztott címjegyzék nem írható';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 7081d44..17ab1b7 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -245,13 +245,9 @@
$labels['folder'] = 'Դարակ';
$labels['folders'] = 'Դարակներ';
$labels['foldername'] = 'Դարակի անուն';
-$labels['subscribed'] = 'Բաժանորդագրված';
$labels['messagecount'] = 'Նամակներ';
$labels['create'] = 'Ստեղծել';
$labels['createfolder'] = 'Բացել նոր դարակ';
-$labels['rename'] = 'Վերանվանել';
-$labels['renamefolder'] = 'Վերանվանել դարակը';
-$labels['deletefolder'] = 'Ջնջել դարակը';
$labels['managefolders'] = 'Կարգավորել դարակները';
$labels['specialfolders'] = 'Հատուկ դարակներ';
$labels['sortby'] = 'Դասավորել';
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index cd8aab2..5313ba1 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -48,9 +48,7 @@
$messages['deletemessagesconfirm'] = 'Ուզու՞մ էք ջնջել նշված նամակները';
$messages['deletefolderconfirm'] = 'Ուզու՞մ էք ջնջել այս դարակը';
$messages['purgefolderconfirm'] = 'Ուզու՞մ էք ջնջել այս դարակի բոլոր նամակները';
-$messages['foldercreating'] = 'Դարակը ստեղծվում է…';
$messages['folderdeleting'] = 'Դարակը ջնջվում է…';
-$messages['folderrenaming'] = 'Դարակը վերանվանվում է…';
$messages['foldermoving'] = 'Դարակը տեղափոխվում է…';
$messages['formincomplete'] = 'Ձևը թերի է լրացված';
$messages['noemailwarning'] = 'Մուտքագրեք ճիշտ էլ. հասցե';
@@ -83,7 +81,6 @@
$messages['receiptsent'] = 'Նամակի ընթերցման ծանուցագիրն ուղարկված է';
$messages['errorsendingreceipt'] = 'Ծանուցագրի ուղարկումը ձախողվեց';
$messages['nodeletelastidentity'] = 'Անհնար է ջնջել վերջին տարբերակը';
-$messages['addsubfolderhint'] = 'Այս դարակը կստեղծվի որպես նշվածի ենթադարակ';
$messages['forbiddencharacter'] = 'Դարակի անունը պարունակում է անթույլատրելի նշան';
$messages['selectimportfile'] = 'Ընտրեք ուղարկվող ֆայլը';
$messages['addresswriterror'] = 'Ընտրված հասցեագիրքը ենթակա չէ փոփոխման';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 9e1d556..3d0bc39 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -326,13 +326,9 @@
$labels['folder'] = 'Map';
$labels['folders'] = 'Map-map';
$labels['foldername'] = 'Nama map';
-$labels['subscribed'] = 'Subscribed';
$labels['messagecount'] = 'Pesan-pesan';
$labels['create'] = 'Buat';
$labels['createfolder'] = 'Buat map baru';
-$labels['rename'] = 'Namai ulang';
-$labels['renamefolder'] = 'Namai ulang map';
-$labels['deletefolder'] = 'Hapus map';
$labels['managefolders'] = 'Atur map';
$labels['specialfolders'] = 'Map Khusus';
$labels['sortby'] = 'Urut berdasarkan';
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index 50393b8..3950249 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Yakin menghapus pesan terpilih?';
$messages['deletefolderconfirm'] = 'Apakah anda benar-benar ingin menghapus map ini?';
$messages['purgefolderconfirm'] = 'Yakin menghapus semua pesan pada map ini?';
-$messages['foldercreating'] = 'Membuat map...';
$messages['folderdeleting'] = 'Menghapus map...';
-$messages['folderrenaming'] = 'Mengubah nama map...';
$messages['foldermoving'] = 'Memindahkan map...';
$messages['formincomplete'] = 'Isian tidak terisi semua';
$messages['noemailwarning'] = 'Tolong masukkan alamat email yang valid';
@@ -94,7 +92,6 @@
$messages['receiptsent'] = 'Berhasil mengirim pemberitahuan tanda terima telah terbaca';
$messages['errorsendingreceipt'] = 'Tidak dapat mengirim tanda terima';
$messages['nodeletelastidentity'] = 'Anda tidak bida mengapus identitas ini, ini identitas yang terakhir';
-$messages['addsubfolderhint'] = 'Folder ini akan dibuat sebagai subfolder pada folder yang terpilih';
$messages['forbiddencharacter'] = 'Nama folder mengandung karakter terlarang';
$messages['selectimportfile'] = 'Mohon pilih sebuah berkas untuk diunggah';
$messages['addresswriterror'] = 'Buku alamat terpilih tidak dapat ditulisi';
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index f21a3b5..2e2db1f 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -246,13 +246,9 @@
$labels['folder'] = 'Mappa';
$labels['folders'] = 'Möppur';
$labels['foldername'] = 'Nafn möppu';
-$labels['subscribed'] = 'Valin';
$labels['messagecount'] = 'Skeyti';
$labels['create'] = 'Búa til';
$labels['createfolder'] = 'Búa til nýja möppu';
-$labels['rename'] = 'Endurnefna';
-$labels['renamefolder'] = 'Breyta nafni möppu';
-$labels['deletefolder'] = 'Eyða möppu';
$labels['managefolders'] = 'Sýsla með möppum';
$labels['specialfolders'] = 'Sérstakar möppur';
$labels['sortby'] = 'Raða eftir';
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 5f6cc85..4e4395e 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -324,13 +324,9 @@
$labels['folder'] = 'Cartella';
$labels['folders'] = 'Cartelle';
$labels['foldername'] = 'Nome cartella';
-$labels['subscribed'] = 'Sottoscritta';
$labels['messagecount'] = 'Messaggi';
$labels['create'] = 'Crea';
$labels['createfolder'] = 'Crea nuova cartella';
-$labels['rename'] = 'Rinomina';
-$labels['renamefolder'] = 'Rinomina cartella';
-$labels['deletefolder'] = 'Cancella cartella';
$labels['managefolders'] = 'Gestione cartelle';
$labels['specialfolders'] = 'Cartelle Speciali';
$labels['sortby'] = 'Ordina per';
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index 1a0c9db..665a9e5 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Sei sicuro di voler eliminare i messaggi selezionati?';
$messages['deletefolderconfirm'] = 'Sei sicuro di voler eliminare la cartella selezionata?';
$messages['purgefolderconfirm'] = 'Sei sicuro di voler eliminare tutti i messaggi in questa cartella?';
-$messages['foldercreating'] = 'Creazione cartella...';
$messages['folderdeleting'] = 'Eliminazione cartella...';
-$messages['folderrenaming'] = 'Rinominazione cartella...';
$messages['foldermoving'] = 'Spostamento cartella...';
$messages['formincomplete'] = 'Per favore, compila tutti i campi';
$messages['noemailwarning'] = 'Per favore, immetti un indirizzo e-mail valido';
@@ -92,7 +90,6 @@
$messages['receiptsent'] = 'Ricevuta di ritorno inviata con successo';
$messages['errorsendingreceipt'] = 'Impossibile spedire la ricevuta di ritorno';
$messages['nodeletelastidentity'] = 'Impossibile eliminare l\'unica identità disponibile';
-$messages['addsubfolderhint'] = 'La cartella verrà creata come sotto cartella della cartella corrente';
$messages['forbiddencharacter'] = 'Il nome della cartella contiene un carattere vietato';
$messages['selectimportfile'] = 'Per favore, seleziona il file da caricare';
$messages['addresswriterror'] = 'La rubrica selezionata non è scrivibile';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 6edce9a..baed54e 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -329,13 +329,9 @@
$labels['folder'] = 'フォルダ';
$labels['folders'] = 'フォルダ一覧';
$labels['foldername'] = 'フォルダ名';
-$labels['subscribed'] = '購読済';
$labels['messagecount'] = 'メール';
$labels['create'] = '作成';
$labels['createfolder'] = 'フォルダの新規作成';
-$labels['rename'] = '名前の変更';
-$labels['renamefolder'] = 'フォルダ名の変更';
-$labels['deletefolder'] = 'フォルダの削除';
$labels['managefolders'] = 'フォルダの管理';
$labels['specialfolders'] = '特殊なフォルダ';
$labels['sortby'] = '並び替えの基準';
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index c1a79a8..94b76a7 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -58,9 +58,7 @@
$messages['deletemessagesconfirm'] = '選択したメールを本当に削除しますか?';
$messages['deletefolderconfirm'] = 'このフォルダを本当に削除しますか?';
$messages['purgefolderconfirm'] = 'このフォルダの全メールを本当に削除しますか?';
-$messages['foldercreating'] = 'フォルダを作成しています...';
$messages['folderdeleting'] = 'フォルダを削除しています...';
-$messages['folderrenaming'] = 'フォルダ名を変更しています...';
$messages['foldermoving'] = 'フォルダを移動しています...';
$messages['formincomplete'] = 'すべてのフォームの項目を入力していません。';
$messages['noemailwarning'] = '有効なメールアドレスを入力してください。';
@@ -97,7 +95,6 @@
$messages['receiptsent'] = '開封確認を送信しました。';
$messages['errorsendingreceipt'] = '開封確認を送信できません。';
$messages['nodeletelastidentity'] = '削除できません。少なくとも 1 つの個人情報が必要です。';
-$messages['addsubfolderhint'] = '現在選択しているフォルダのサブフォルダとして作成されます。';
$messages['forbiddencharacter'] = 'フォルダ名に利用できない文字が含まれています。';
$messages['selectimportfile'] = 'アップロードするファイルを選択してください。';
$messages['addresswriterror'] = '選択したアドレス帳に書き込めません。';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 8234318..081fc98 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -270,13 +270,9 @@
$labels['folder'] = 'საქაღალდე';
$labels['folders'] = 'საქაღალდეები';
$labels['foldername'] = 'საქაღალდის დასახელება';
-$labels['subscribed'] = 'გამოწერილია';
$labels['messagecount'] = 'შეტყობინებები';
$labels['create'] = 'შექმნა';
$labels['createfolder'] = 'საქაღალდის შექმნა';
-$labels['rename'] = 'სახელის გადარქმევა';
-$labels['renamefolder'] = 'სახელის გადარქმევა საქაღალდისთვის';
-$labels['deletefolder'] = 'საქაღალდის წაშლა';
$labels['managefolders'] = 'საქაღალდეების მართვა';
$labels['specialfolders'] = 'სპეციალური საქაღალდე';
$labels['sortby'] = 'დალაგება';
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 33767dd..6e526b7 100755
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -52,9 +52,7 @@
$messages['deletemessagesconfirm'] = 'ნამდვილად გსურთ მონიშნული შეტყობინებების წაშლა?';
$messages['deletefolderconfirm'] = 'ნამდვილად გსურთ ამ საქაღალდის წაშლა?';
$messages['purgefolderconfirm'] = 'ნამდვილად გსურთ ყველა შეტყობინების წაშლა აღნიშნულ საქაღალდეში?';
-$messages['foldercreating'] = 'საქაღალდის შექმნა...';
$messages['folderdeleting'] = 'საქაღალდის წაშლა...';
-$messages['folderrenaming'] = 'საქაღალდის სახელის შეცვლა...';
$messages['foldermoving'] = 'საქაღალდის გადატანა...';
$messages['formincomplete'] = 'ყველა ველი არ არის შევსებული';
$messages['noemailwarning'] = 'მიუთითეთ სწორი ელ–ფოსტის მისამართი';
@@ -88,7 +86,6 @@
$messages['receiptsent'] = 'წარმატებით გაიგზავნა';
$messages['errorsendingreceipt'] = 'არ გაიგზავნა';
$messages['nodeletelastidentity'] = 'წაშლა შეუძლებელია, ის თქვენთვის ერთადერთია';
-$messages['addsubfolderhint'] = 'საქაღალდე შეიქმნება როგორც ქვესაქაღალდე მონიშნულ საქაღალდეში';
$messages['forbiddencharacter'] = 'საქაღალდის სახელი შეიცავს აკრძალულ სიმბოლოებს';
$messages['selectimportfile'] = 'გთხოვთ მონიშნოთ ფაილი ასატვირთად';
$messages['addresswriterror'] = 'მონიშნულ მისამართებში ჩაწერა შეუძლებელია';
diff --git a/program/localization/kh_KH/labels.inc b/program/localization/kh_KH/labels.inc
index 7782b28..0f9efb4 100644
--- a/program/localization/kh_KH/labels.inc
+++ b/program/localization/kh_KH/labels.inc
@@ -308,13 +308,9 @@
$labels['folder'] = 'ថត';
$labels['folders'] = 'ថតទាំងអស់';
$labels['foldername'] = 'ឈ្មោះ Folder';
-$labels['subscribed'] = 'ភ្ជាប់ជាប្រចាំ';
$labels['messagecount'] = 'សារ';
$labels['create'] = 'បង្កើត';
$labels['createfolder'] = 'បង្កើត Folder ថ្មី';
-$labels['rename'] = 'ប្តូឈ្មោះ';
-$labels['renamefolder'] = 'ប្តូឈ្មោះថត';
-$labels['deletefolder'] = 'លុបថត';
$labels['managefolders'] = 'រៀបចំថត';
$labels['specialfolders'] = 'ថតពិសេស';
$labels['sortby'] = 'តំរៀបតាម';
diff --git a/program/localization/kh_KH/messages.inc b/program/localization/kh_KH/messages.inc
index db148d3..9d67d9d 100644
--- a/program/localization/kh_KH/messages.inc
+++ b/program/localization/kh_KH/messages.inc
@@ -54,9 +54,7 @@
$messages['deletemessagesconfirm'] = 'តើអ្នកពិតជាចង់លុបសារនេះមែនទេ?';
$messages['deletefolderconfirm'] = 'តើអ្នកពិតជាចង់លុបថតនេះមែនទេ?';
$messages['purgefolderconfirm'] = 'តើអ្នកពិតជាចង់លុបសារទាំងអស់មែនទេ?';
-$messages['foldercreating'] = 'កំពុងបង្កើតថតសំរាប់ទុកឯកសារ...';
$messages['folderdeleting'] = 'កំពុងលុបថតសំរាប់ទុកឯកសារ...';
-$messages['folderrenaming'] = 'កំពុងប្តូរឈ្មោះថតសំរាប់ទុកឯកសារ...';
$messages['foldermoving'] = 'កំពុងផ្តេរថតសំរាប់ទុកឯកសារ...';
$messages['formincomplete'] = 'ទំរង់នេះមិនទាន់ពេញលេញនៅឡើយទេ';
$messages['noemailwarning'] = 'សូមវាយបញ្ចូលអ៊ីមែលរបស់អ្នក';
@@ -91,7 +89,6 @@
$messages['receiptsent'] = 'ការបញ្ជូន read receipt បានសំរេច';
$messages['errorsendingreceipt'] = 'មិនអាចបញ្ជុន receipt ទេ';
$messages['nodeletelastidentity'] = 'អ្នកមិនអាចលុបអត្តសញ្ញាណនេះទេ ព្រោះវានៅសល់ចុងក្រោយគេ';
-$messages['addsubfolderhint'] = 'Folder នេះនឹងបង្កើតជា Subfolder នៃ Folder ដែលកំពុងស្ថិតនៅនេះ';
$messages['forbiddencharacter'] = 'ឈ្មោះ Folder នេះមានអក្សរដែលត្រូវហាមឃាត់';
$messages['selectimportfile'] = 'សូមជ្រើសរើសឯកសារដើម្បីផ្ញើ';
$messages['addresswriterror'] = 'សៀវភៅអាសយដ្ឋាននោះមិនអាចសរសេរចូលបានទេ';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 2d97998..546c453 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -246,13 +246,9 @@
$labels['folder'] = '폴더';
$labels['folders'] = '폴더';
$labels['foldername'] = '폴더 이름';
-$labels['subscribed'] = '가입됨';
$labels['messagecount'] = '메시지';
$labels['create'] = '만들기';
$labels['createfolder'] = '새 폴더 만들기';
-$labels['rename'] = '이름 바꾸기';
-$labels['renamefolder'] = '폴더 이름 바꾸기';
-$labels['deletefolder'] = '폴더 지우기';
$labels['managefolders'] = '폴더 관리';
$labels['specialfolders'] = '특수 폴더';
$labels['sortby'] = '정렬';
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index ea2b451..596e2b1 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -49,9 +49,7 @@
$messages['deletemessagesconfirm'] = '정말 선택한 메일들을 삭제하시겠습니까?';
$messages['deletefolderconfirm'] = '정말 이 폴더를 삭제하시겠습니까?';
$messages['purgefolderconfirm'] = '정말 이 폴더의 모든 메일을 삭제하시겠습니까?';
-$messages['foldercreating'] = '폴더 만드는 중...';
$messages['folderdeleting'] = '폴더 지우는 중...';
-$messages['folderrenaming'] = '폴더 이름 바꾸는 중...';
$messages['foldermoving'] = '폴더 옮기는 중...';
$messages['formincomplete'] = '양식을 완전히 채우지 않았습니다';
$messages['noemailwarning'] = '유효한 이메일 주소를 넣어주십시오';
@@ -84,7 +82,6 @@
$messages['receiptsent'] = '메일 읽음 확인을 보냈습니다';
$messages['errorsendingreceipt'] = '읽음 확인을 보낼 수 없습니다';
$messages['nodeletelastidentity'] = '이 정보는 마지막 남은 것이므로 지울 수 없습니다';
-$messages['addsubfolderhint'] = '이 폴더는 현재 선택된 폴더의 서브 폴더로 만들어질 것입니다';
$messages['forbiddencharacter'] = '폴더 이름에 쓸 수 없는 문자가 포함되어 있습니다';
$messages['selectimportfile'] = '업로드할 파일을 선택하세요';
$messages['addresswriterror'] = '선택한 주소록은 쓸 수 없습니다';
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index c1b7068..d1fdc94 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -173,13 +173,9 @@
$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';
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index 37029a9..d5d2e01 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -74,6 +74,5 @@
$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/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index a72a125..578628f 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -312,13 +312,9 @@
$labels['folder'] = 'Aplankas';
$labels['folders'] = 'Aplankai';
$labels['foldername'] = 'Aplanko vardas';
-$labels['subscribed'] = 'Užsakytas';
$labels['messagecount'] = 'Laiškai';
$labels['create'] = 'Sukurti';
$labels['createfolder'] = 'Sukurti naują aplanką';
-$labels['rename'] = 'Pervardinti';
-$labels['renamefolder'] = 'Pervardinti aplanką';
-$labels['deletefolder'] = 'Pašalinti aplanką';
$labels['managefolders'] = 'Tvarkyti aplankus';
$labels['specialfolders'] = 'Specialieji aplankai';
$labels['sortby'] = 'Rikiuoti pagal';
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index 62d59de..dd48476 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Ar tikrai pašalinti pažymėtą(-us) laišką(-us)?';
$messages['deletefolderconfirm'] = 'Ar tikrai pašalinti šį aplanką?';
$messages['purgefolderconfirm'] = 'Ar tikrai pašalinti visus šiame aplanke esančius laiškus?';
-$messages['foldercreating'] = 'Aplankas kuriamas…';
$messages['folderdeleting'] = 'Aplankas šalinamas…';
-$messages['folderrenaming'] = 'Aplankas pervardinamas…';
$messages['foldermoving'] = 'Aplankas perkeliamas…';
$messages['formincomplete'] = 'Formos laukai nepilnai užpildyti';
$messages['noemailwarning'] = 'Prašom įvesti teisingą el. pašto adresą';
@@ -92,7 +90,6 @@
$messages['receiptsent'] = 'Laiško perskaitymo pažyma sėkmingai išsiųsta';
$messages['errorsendingreceipt'] = 'Laiško perskaitymo pažymos išsiųsti nepavyko';
$messages['nodeletelastidentity'] = 'Jūs negalite ištrinti šios tapatybės, nes ji yra vienintelė likusi.';
-$messages['addsubfolderhint'] = 'Šis aplankas bus sukurtas kaip pažymėtojo aplanko poaplankis';
$messages['forbiddencharacter'] = 'Aplanko varde rasta neleistinų simbolių';
$messages['selectimportfile'] = 'Parinkite įkelti norimą failą';
$messages['addresswriterror'] = 'Pasirinktoji adresų knyga prieinama tik skaitymui';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index cafa1d3..907206f 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -273,13 +273,9 @@
$labels['folder'] = 'Mapi';
$labels['folders'] = 'Mapes';
$labels['foldername'] = 'Mapes nosaukums';
-$labels['subscribed'] = 'Abonēta';
$labels['messagecount'] = 'Vēstules';
$labels['create'] = 'Izveidot';
$labels['createfolder'] = 'Izveidot jaunu mapi';
-$labels['rename'] = 'Pārsaukt';
-$labels['renamefolder'] = 'Pārsaukt mapi';
-$labels['deletefolder'] = 'Dzēst mapi';
$labels['managefolders'] = 'Rediģēt mapes';
$labels['specialfolders'] = 'Īpašās mapes';
$labels['sortby'] = 'Kārtot pēc';
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index e84a832..78b3a4a 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Vai tiešām vēlaties dzēst iezīmēto(ās) vēstules?';
$messages['deletefolderconfirm'] = 'Vai tiešām vēlaties dzēst šo mapi?';
$messages['purgefolderconfirm'] = 'Vai tiešām vēlaties dzēst visas vēstules, kas atrodas šajā mapē?';
-$messages['foldercreating'] = 'Izveidoju mapi...';
$messages['folderdeleting'] = 'Dzēšu mapi...';
-$messages['folderrenaming'] = 'Pārsaucu mapi...';
$messages['foldermoving'] = 'Pārvietoju mapi...';
$messages['formincomplete'] = 'Formulārs nav pilnībā aizpildīts';
$messages['noemailwarning'] = 'Lūdzu ievadiet pareizu e-pasta adresi';
@@ -91,7 +89,6 @@
$messages['receiptsent'] = 'Saņemšanas apstiprinājums nosūtīts';
$messages['errorsendingreceipt'] = 'Neizdevās nosūtīt apstiprinājumu';
$messages['nodeletelastidentity'] = 'Šo identitāti nevar izdzēst, tā ir pati pēdējā.';
-$messages['addsubfolderhint'] = 'Šis folderis tiks izveidots kā apakšfolderis tam, kurš patreiz ir izvēlēts';
$messages['forbiddencharacter'] = 'Mapes nosaukums satur aizliegtus simbolus';
$messages['selectimportfile'] = 'Lūdzu izvēlieties failu, ko vēlaties augšupielādēt';
$messages['addresswriterror'] = 'Izvēlētās adrešu grāmatas datus nevar labot';
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 4d8d69f..0e23079 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -270,13 +270,9 @@
$labels['folder'] = 'Папка';
$labels['folders'] = 'Папки';
$labels['foldername'] = 'Име на папката';
-$labels['subscribed'] = 'Претплатен';
$labels['messagecount'] = 'Пораки';
$labels['create'] = 'Создај';
$labels['createfolder'] = 'Создај нова папка';
-$labels['rename'] = 'Преименувај';
-$labels['renamefolder'] = 'Преименувај папка';
-$labels['deletefolder'] = 'Избриши папка';
$labels['managefolders'] = 'Организирање на папки';
$labels['specialfolders'] = 'Специјални папки';
$labels['sortby'] = 'Сортирај по';
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index 4d51bb5..0344061 100755
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -52,9 +52,7 @@
$messages['deletemessagesconfirm'] = 'Дали сте сигурни дека сакате да го(и) избришете обележаниот(те) писмо(а)?';
$messages['deletefolderconfirm'] = 'Дали сте сигурни дека сакате да ја избришете оваа папка?';
$messages['purgefolderconfirm'] = 'Дали сте сигурни дека сакате да ги избршете сите писма во оваа папка?';
-$messages['foldercreating'] = 'Ја создавам папката...';
$messages['folderdeleting'] = 'Ја бришам папката...';
-$messages['folderrenaming'] = 'Ја преименувам папката...';
$messages['foldermoving'] = 'Ја преместувам папката...';
$messages['formincomplete'] = 'Имате изоставено непополнети информации';
$messages['noemailwarning'] = 'Внесете валидна е-поштенска адреса';
@@ -88,7 +86,6 @@
$messages['receiptsent'] = 'Известувањето е успешно пратено';
$messages['errorsendingreceipt'] = 'Известувањето не е пратено';
$messages['nodeletelastidentity'] = 'Овој идентитет неможе да се избрише, тој е последниот.';
-$messages['addsubfolderhint'] = 'Оваа папка ќе биде креирана како потпапка на моментално избраната.';
$messages['forbiddencharacter'] = 'Името на папката содржи несоодветен формат';
$messages['selectimportfile'] = 'Изберете ја податотеката која сакате да ја прикачите';
$messages['addresswriterror'] = 'Одбраниот именик не може да се менува';
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index a8cf865..213c2bf 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -374,13 +374,9 @@
$labels['folder'] = 'फोल्डर';
$labels['folders'] = 'फोल्डर्स';
$labels['foldername'] = 'फोल्डरचे नाव';
-$labels['subscribed'] = 'वर्गणिदार होणे';
$labels['messagecount'] = 'संदेश';
$labels['create'] = 'तयार करा';
$labels['createfolder'] = 'नवीन फोल्डर तयार करा';
-$labels['rename'] = 'नवीन नाव द्या';
-$labels['renamefolder'] = 'फोल्डरला नवीन नाव द्या';
-$labels['deletefolder'] = 'फोल्डर काढून टाका';
$labels['managefolders'] = 'फोल्डर्सचे नियोजन करा';
$labels['specialfolders'] = 'विषेश फोल्डर';
$labels['sortby'] = 'ने वर्गवारी करा';
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index 3dc07fd..6ee3a5e 100755
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -51,9 +51,7 @@
$messages['deletemessagesconfirm'] = 'खूण केलेले सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
$messages['deletefolderconfirm'] = 'हा फोल्डर खरोखरच तुम्हाला काढून टाकायचा आहेत का?';
$messages['purgefolderconfirm'] = 'या फोल्डरमधिल सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
-$messages['foldercreating'] = 'फोल्डर तयार करत आहे';
$messages['folderdeleting'] = 'फोल्डर काढून टाकत आहे';
-$messages['folderrenaming'] = 'फोल्डरला नवीन नाव देत आहे.';
$messages['foldermoving'] = 'फोल्डर हलवत आहे.';
$messages['formincomplete'] = 'फॉर्म पूर्णपणे भरलेला नाही. ';
$messages['noemailwarning'] = 'योग्य, बरोबर, आणि वैध इमेल पत्ता द्या. ';
@@ -88,7 +86,6 @@
$messages['receiptsent'] = 'पोचपावती यशस्वीरित्या पाठवण्यात आली आहे. ';
$messages['errorsendingreceipt'] = 'पोचपावती पाठवता आली नाही.';
$messages['nodeletelastidentity'] = 'तुम्ही हे खाते काढून टाकू शकत नाही कारण हे तुमचे शेवटचे खाते आहे.';
-$messages['addsubfolderhint'] = 'हा फोल्डर निवडलेल्या फोल्डरचा उप-फोल्डर असेल';
$messages['forbiddencharacter'] = 'फोल्डरच्या नावात न चालणारी अक्षरे किंवा खूणा आहेत.';
$messages['selectimportfile'] = 'चढवण्यासाठी फाईल निवडा';
$messages['addresswriterror'] = 'निवडलेल्या पत्ता नोंदवहीत नोंद करता येत नाही.';
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index c6a5858..19c4d1a 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -211,13 +211,9 @@
$labels['folder'] = 'Kabinet Fail';
$labels['folders'] = 'Kabinet Fail';
$labels['foldername'] = 'Nama Kabinet Fail';
-$labels['subscribed'] = 'Dilanggan';
$labels['messagecount'] = 'Mesej-mesej';
$labels['create'] = 'Cipta';
$labels['createfolder'] = 'Cipta kabinet fail baru';
-$labels['rename'] = 'Namakan semula';
-$labels['renamefolder'] = 'Namakan semula kabinet fail';
-$labels['deletefolder'] = 'Hapus kabinet fail';
$labels['managefolders'] = 'Urus kabinet fail';
$labels['sortby'] = 'Susun dengan';
$labels['sortasc'] = 'Susun menaik';
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index 2dac2bc..907903b 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -77,6 +77,5 @@
$messages['receiptsent'] = 'Berjaya menghantar resip bacaan';
$messages['errorsendingreceipt'] = 'Tidak dapat menghantar resip';
$messages['nodeletelastidentity'] = 'Anda tidak boleh membuang identiti ini, ia milik anda yang terakhir.';
-$messages['addsubfolderhint'] = 'Folder ini akan dibina sebagai subfolder kepada folder yang dipilih sekarang';
?>
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 0e828a2..a57ca51 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -308,13 +308,9 @@
$labels['folder'] = 'Mappe';
$labels['folders'] = 'Mapper';
$labels['foldername'] = 'Mappenavn';
-$labels['subscribed'] = 'Abonnere';
$labels['messagecount'] = 'Meldinger';
$labels['create'] = 'Opprett';
$labels['createfolder'] = 'Lag ny mappe';
-$labels['rename'] = 'Endre navn';
-$labels['renamefolder'] = 'Endre navn på mappe';
-$labels['deletefolder'] = 'Slett mappe';
$labels['managefolders'] = 'Rediger mapper';
$labels['specialfolders'] = 'Spesielle mapper';
$labels['sortby'] = 'Sorter etter';
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index db00818..4f823a5 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -57,9 +57,7 @@
$messages['deletemessagesconfirm'] = 'Vil du virkelig slette de(n) valgte meldingen(e)?';
$messages['deletefolderconfirm'] = 'Vil du virkelig slette denne mappen?';
$messages['purgefolderconfirm'] = 'Vil du virkelig slette alle meldingene i denne mappen?';
-$messages['foldercreating'] = 'Oppretter mappe...';
$messages['folderdeleting'] = 'Sletter mappe...';
-$messages['folderrenaming'] = 'Gir nytt navn til mappe...';
$messages['foldermoving'] = 'Flytter mappe...';
$messages['formincomplete'] = 'Skjemaet var ikke fullstendig fylt ut';
$messages['noemailwarning'] = 'Skriv inn en gyldig e-postadresse';
@@ -94,7 +92,6 @@
$messages['receiptsent'] = 'Kvittering er sent';
$messages['errorsendingreceipt'] = 'Kunne ikke sende kvittering';
$messages['nodeletelastidentity'] = 'Du kan ikke slette denne identiteten, det er din eneste.';
-$messages['addsubfolderhint'] = 'Mappen vil bli opprettet som en undermappe av nåværende valgt mappe';
$messages['forbiddencharacter'] = 'Mappenavnet inneholder tegn som ikke er tillatt';
$messages['selectimportfile'] = 'Vennligst velg en fil for opplasting';
$messages['addresswriterror'] = 'Den valgte adresseboken er ikke skrivbar';
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index ee1cc09..826a0e4 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -163,12 +163,8 @@
$labels['folder'] = 'फोल्डर';
$labels['folders'] = 'फोल्डरहरु';
$labels['foldername'] = 'फोल्डरको नाम';
-$labels['subscribed'] = 'सबस्क्राईब गरियो';
$labels['create'] = 'बनाउनुहोस';
$labels['createfolder'] = 'नया फोलडर बनाउनुहोस';
-$labels['rename'] = 'नाम बदल्नुहोस';
-$labels['renamefolder'] = 'फोलडरको नाम बदल्नुहोस';
-$labels['deletefolder'] = 'फोलडर मेट्नुहोस';
$labels['managefolders'] = 'फोलडर व्यवस्थित गर्नुहोस';
$labels['sortby'] = 'यसरी तय गर्नुहोस';
$labels['sortasc'] = 'पहिलो देखि अन्तिम सम्म तय गर्नुहोस';
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index 2ac0eea..c60a3c2 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -317,13 +317,9 @@
$labels['folder'] = 'Map';
$labels['folders'] = 'Mappen';
$labels['foldername'] = 'Naam';
-$labels['subscribed'] = 'Gebruiken';
$labels['messagecount'] = 'Berichten';
$labels['create'] = 'Aanmaken';
$labels['createfolder'] = 'Nieuwe map aanmaken';
-$labels['rename'] = 'Hernoemen';
-$labels['renamefolder'] = 'Hernoem map';
-$labels['deletefolder'] = 'Map verwijderen';
$labels['managefolders'] = 'Mappen beheren';
$labels['specialfolders'] = 'Speciale mappen';
$labels['sortby'] = 'Sorteren op';
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index 8739fa5..71fbb3d 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Bent u zeker dat u de geselecteerde bericht(en) wilt verwijderen?';
$messages['deletefolderconfirm'] = 'Weet u zeker dat u deze map wilt verwijderen?';
$messages['purgefolderconfirm'] = 'Bent u zeker dat u alle berichten in deze map wilt verwijderen?';
-$messages['foldercreating'] = 'Map aanmaken...';
$messages['folderdeleting'] = 'Map verwijderen...';
-$messages['folderrenaming'] = 'Map hernoemen...';
$messages['foldermoving'] = 'Map verplaatsen...';
$messages['formincomplete'] = 'Het formulier is niet volledig ingevuld...';
$messages['noemailwarning'] = 'Geef een geldig e-mailadres op...';
@@ -92,7 +90,6 @@
$messages['receiptsent'] = 'Ontvangstbevestiging verstuurd';
$messages['errorsendingreceipt'] = 'Kon de ontvangstbevestigign niet versturen';
$messages['nodeletelastidentity'] = 'U kunt dit laatste afzendadres niet verwijderen.';
-$messages['addsubfolderhint'] = 'De map wordt aangemaakt als submap van de geselecteerde map.';
$messages['forbiddencharacter'] = 'De naam van de map bevat een karakter dat niet is toegestaan';
$messages['selectimportfile'] = 'Selecteer een bestand om te uploaden';
$messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen-lezen';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 94f7b25..2485f0a 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -330,13 +330,9 @@
$labels['folder'] = 'Map';
$labels['folders'] = 'Mappen';
$labels['foldername'] = 'Mapnaam';
-$labels['subscribed'] = 'Geabonneerd';
$labels['messagecount'] = 'Berichten';
$labels['create'] = 'Nieuw';
$labels['createfolder'] = 'Maak nieuwe map';
-$labels['rename'] = 'Wijzig naam';
-$labels['renamefolder'] = 'Wijzig mapnaam';
-$labels['deletefolder'] = 'Verwijder map';
$labels['managefolders'] = 'Beheer mappen';
$labels['specialfolders'] = 'Speciale mappen';
$labels['sortby'] = 'Sorteer op';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 9fd802a..f83789d 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -58,9 +58,7 @@
$messages['deletemessagesconfirm'] = 'Weet u zeker dat u de geselecteerde bericht(en) wilt verwijderen?';
$messages['deletefolderconfirm'] = 'Weet u zeker dat u deze map wilt verwijderen?';
$messages['purgefolderconfirm'] = 'Weet u zeker dat u alle berichten in deze map wilt verwijderen?';
-$messages['foldercreating'] = 'Map aanmaken...';
$messages['folderdeleting'] = 'Map verwijderen...';
-$messages['folderrenaming'] = 'Mapnaam wijzigen...';
$messages['foldermoving'] = 'Map verplaatsen...';
$messages['formincomplete'] = 'Het formulier was niet volledig ingevuld';
$messages['noemailwarning'] = 'Geef een geldig e-mailadres op';
@@ -95,7 +93,6 @@
$messages['receiptsent'] = 'Ontvangstbevestiging is verstuurd';
$messages['errorsendingreceipt'] = 'Kan de ontvangstbevestiging niet versturen';
$messages['nodeletelastidentity'] = 'U kunt uw enige identiteit niet verwijderen';
-$messages['addsubfolderhint'] = 'Deze map zal worden aangemaakt onder de geselecteerde map';
$messages['forbiddencharacter'] = 'De naam van de map bevat een karakter dat niet is toegestaan';
$messages['selectimportfile'] = 'Selecteer een bestand om de uploaden';
$messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen lezen';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index 5f4a0a9..a26f157 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -306,13 +306,9 @@
$labels['folder'] = 'Mappe';
$labels['folders'] = 'Mapper';
$labels['foldername'] = 'Mappenamn';
-$labels['subscribed'] = 'Abonnert';
$labels['messagecount'] = 'Meldingar';
$labels['create'] = 'Opprette';
$labels['createfolder'] = 'Opprett ny mappe';
-$labels['rename'] = 'Gje nytt namn';
-$labels['renamefolder'] = 'Gje nytt namn til mappe';
-$labels['deletefolder'] = 'Slett mappe';
$labels['managefolders'] = 'Mappehandsaming';
$labels['specialfolders'] = 'Spesialmapper';
$labels['sortby'] = 'Sorter etter';
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index 904e3b6..1e181a2 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Sletta melding(ar)?';
$messages['deletefolderconfirm'] = 'Sletta mappa?';
$messages['purgefolderconfirm'] = 'Sletta alle meldingane i denne mappa?';
-$messages['foldercreating'] = 'Lagar mappe...';
$messages['folderdeleting'] = 'Slettar mappe...';
-$messages['folderrenaming'] = 'Endrar namn på mappe...';
$messages['foldermoving'] = 'Flyttar mappe...';
$messages['formincomplete'] = 'Fyll ut skjema';
$messages['noemailwarning'] = 'Skriv inn korrekt epostadresse';
@@ -92,7 +90,6 @@
$messages['receiptsent'] = 'Sende melding-er-lest-kvittering';
$messages['errorsendingreceipt'] = 'Kunne ikkje senda melding-er-lest-kvittering';
$messages['nodeletelastidentity'] = 'Du kan ikkje sletta denne identiteten, det er den siste.';
-$messages['addsubfolderhint'] = 'Denne mappa vert laga som ei undermappe til den du hev markert';
$messages['forbiddencharacter'] = 'Mappenamn inneheld eit teikn som ikkje er støtta';
$messages['selectimportfile'] = 'Vel ei fil til å lasta opp';
$messages['addresswriterror'] = 'Denne adresseboka er ikkje skrivbar';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 03eaa97..8c52cdf 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -315,13 +315,9 @@
$labels['folder'] = 'Folder';
$labels['folders'] = 'Foldery';
$labels['foldername'] = 'Nazwa folderu';
-$labels['subscribed'] = 'Zasubskrybowany';
$labels['messagecount'] = 'Wiadomości';
$labels['create'] = 'Utwórz';
$labels['createfolder'] = 'Utwórz nowy folder';
-$labels['rename'] = 'Zmień nazwę';
-$labels['renamefolder'] = 'Zmień nazwę folderu';
-$labels['deletefolder'] = 'Usuń folder';
$labels['managefolders'] = 'Zarządzaj folderami';
$labels['specialfolders'] = 'Foldery specjalne';
$labels['sortby'] = 'Sortuj wg';
@@ -365,5 +361,12 @@
$labels['reqdsn'] = 'Zawsze żądaj statusu dostarczenia (DSN)';
$labels['replysamefolder'] = 'Umieszczaj odpowiedzi w folderze wiadomości, na którą odpowiadam';
$labels['contactproperties'] = 'Właściwości';
+$labels['properties'] = 'Właściwości';
+$labels['folderproperties'] = 'Włąściwości folderu';
+$labels['parentfolder'] = 'Folder nadrzędny';
+$labels['location'] = 'Położenie';
+$labels['info'] = 'Informacje';
+$labels['getfoldersize'] = 'Kliknij aby pobrać rozmiar folderu';
+$labels['changesubscription'] = 'Kliknij aby zmienić subskrypcję';
?>
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 29749ca..128163a 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -60,9 +60,7 @@
$messages['deletemessagesconfirm'] = 'Czy na pewno chcesz usunąć wybrane wiadomości?';
$messages['deletefolderconfirm'] = 'Czy na pewno chcesz usunąć wybrany folder?';
$messages['purgefolderconfirm'] = 'Czy na pewno chcesz usunąć wszystkie wiadomości w tym folderze?';
-$messages['foldercreating'] = 'Dodawanie folderu...';
$messages['folderdeleting'] = 'Usuwanie folderu...';
-$messages['folderrenaming'] = 'Zmiana nazwy folderu...';
$messages['foldermoving'] = 'Przenoszenie folderu...';
$messages['formincomplete'] = 'Uzupełnij formularz!';
$messages['noemailwarning'] = 'Podaj poprawny adres e-mail!';
@@ -99,7 +97,6 @@
$messages['receiptsent'] = 'Pomyślnie wysłano potwierdzenie dostarczenia';
$messages['errorsendingreceipt'] = 'Nie można wysłać potwierdzenia';
$messages['nodeletelastidentity'] = 'Nie można skasować tej tożsamości, ponieważ jest ostatnią.';
-$messages['addsubfolderhint'] = 'Ten folder zostanie utworzony jako podfolder aktualnie wybranego.';
$messages['forbiddencharacter'] = 'Nazwa folderu zawiera niedozwolony znak';
$messages['selectimportfile'] = 'Proszę wybrać plik do wysłania';
$messages['addresswriterror'] = 'Wybrana książka adresowa jest tylko-do-odczytu';
@@ -133,5 +130,14 @@
$messages['messagecopied'] = 'Wiadomości zostały skopiowane';
$messages['messagemarked'] = 'Wiadomości zostały oznaczone';
$messages['autocompletechars'] = 'Wprowadź co najmniej $min znak(ów) aby skorzystać z autouzupełniania';
+$messages['foldersubscribing'] = 'Subskrybowanie folderu...';
+$messages['folderunsubscribing'] = 'Odsubskrybowanie folderu...';
+$messages['foldersubscribed'] = 'Folder pomyślnie zasubskrybowany';
+$messages['folderunsubscribed'] = 'Folder pomyślnie odsubskrybowany';
+$messages['folderpurged'] = 'Folder pomyślnie wyczyszczony';
+$messages['namecannotbeempty'] = 'Nazwa nie może być pusta';
+$messages['nametoolong'] = 'Name jest zbyt długa';
+$messages['folderupdated'] = 'Folder pomyślnie zaktualizowany';
+$messages['foldercreated'] = 'Folder pomyślnie utworzony';
?>
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index 7dd6430..9f61159 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -283,13 +283,9 @@
$labels['folder'] = 'پوښۍ ';
$labels['folders'] = 'پوښۍ';
$labels['foldername'] = 'پوښۍ نوم ';
-$labels['subscribed'] = 'ګډ شو ';
$labels['messagecount'] = 'استوزي ';
$labels['create'] = 'جوړول، رامنځ ته کول ';
$labels['createfolder'] = 'نوې پوښۍ جوړ کړه ';
-$labels['rename'] = 'بيانومول ';
-$labels['renamefolder'] = 'پوښۍ بيانومول ';
-$labels['deletefolder'] = 'پوښۍ ړنګول ';
$labels['managefolders'] = 'پوښيو څارل ';
$labels['specialfolders'] = 'ځانګړي پوښۍۍ';
diff --git a/program/localization/ps/messages.inc b/program/localization/ps/messages.inc
index c5aae6a..f29475c 100755
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -31,9 +31,7 @@
$messages['deletemessagesconfirm'] = 'په رښتيا سره غواړئ چې ټاکل شوي استوزيړنګ کړئ؟';
$messages['deletefolderconfirm'] = 'په رښتيآ سره غواړئ چې دا پوښۍ ړنګه کړئ؟';
$messages['purgefolderconfirm'] = 'په رښتيا سره غواړئ چې ددې پوښۍ ټول استوزيړنګ کړئ؟';
-$messages['foldercreating'] = 'پوښۍ جوړوي';
$messages['folderdeleting'] = 'پوښۍ ړنګوي';
-$messages['folderrenaming'] = 'پوښۍ بيانوموي';
$messages['foldermoving'] = 'پوښۍ خوځوي';
$messages['formincomplete'] = 'دا پورمه بشپړه ډکه شوې نه ده';
$messages['noemailwarning'] = 'مهرباني وکړئ د يوه شته برېښناليک پته ورځای کړئ';
@@ -66,7 +64,6 @@
$messages['receiptsent'] = 'يو لوستل شوی رسليک په بشپړه توګه واستول شو';
$messages['errorsendingreceipt'] = 'رسليک يې ونه شوای ليږلی';
$messages['nodeletelastidentity'] = 'تاسې نه شئ کولی چې دا پېژندنه ړنګه کړئ، داستاسو اخرنی پيژندنه ده';
-$messages['addsubfolderhint'] = 'دا پوښۍ د دويمۍ پوښۍ په توګه د ټاکل شوي اوسني ځای کې جوړشي';
$messages['forbiddencharacter'] = 'د پوښۍ نوم له فوربايډن تورو څخه جوړ دی';
$messages['selectimportfile'] = 'مهرباني وکړئيو فايل د پورته کولو لپاره وټاکئ';
$messages['addresswriterror'] = 'ټاکل شوی پتې کتاب د بياليکلو نه دی';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 27c5bb5..bd001d7 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -312,13 +312,9 @@
$labels['folder'] = 'Pasta';
$labels['folders'] = 'Pastas';
$labels['foldername'] = 'Nome da pasta';
-$labels['subscribed'] = 'Ativo';
$labels['messagecount'] = 'Mensagens';
$labels['create'] = 'Criar';
$labels['createfolder'] = 'Criar nova pasta';
-$labels['rename'] = 'Renomear';
-$labels['renamefolder'] = 'Renomear pasta';
-$labels['deletefolder'] = 'Apagar pasta';
$labels['managefolders'] = 'Gerenciar pastas';
$labels['specialfolders'] = 'Pastas especiais';
$labels['sortby'] = 'Ordenado por';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 8e4e39f..2fd9437 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -59,9 +59,7 @@
$messages['deletemessagesconfirm'] = 'Deseja realmente excluir a(s) mensagem(s) selecionada(s)?';
$messages['deletefolderconfirm'] = 'Deseja realmente excluir esta pasta?';
$messages['purgefolderconfirm'] = 'Deseja realmente excluir todas mensagens desta pasta?';
-$messages['foldercreating'] = 'Criando pasta...';
$messages['folderdeleting'] = 'Apagando pasta...';
-$messages['folderrenaming'] = 'Renomeando pasta...';
$messages['foldermoving'] = 'Movendo pasta...';
$messages['formincomplete'] = 'Os campos não foram completamente preenchidos';
$messages['noemailwarning'] = 'Por favor, informe um endereço de e-mail válido';
@@ -96,7 +94,6 @@
$messages['receiptsent'] = 'Confirmação de recebimento enviada com sucesso';
$messages['errorsendingreceipt'] = 'Não foi possível enviar a confirmação de recebimento';
$messages['nodeletelastidentity'] = 'Você não pode excluir a única identidade';
-$messages['addsubfolderhint'] = 'Esta pasta será criada como uma sub-pasta da que está selecionada';
$messages['forbiddencharacter'] = 'O nome da pasta contém um caractere não permitido';
$messages['selectimportfile'] = 'Selecione o arquivo para envio';
$messages['addresswriterror'] = 'O catálogo de endereços selecionado não tem permissão de modificação';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 0202eb3..4b1d7bd 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -330,13 +330,9 @@
$labels['folder'] = 'Pasta';
$labels['folders'] = 'Pastas';
$labels['foldername'] = 'Nome da pasta';
-$labels['subscribed'] = 'Subscrita';
$labels['messagecount'] = 'Mensagens';
$labels['create'] = 'Criar';
$labels['createfolder'] = 'Criar nova pasta';
-$labels['rename'] = 'Renomear';
-$labels['renamefolder'] = 'Renomear pasta';
-$labels['deletefolder'] = 'Eliminar pasta';
$labels['managefolders'] = 'Gerir pastas';
$labels['specialfolders'] = 'Pastas especiais (predefinidas)';
$labels['sortby'] = 'Ordenar por';
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index 511a2ed..04621ed 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -58,9 +58,7 @@
$messages['deletemessagesconfirm'] = 'Deseja realmente eliminar a(s) mensagem(ns) selecionada(s)?';
$messages['deletefolderconfirm'] = 'Deseja realmente eliminar esta pasta?';
$messages['purgefolderconfirm'] = 'Deseja realmente eliminar todas mensagens desta pasta?';
-$messages['foldercreating'] = 'A criar pasta...';
$messages['folderdeleting'] = 'A eliminar pasta...';
-$messages['folderrenaming'] = 'A renomear pasta...';
$messages['foldermoving'] = 'A mover pasta...';
$messages['formincomplete'] = 'Os campos não foram completamente preenchidos';
$messages['noemailwarning'] = 'Por favor escreva um endereço de e-mail válido';
@@ -97,7 +95,6 @@
$messages['receiptsent'] = 'Recibo de leitura enviadocom sucesso';
$messages['errorsendingreceipt'] = 'Não foi possível enviar o recibo';
$messages['nodeletelastidentity'] = 'Esta é a última identidade, não é possível eliminá-la.';
-$messages['addsubfolderhint'] = 'Esta pasta será criada como uma sub-pasta da que está seleccionada';
$messages['forbiddencharacter'] = 'O nome da pasta contém um caractere inválido';
$messages['selectimportfile'] = 'Por favor seleccione um ficheiro para carregar';
$messages['addresswriterror'] = 'Não é possível escrever no livro de endereços seleccionado';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 6f77b1f..99506cd 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -306,13 +306,9 @@
$labels['folder'] = 'Dosar';
$labels['folders'] = 'Dosare';
$labels['foldername'] = 'Nume dosar';
-$labels['subscribed'] = 'Înscris';
$labels['messagecount'] = 'Mesaje';
$labels['create'] = 'Creează';
$labels['createfolder'] = 'Creează dosar nou';
-$labels['rename'] = 'Redenumeşte';
-$labels['renamefolder'] = 'Redenumeşte dosar';
-$labels['deletefolder'] = 'Şterge dosar';
$labels['managefolders'] = 'Administrează dosare';
$labels['specialfolders'] = 'Dosare speciale';
$labels['sortby'] = 'Sortează după';
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 8027f42..8ced7d2 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Chiar doriţi să ştergeţi mesajele selectate ?';
$messages['deletefolderconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi acest dosar?';
$messages['purgefolderconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi toate mesajele din acest dosar?';
-$messages['foldercreating'] = 'Se creează dosarul...';
$messages['folderdeleting'] = 'Se şterge dosarul...';
-$messages['folderrenaming'] = 'Se redenumeşte dosarul...';
$messages['foldermoving'] = 'Se mută dosarul...';
$messages['formincomplete'] = 'Formularul nu a fost completat corect';
$messages['noemailwarning'] = 'Vă rugăm să introduceţi o adresă de e-mail validă';
@@ -92,7 +90,6 @@
$messages['receiptsent'] = 'Confirmarea de citire a fost trimisă cu succes';
$messages['errorsendingreceipt'] = 'Confirmarea nu a putut fi trimisă';
$messages['nodeletelastidentity'] = 'Nu puteţi şterge această identitate, este ultima.';
-$messages['addsubfolderhint'] = 'Acest dosar va fi creat ca subdosar al celui selectat.';
$messages['forbiddencharacter'] = 'Numele dosarului conţine un caracter nepermis.';
$messages['selectimportfile'] = 'Va rugăm să selectaţi fişierul pentru încărcare';
$messages['addresswriterror'] = 'Agenda selectată nu poate fi actualizată';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 922f71d..ac84f73 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -328,13 +328,9 @@
$labels['folder'] = 'Папка';
$labels['folders'] = 'Папки';
$labels['foldername'] = 'Имя папки';
-$labels['subscribed'] = 'Подписан';
$labels['messagecount'] = 'Сообщения';
$labels['create'] = 'Создать';
$labels['createfolder'] = 'Создать новую папку';
-$labels['rename'] = 'Переименовать';
-$labels['renamefolder'] = 'Переименовать папку';
-$labels['deletefolder'] = 'Удалить папку';
$labels['managefolders'] = 'Управление папками';
$labels['specialfolders'] = 'Особые папки';
$labels['sortby'] = 'Сортировать по';
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index 75c6d77..f37c078 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -56,9 +56,7 @@
$messages['deletemessagesconfirm'] = 'Вы действительно хотите удалить выбранные сообщения?';
$messages['deletefolderconfirm'] = 'Вы действительно хотите удалить эту папку?';
$messages['purgefolderconfirm'] = 'Вы действительно хотите удалить все сообщения в этой папке?';
-$messages['foldercreating'] = 'Создание папки...';
$messages['folderdeleting'] = 'Удаление папки...';
-$messages['folderrenaming'] = 'Переименование папки...';
$messages['foldermoving'] = 'Перемещение папки...';
$messages['formincomplete'] = 'Заполнены не все поля';
$messages['noemailwarning'] = 'Пожалуйста, введите корректный адрес электронной почты';
@@ -95,7 +93,6 @@
$messages['receiptsent'] = 'Уведомление о прочтении отправлено';
$messages['errorsendingreceipt'] = 'Уведомление о прочтении не отправлено';
$messages['nodeletelastidentity'] = 'Вы не можете удалить этот профиль, он у вас последний';
-$messages['addsubfolderhint'] = 'Эта папка будет создана как подпапка в текущей папке';
$messages['forbiddencharacter'] = 'Имя папки содержит недопустимые символы';
$messages['selectimportfile'] = 'Выберите файл для загрузки';
$messages['addresswriterror'] = 'Выбранная адресная книга недоступна для записи';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 632b967..58a3fe9 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -175,13 +175,9 @@
$labels['folder'] = 'ෆෝල්ඩරය';
$labels['folders'] = 'ෆෝල්ඩර';
$labels['foldername'] = 'ෆෝල්ඩරයේ නම';
-$labels['subscribed'] = 'සාමාජික';
$labels['messagecount'] = 'පනිවුඩ';
$labels['create'] = 'සෑදීම';
$labels['createfolder'] = 'අඵත් ෆෝල්ඩරයක් සෑදීම';
-$labels['rename'] = 'නැවත නම් කිරීම';
-$labels['renamefolder'] = 'ෆෝල්ඩරය නැවත නම් කිරීම';
-$labels['deletefolder'] = 'ෆෝල්ඩරය මකා දැමීම';
$labels['managefolders'] = 'හැසිරවීම හැසිරවීම';
$labels['sortby'] = 'චිසින් වර්ග කිරීම';
$labels['sortasc'] = 'ආරෝහණ වර්ග කිරීම';
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index 61a0b42..0a5a5fc 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -76,6 +76,5 @@
$messages['receiptsent'] = 'කියවීම් භාර ගැනීම සාර්ථකව යවන ලදී';
$messages['errorsendingreceipt'] = 'කියවීම් භාර ගැනීම යැවීමට නොහැක';
$messages['nodeletelastidentity'] = 'අවසාන අනන්යතාවය මකා දැමිය නොහැක';
-$messages['addsubfolderhint'] = 'ෆෝල්ඩරය දැනට තෝරාගෙන ඇති ෆෝල්ඩරයෙහි අනු ෆෝල්ඩරයක් ලෙස සෑදේ';
?>
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index e2c22e0..7d6e236 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -314,13 +314,9 @@
$labels['folder'] = 'Priečinok';
$labels['folders'] = 'Priečinky';
$labels['foldername'] = 'Názov priečinku';
-$labels['subscribed'] = 'Prihlásený k odberu';
$labels['messagecount'] = 'Počet správ';
$labels['create'] = 'Vytvoriť';
$labels['createfolder'] = 'Vytvor nový priečinok';
-$labels['rename'] = 'Premenovať';
-$labels['renamefolder'] = 'Premenovať priečinok';
-$labels['deletefolder'] = 'Zmazať priečinok';
$labels['managefolders'] = 'Spravovať priečinky';
$labels['specialfolders'] = 'Špeciálne priečinky';
$labels['sortby'] = 'Triediť podľa';
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index 4476fd7..315038f 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -57,9 +57,7 @@
$messages['deletemessagesconfirm'] = 'Ste si istý, že chcete zmazať zvolenú(é) správu(y)?';
$messages['deletefolderconfirm'] = 'Ste si istý, že chcete zmazať tento priečinok?';
$messages['purgefolderconfirm'] = 'Ste si istý, že chcete zmazať všetky správy v tomto priečinku?';
-$messages['foldercreating'] = 'Vytvára sa priečinok ...';
$messages['folderdeleting'] = 'Odstraňuje sa priečinok ...';
-$messages['folderrenaming'] = 'Mení sa názov priečinka ...';
$messages['foldermoving'] = 'Prečinok sa presúva ...';
$messages['formincomplete'] = 'Formulár nie je kompletne vyplnený';
$messages['noemailwarning'] = 'Prosím, vložte platnú emailovú adresu';
@@ -94,7 +92,6 @@
$messages['receiptsent'] = 'Potvrdenie o prijatí správy bolo odoslané';
$messages['errorsendingreceipt'] = 'Potvrdenie o prijatí správy sa nedalo odoslať';
$messages['nodeletelastidentity'] = 'Identita sa nedá odstrániť, je posledná a musí zostať.';
-$messages['addsubfolderhint'] = 'Tento priečinok bude vytvorený ako podpriečinok aktuálne zvoleného priečinka';
$messages['forbiddencharacter'] = 'Názov priečinka obsahuje nepovolený znak';
$messages['selectimportfile'] = 'Zvoľte súbor, ktorý chcete načítať';
$messages['addresswriterror'] = 'Zvolený adresár kontaktov je iba na čítanie';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index 8b90a00..82078df 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -325,13 +325,9 @@
$labels['folder'] = 'Mapa';
$labels['folders'] = 'Mape';
$labels['foldername'] = 'Ime mape';
-$labels['subscribed'] = 'Vpisan';
$labels['messagecount'] = 'Sporočila';
$labels['create'] = 'Ustvari';
$labels['createfolder'] = 'Ustvari novo mapo';
-$labels['rename'] = 'Preimenuj';
-$labels['renamefolder'] = 'Preimenuj mapo';
-$labels['deletefolder'] = 'Izbriši mapo';
$labels['managefolders'] = 'Uredi mape';
$labels['specialfolders'] = 'Posebne mape';
$labels['sortby'] = 'Uredi po';
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index 7570919..6896858 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -52,9 +52,7 @@
$messages['deletemessagesconfirm'] = 'Ste prepričani, da želite izbrisati označeno(a) sporočilo(a)?';
$messages['deletefolderconfirm'] = 'Ste prepričani, da želite to mapo izbrisati?';
$messages['purgefolderconfirm'] = 'Ste prepričani, da želite izbrisati vsa sporočila v mapi?';
-$messages['foldercreating'] = 'Ustvarjanje mape...';
$messages['folderdeleting'] = 'Brisanje mape...';
-$messages['folderrenaming'] = 'Preimenovanje mape...';
$messages['foldermoving'] = 'Premikanje mape...';
$messages['formincomplete'] = 'Obrazec ni v celoti izpolnjen';
$messages['noemailwarning'] = 'Vnesite veljaven elektronski naslov';
@@ -89,7 +87,6 @@
$messages['receiptsent'] = 'Sporočilo o branju je bilo uspešno poslano';
$messages['errorsendingreceipt'] = 'Sporočila o branju ni bilo mogoče poslati';
$messages['nodeletelastidentity'] = 'Te identitete ni mogoče izbrisati, saj je edina.';
-$messages['addsubfolderhint'] = 'Ta mapa bo ustvarjena kot podmapa od izbrane mape.';
$messages['forbiddencharacter'] = 'Ime mape vsebuje nedovoljen znak';
$messages['selectimportfile'] = 'Izberite datoteko, ki jo želite prenesti';
$messages['addresswriterror'] = 'Izbran imenik ni zapisljiv';
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index 2e0f437..4863e18 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -176,13 +176,9 @@
$labels['folder'] = 'Kutia';
$labels['folders'] = 'Kutitë';
$labels['foldername'] = 'Emër kutie';
-$labels['subscribed'] = 'Regjistruar';
$labels['messagecount'] = 'Mesazhe';
$labels['create'] = 'Krijo';
$labels['createfolder'] = 'Krijo kuti të re';
-$labels['rename'] = 'Riemëro';
-$labels['renamefolder'] = 'Riemëro kutinë';
-$labels['deletefolder'] = 'Fshi kutinë';
$labels['managefolders'] = 'Sistemo kutitë';
$labels['sortby'] = 'Rradhit sipas';
$labels['sortasc'] = 'Rradhitje rritëse';
diff --git a/program/localization/sq_AL/messages.inc b/program/localization/sq_AL/messages.inc
index d5bcad6..4af0b1b 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -77,6 +77,5 @@
$messages['receiptsent'] = 'U dërgua me sukses një njoftim leximi';
$messages['errorsendingreceipt'] = 'Nuk mund të dërgohet njoftimi';
$messages['nodeletelastidentity'] = 'Ju nuk mund ta fshini këtë identitet sepse nuk ju ka mbetur tjetër.';
-$messages['addsubfolderhint'] = 'Kjo kuti do të krijohet si një nënkuti e asaj që është e zgjedhur';
?>
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 780e6d6..45ad694 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -176,13 +176,9 @@
$labels['folder'] = 'Фасцикла';
$labels['folders'] = 'Фасцикле';
$labels['foldername'] = 'Име фасцикле';
-$labels['subscribed'] = 'Потписана';
$labels['messagecount'] = 'Поруке';
$labels['create'] = 'Креирај';
$labels['createfolder'] = 'Креирај нову фасциклу';
-$labels['rename'] = 'Преименуј';
-$labels['renamefolder'] = 'Преименуј фасциклу';
-$labels['deletefolder'] = 'Обриши фасциклу';
$labels['managefolders'] = 'Подеси фасциклу';
$labels['sortby'] = 'Сортирај по';
$labels['sortasc'] = 'Сортирај растуће';
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 4756b5c..76f178c 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -77,6 +77,5 @@
$messages['receiptsent'] = 'Успешно послато обавештење о приспећу';
$messages['errorsendingreceipt'] = 'Неуспело слање обавештења о приспећу';
$messages['nodeletelastidentity'] = 'Не можете обрисати овај идентитет, он Вам је последњи.';
-$messages['addsubfolderhint'] = 'Ова фасцикла ће бити креирана као подфасцикла тренутне';
?>
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 518c84e..20a29d7 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -328,13 +328,9 @@
$labels['folder'] = 'Katalog';
$labels['folders'] = 'Kataloger';
$labels['foldername'] = 'Katalognamn';
-$labels['subscribed'] = 'Ansluten';
$labels['messagecount'] = 'Meddelanden';
$labels['create'] = 'Skapa';
$labels['createfolder'] = 'Ny katalog';
-$labels['rename'] = 'Ändra namn';
-$labels['renamefolder'] = 'Ändra katalognamn';
-$labels['deletefolder'] = 'Radera katalog';
$labels['managefolders'] = 'Hantera kataloger';
$labels['specialfolders'] = 'Speciella kataloger';
$labels['sortby'] = 'Sortera på';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 49778b3..6e2a419 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -57,9 +57,7 @@
$messages['deletemessagesconfirm'] = 'Vill du verkligen ta bort valda meddelanden?';
$messages['deletefolderconfirm'] = 'Vill du verkligen radera den här katalogen?';
$messages['purgefolderconfirm'] = 'Vill du verkligen radera alla meddelanden i den här katalogen?';
-$messages['foldercreating'] = 'Skapar katalog...';
$messages['folderdeleting'] = 'Raderar katalog...';
-$messages['folderrenaming'] = 'Namnändrar katalog...';
$messages['foldermoving'] = 'Flyttar katalog...';
$messages['formincomplete'] = 'Formuläret var inte ifyllt i sin helhet';
$messages['noemailwarning'] = 'Vänligen ange en giltig adress';
@@ -96,7 +94,6 @@
$messages['receiptsent'] = 'Mottagarkvitto har skickats';
$messages['errorsendingreceipt'] = 'Kunde inte skicka mottagarkvitto';
$messages['nodeletelastidentity'] = 'Du kan inte radera den här identiteten, det är din sista.';
-$messages['addsubfolderhint'] = 'Den här katalogen kommer att skapas som en underkatalog till den valda';
$messages['forbiddencharacter'] = 'Katalognamnet innehåller otillåtna tecken';
$messages['selectimportfile'] = 'Välj en fil att ladda upp';
$messages['addresswriterror'] = 'Angiven adressbok är skrivskyddad';
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index 9492ad9..4789d6f 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -268,13 +268,9 @@
$labels['folder'] = 'அடைவு';
$labels['folders'] = 'அடைவுகள்';
$labels['foldername'] = 'அடைவு பெயர்';
-$labels['subscribed'] = 'சந்தா';
$labels['messagecount'] = 'செய்திகள்';
$labels['create'] = 'உருவாக்கு';
$labels['createfolder'] = 'புது அடைவு உருவாக்கு';
-$labels['rename'] = 'மறுபெயரிடு';
-$labels['renamefolder'] = 'அடைவை மறுபெயரிடு';
-$labels['deletefolder'] = 'அடைவை நீக்கு';
$labels['managefolders'] = 'அடைவுகளை நிற்வகி';
$labels['specialfolders'] = 'சிறப்பு அடைவுகள்';
$labels['sortby'] = 'வாரியாக அடுக்கு';
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index 40684a5..7f722f6 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -50,9 +50,7 @@
$messages['deletemessagesconfirm'] = 'நீங்கள் தேர்ந்தெடுத்த செய்திகளை நீக்க விரும்புகிறீர்களா ?';
$messages['deletefolderconfirm'] = 'நீங்கள் இந்த அடைவை நீக்க விரும்புகிறீர்களா ?';
$messages['purgefolderconfirm'] = 'நீங்கள் இந்த அடைவிலிருக்கும் எல்லா செய்திகளையும் நீக்க விரும்புகிறீர்களா ?';
-$messages['foldercreating'] = 'அடைவை உருவாக்குகிறது...';
$messages['folderdeleting'] = 'அடைவை நீக்குகிறது...';
-$messages['folderrenaming'] = 'அடைவை மறுபெயரிடுகிறது...';
$messages['foldermoving'] = 'அடைவை நகர்த்துகிறது...';
$messages['formincomplete'] = 'விண்ணப்பத்தை முழுமையாக நிறைவு செய்யவில்லை';
$messages['noemailwarning'] = 'தயவு செய்து உண்மையான மின்னஞ்சலை எழுதுங்கள்';
@@ -86,7 +84,6 @@
$messages['receiptsent'] = 'படித்த சீட்டு வெற்றிகரமாக அனுப்பப்பட்டது';
$messages['errorsendingreceipt'] = 'சீட்டை அனுப்ப முடியவில்லை';
$messages['nodeletelastidentity'] = 'நீங்கள் இந்த அடையாளத்தை நீக்க முடியாது இது தான் கடைசி';
-$messages['addsubfolderhint'] = 'இந்த அடைவு இப்போது தேர்ந்தெடுக்கப்பட்டதன் துணை அடைவாக உருவாக்கப்படும்';
$messages['forbiddencharacter'] = 'அடைவு பெயரில் தடை செய்யப்பட்ட எழுத்துக்கள் உள்ளது';
$messages['selectimportfile'] = 'தயவு செய்து ஏற்றுவதற்கு ஒரு கோப்பை தேர்ந்தெடுங்கள்';
$messages['addresswriterror'] = 'நீங்கள் தேர்ந்தெடுத்த தொடர்புகளில் எழுத முடியாது';
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index 4daa87b..a3f636c 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -159,12 +159,8 @@
$labels['folder'] = 'กล่องจดหมาย';
$labels['folders'] = 'กล่องจดหมาย';
$labels['foldername'] = 'ชื่อกล่องจดหมาย';
-$labels['subscribed'] = 'ลงชื่อ';
$labels['create'] = 'สร้าง';
$labels['createfolder'] = 'สร้างกล่องจดหมาย';
-$labels['rename'] = 'เปลื่ยนชื่อ';
-$labels['renamefolder'] = 'เปลี่ยนชื่อกล่องจดหมาย';
-$labels['deletefolder'] = 'ลบกล่องจดหมาย';
$labels['managefolders'] = 'จัดการกล่องจดหมาย';
$labels['sortby'] = 'เรียงตาม';
$labels['sortasc'] = 'เรียงจากหน้าไปหลัง';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index fc1e0bd..12aea8f 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -309,13 +309,9 @@
$labels['folder'] = 'Klasör';
$labels['folders'] = 'Klasörler';
$labels['foldername'] = 'Klasör ismi';
-$labels['subscribed'] = 'Abonelik';
$labels['messagecount'] = 'Postalar';
$labels['create'] = 'Oluştur';
$labels['createfolder'] = 'Yeni klasör oluştur';
-$labels['rename'] = 'Yeniden adlandır';
-$labels['renamefolder'] = 'Klasörü yeniden adlandır';
-$labels['deletefolder'] = 'Klasörü sil';
$labels['managefolders'] = 'Klasörleri düzenle';
$labels['specialfolders'] = 'Özel klasörler';
$labels['sortby'] = 'Sırala';
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index 2d057d3..bab1490 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Seçili postaları silmek istediğinizden emin misiniz?';
$messages['deletefolderconfirm'] = 'Bu klasörü silmek istediğinizden emin misiniz?';
$messages['purgefolderconfirm'] = 'Bu klasördeki tüm postaları silmek istediğinizden emin misiniz?';
-$messages['foldercreating'] = 'Klasör oluştuluyor...';
$messages['folderdeleting'] = 'Klasör siliniyor...';
-$messages['folderrenaming'] = 'Klasör yeniden adlandırılıyor...';
$messages['foldermoving'] = 'Klasör taşınıyor...';
$messages['formincomplete'] = 'Form tam olarak doldurulmadı';
$messages['noemailwarning'] = 'Lütfen geçerli bir e-posta adresi girin';
@@ -92,7 +90,6 @@
$messages['receiptsent'] = 'Okundu onayı gönderildi';
$messages['errorsendingreceipt'] = 'Okundu onayı gönderilemedi';
$messages['nodeletelastidentity'] = 'Son kimliğiniz olduğu için bu kimliği silemezsiniz';
-$messages['addsubfolderhint'] = 'Bu klasör, şu an seçili olanın alt klasörü olarak oluşturulacak';
$messages['forbiddencharacter'] = 'Klasör ismi yasaklanmış bir karakter içeriyor';
$messages['selectimportfile'] = 'Lütfen yüklenecek dosyayı seçin';
$messages['addresswriterror'] = 'Seçili adres defterine yazılamaz';
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index 224608f..637c1d5 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -326,13 +326,9 @@
$labels['folder'] = 'Папка';
$labels['folders'] = 'Папки';
$labels['foldername'] = 'Назва папки';
-$labels['subscribed'] = 'Підписані';
$labels['messagecount'] = 'Листи';
$labels['create'] = 'Створити';
$labels['createfolder'] = 'Створити нову папку';
-$labels['rename'] = 'Перейменувати';
-$labels['renamefolder'] = 'Перейменувати папку';
-$labels['deletefolder'] = 'Видалити папку';
$labels['managefolders'] = 'Керування папками';
$labels['specialfolders'] = 'Особливі папки';
$labels['sortby'] = 'Відсортувати за';
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index 780e222..c917c31 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = 'Ви дійсно бажаєте видалити вибрані листи?';
$messages['deletefolderconfirm'] = 'Ви дійсно бажаєте видалити цю папку?';
$messages['purgefolderconfirm'] = 'Ви дійсно бажаєте видалити всі листи у цій папці?';
-$messages['foldercreating'] = 'Створення папки...';
$messages['folderdeleting'] = 'Видалення папки...';
-$messages['folderrenaming'] = 'Перейменування папки...';
$messages['foldermoving'] = 'Переміщення папки...';
$messages['formincomplete'] = 'Заповнено не всі поля';
$messages['noemailwarning'] = 'Будь ласка, введіть коректну адресу електронної пошти';
@@ -94,7 +92,6 @@
$messages['receiptsent'] = 'Повідомлення про прочитання відправлено';
$messages['errorsendingreceipt'] = 'Не вдалося відправити повідомлення про прочитання';
$messages['nodeletelastidentity'] = 'Ви не можете видалити цей профіль, він у Вас останній.';
-$messages['addsubfolderhint'] = 'Цю папку буде створено як підпапку в поточній.';
$messages['forbiddencharacter'] = 'Ім\'я папки містить заборонені символи';
$messages['selectimportfile'] = 'Виберіть файл для завантаження';
$messages['addresswriterror'] = 'Обрана адресна книга недоступна для запису';
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index 611b5a4..5aa0e04 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -202,12 +202,8 @@
$labels['folder'] = 'Thư mục';
$labels['folders'] = 'Thư mục';
$labels['foldername'] = 'Tên thư mục';
-$labels['subscribed'] = 'Cho sử dụng';
$labels['create'] = 'Tạo';
$labels['createfolder'] = 'Tạo thư mục mới';
-$labels['rename'] = 'Đổi tên';
-$labels['renamefolder'] = 'Đổi tên thư mục';
-$labels['deletefolder'] = 'Xóa thư mục';
$labels['managefolders'] = 'Quản trị thư mục';
$labels['sortby'] = 'Sắp xếp';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index acebdf7..dff93a4 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -307,13 +307,9 @@
$labels['folder'] = '邮件夹';
$labels['folders'] = '邮件夹';
$labels['foldername'] = '邮件夹名称';
-$labels['subscribed'] = '已订阅';
$labels['messagecount'] = '邮件数量';
$labels['create'] = '建立';
$labels['createfolder'] = '建立新邮件夹';
-$labels['rename'] = '重命名';
-$labels['renamefolder'] = '重命名邮件夹';
-$labels['deletefolder'] = '删除邮件夹';
$labels['managefolders'] = '管理邮件夹';
$labels['specialfolders'] = '指定邮件夹';
$labels['sortby'] = '排序';
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 5fc0d3f..dbe5af5 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -55,9 +55,7 @@
$messages['deletemessagesconfirm'] = '确定要删除已选中的邮件？';
$messages['deletefolderconfirm'] = '确定要删除已选中的邮件夹？';
$messages['purgefolderconfirm'] = '是否确认要删除当前邮件夹中的所有邮件？';
-$messages['foldercreating'] = '正在创建邮件夹';
$messages['folderdeleting'] = '正在删除邮件夹';
-$messages['folderrenaming'] = '正在重命名邮件夹';
$messages['foldermoving'] = '正在移动目录...';
$messages['formincomplete'] = '当前表单未填写完整，请完整填写';
$messages['noemailwarning'] = '请输入一个有效的邮件地址';
@@ -92,7 +90,6 @@
$messages['receiptsent'] = '成功发送了一个已读回执';
$messages['errorsendingreceipt'] = '无法发送回执';
$messages['nodeletelastidentity'] = '无法删除这个身份，这是最后一个。';
-$messages['addsubfolderhint'] = '新建的文件夹将成为所选文件夹的子文件夹';
$messages['forbiddencharacter'] = '目录名包含隐藏字符';
$messages['selectimportfile'] = '请选择要上传的文件';
$messages['addresswriterror'] = '已选择的地址簿不可写';
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index c05622e..632c944 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -328,13 +328,9 @@
$labels['folder'] = '資料夾';
$labels['folders'] = '資料夾';
$labels['foldername'] = '資料夾名稱';
-$labels['subscribed'] = '顯示';
$labels['messagecount'] = '郵件數目';
$labels['create'] = '建立';
$labels['createfolder'] = '建立新資料夾';
-$labels['rename'] = '重新命名';
-$labels['renamefolder'] = '重新命名資料夾';
-$labels['deletefolder'] = '刪除資料夾';
$labels['managefolders'] = '管理資料夾';
$labels['specialfolders'] = '預設資料夾設定';
$labels['sortby'] = '排序';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 735fd50..68c543f 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -57,9 +57,7 @@
$messages['deletemessagesconfirm'] = '你確定要刪除已選擇的郵件？';
$messages['deletefolderconfirm'] = '你確定要刪除這個資料夾嗎？';
$messages['purgefolderconfirm'] = '你確定要刪除這個資料夾裡面所有的郵件嗎？';
-$messages['foldercreating'] = '建立資料夾中...';
$messages['folderdeleting'] = '刪除資料夾中...';
-$messages['folderrenaming'] = '重新命名資料夾中...';
$messages['foldermoving'] = '移動資料夾中...';
$messages['formincomplete'] = '這個表單有部分未填，請完整填寫';
$messages['noemailwarning'] = '請輸入一個有效的電子郵件位址';
@@ -96,7 +94,6 @@
$messages['receiptsent'] = '閱讀回條傳送成功';
$messages['errorsendingreceipt'] = '無法傳送回條';
$messages['nodeletelastidentity'] = '你不能刪除此身份，因為只剩一個身份。';
-$messages['addsubfolderhint'] = '此資料夾會成為目前所選資料夾的子資料夾';
$messages['forbiddencharacter'] = '資料夾名稱中包含非法的字元';
$messages['selectimportfile'] = '請選擇一個上傳的檔案';
$messages['addresswriterror'] = '無法寫入選擇的通訊錄';
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 4803956..9e485eb 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -436,65 +436,6 @@
}
-function rcmail_quota_display($attrib)
- {
- global $OUTPUT;
-
- if (!$attrib['id'])
- $attrib['id'] = 'rcmquotadisplay';
-
- if(isset($attrib['display']))
- $_SESSION['quota_display'] = $attrib['display'];
-
- $OUTPUT->add_gui_object('quotadisplay', $attrib['id']);
-
- $quota = rcmail_quota_content($attrib);
-
- $OUTPUT->add_script('$(document).ready(function(){
- rcmail.set_quota('.json_serialize($quota).')});', 'foot');
-
- return html::span($attrib, '');
- }
-
-
-function rcmail_quota_content($attrib=NULL)
- {
- global $COMM_PATH, $RCMAIL;
-
- $quota = $RCMAIL->imap->get_quota();
- $quota = $RCMAIL->plugins->exec_hook('quota', $quota);
-
- $quota_result = (array) $quota;
- $quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
-
- if (!$quota['total'] && $RCMAIL->config->get('quota_zero_as_unlimited')) {
- $quota_result['title'] = rcube_label('unlimited');
- $quota_result['percent'] = 0;
- }
- else if ($quota['total']) {
- if (!isset($quota['percent']))
- $quota_result['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100));
-
- $title = sprintf('%s / %s (%.0f%%)',
- show_bytes($quota['used'] * 1024), show_bytes($quota['total'] * 1024),
- $quota_result['percent']);
-
- $quota_result['title'] = $title;
-
- if ($attrib['width'])
- $quota_result['width'] = $attrib['width'];
- if ($attrib['height'])
- $quota_result['height'] = $attrib['height'];
- }
- else {
- $quota_result['title'] = rcube_label('unknown');
- $quota_result['percent'] = 0;
- }
-
- return $quota_result;
- }
-
-
function rcmail_get_messagecount_text($count=NULL, $page=NULL)
{
global $RCMAIL, $IMAP;
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
new file mode 100644
index 0000000..3a7c0d9
--- /dev/null
+++ b/program/steps/settings/edit_folder.inc
@@ -0,0 +1,294 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/settings/edit_folder.inc |
+ | |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
+ | Licensed under the GNU GPL |
+ | |
+ | PURPOSE: |
+ | Provide functionality to create/edit a folder |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl> |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+// WARNING: folder names in UI are encoded with RCMAIL_CHARSET
+
+// init IMAP connection
+$RCMAIL->imap_connect();
+
+function rcube_folder_form($attrib)
+{
+ global $RCMAIL;
+
+ // edited folder name (empty in create-folder mode)
+ $mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true));
+ $mbox_imap = rcube_charset_convert($mbox, RCMAIL_CHARSET, 'UTF7-IMAP');
+
+ // predefined path for new folder
+ $parent = trim(get_input_value('_path', RCUBE_INPUT_GPC, true));
+ $parent_imap = rcube_charset_convert($parent, RCMAIL_CHARSET, 'UTF7-IMAP');
+
+ $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
+ $special = (strlen($mbox_imap) && in_array($mbox_imap, (array) $RCMAIL->config->get('default_imap_folders')));
+ $protected = ($special && $RCMAIL->config->get('protect_default_folders'));
+ $threading_supported = $RCMAIL->imap->get_capability('thread=references')
+ || $IMAP->get_capability('thread=orderedsubject')
+ || $IMAP->get_capability('thread=refs');
+
+ // Get mailbox stats (messages count, etc.), mailbox name and parent
+ if (strlen($mbox)) {
+ $msgcount = $RCMAIL->imap->messagecount($mbox_imap, 'ALL', true, false);
+
+ $path = explode($delimiter, $mbox_imap);
+ $folder = array_pop($path);
+ $path = implode($delimiter, $path);
+
+ $folder = rcube_charset_convert($folder, 'UTF7-IMAP');
+
+ $hidden_fields = array('name' => '_mbox', 'value' => $mbox);
+ }
+ else {
+ $path = $parent_imap;
+ }
+
+ $form = array();
+
+ // General tab
+ $form['props'] = array(
+ 'name' => rcube_label('properties'),
+ );
+
+ // Location (name)
+ if ($protected)
+ $foldername = rcmail_localize_foldername($mbox_imap);
+ else {
+ if (isset($_POST['_name']))
+ $folder = trim(get_input_value('_name', RCUBE_INPUT_POST, true));
+
+ $foldername = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30));
+ $foldername = $foldername->show($folder);
+
+ if ($special)
+ $foldername .= ' (' . rcmail_localize_foldername($mbox_imap) .')';
+ }
+
+ $form['props']['fieldsets']['location'] = array(
+ 'name' => rcube_label('location'),
+ 'content' => array(
+ 'name' => array(
+ 'label' => rcube_label('foldername'),
+ 'value' => $foldername,
+ ),
+ ),
+ );
+
+ if (strlen($path)) {
+ $radio1 = new html_radiobutton(array('name' => '_parent', 'value' => ''));
+ $radio2 = new html_radiobutton(array('name' => '_parent', 'value' => $path));
+ $selected = isset($_POST['_parent']) ? $_POST['_parent'] : $path;
+
+ $html_path = str_replace($delimiter, ' » ', rcmail_localize_folderpath($path));
+
+ $folderpath = $radio1->show($selected) . Q(rcube_label('none')) . ' '
+ .$radio2->show($selected) . Q($html_path);
+
+ $form['props']['fieldsets']['location']['content']['path'] = array(
+ 'label' => rcube_label('parentfolder'),
+ 'value' => $folderpath,
+ );
+ }
+
+ // Settings
+ $form['props']['fieldsets']['settings'] = array(
+ 'name' => rcube_label('settings'),
+ );
+
+ // Settings: threading
+ if ($threading_supported) {
+ $select = new html_select(array('name' => '_viewmode', 'id' => '_listmode'));
+ $select->add(rcube_label('list'), 0);
+ $select->add(rcube_label('threads'), 1);
+
+ if (isset($_POST['_viewmode'])) {
+ $value = (int) $_POST['_viewmode'];
+ }
+ else if (strlen($mbox_imap)) {
+ $a_threaded = $RCMAIL->config->get('message_threading', array());
+ $value = (int) isset($a_threaded[$mbox_imap]);
+ }
+
+ $form['props']['fieldsets']['settings']['content']['viewmode'] = array(
+ 'label' => rcube_label('listmode'),
+ 'value' => $select->show($value),
+ );
+ }
+/*
+ // Settings: sorting column
+ $select = new html_select(array('name' => '_sortcol', 'id' => '_sortcol'));
+ $select->add(rcube_label('nonesort'), '');
+ $select->add(rcube_label('arrival'), 'arrival');
+ $select->add(rcube_label('sentdate'), 'date');
+ $select->add(rcube_label('subject'), 'subject');
+ $select->add(rcube_label('fromto'), 'from');
+ $select->add(rcube_label('replyto'), 'replyto');
+ $select->add(rcube_label('cc'), 'cc');
+ $select->add(rcube_label('size'), 'size');
+
+ $value = isset($_POST['_sortcol']) ? $_POST['_sortcol'] : '';
+
+ $form['props']['fieldsets']['settings']['content']['sortcol'] = array(
+ 'label' => rcube_label('listsorting'),
+ 'value' => $select->show($value),
+ );
+
+ // Settings: sorting order
+ $select = new html_select(array('name' => '_sortord', 'id' => '_sortord'));
+ $select->add(rcube_label('asc'), 'ASC');
+ $select->add(rcube_label('desc'), 'DESC');
+
+ $value = isset($_POST['_sortord']) ? $_POST['_sortord'] : '';
+
+ $form['props']['fieldsets']['settings']['content']['sortord'] = array(
+ 'label' => rcube_label('listorder'),
+ 'value' => $select->show(),
+ );
+*/
+ // Information (count, size) - Edit mode
+ if (strlen($mbox)) {
+ // Number of messages
+ $form['props']['fieldsets']['info'] = array(
+ 'name' => rcube_label('info'),
+ 'content' => array(
+ 'count' => array(
+ 'label' => rcube_label('messagecount'),
+ 'value' => (int) $msgcount,
+ ),
+ ),
+ );
+
+ // Size
+ if ($msgcount) {
+ // create link with folder-size command
+ $onclick = sprintf("return %s.command('folder-size', '%s', this)",
+ JS_OBJECT_NAME, JQ($mbox_imap));
+ $size = html::a(array('href' => '#', 'onclick' => $onclick, 'id' => 'folder-size'),
+ rcube_label('getfoldersize'));
+ }
+ else {
+ // no messages -> zero size
+ $size = 0;
+ }
+ $form['props']['fieldsets']['info']['content']['size'] = array(
+ 'label' => rcube_label('size'),
+ 'value' => $size,
+ );
+ }
+
+ // Allow plugins to modify folder form content
+ $plugin = $RCMAIL->plugins->exec_hook('folder_form', array('form' => $form));
+
+ $form = $plugin['form'];
+
+ // Set form tags and hidden fields
+ list($form_start, $form_end) = get_form_tags($attrib, 'save-folder', null, $hidden_fields);
+
+ unset($attrib['form']);
+
+ // return the complete edit form as table
+ $out = "$form_start\n";
+
+ // Create form output
+ foreach ($form as $tab) {
+ if (!empty($tab['fieldsets']) && is_array($tab['fieldsets'])) {
+ $content = '';
+ foreach ($tab['fieldsets'] as $fieldset) {
+ $subcontent = rcmail_get_form_part($fieldset);
+ if ($subcontent) {
+ $content .= html::tag('fieldset', null, html::tag('legend', null, Q($fieldset['name'])) . $subcontent) ."\n";
+ }
+ }
+ }
+ else {
+ $content = rcmail_get_form_part($tab);
+ }
+
+ if ($content) {
+ $out .= html::tag('fieldset', null, html::tag('legend', null, Q($tab['name'])) . $content) ."\n";
+ }
+ }
+
+ $out .= "\n$form_end";
+
+ $RCMAIL->output->set_env('messagecount', (int) $msgcount);
+
+ return $out;
+}
+
+function rcmail_get_form_part($form)
+{
+ $content = '';
+
+ if (is_array($form['content']) && !empty($form['content'])) {
+ $table = new html_table(array('cols' => 2));
+ foreach ($form['content'] as $col => $colprop) {
+ $colprop['id'] = '_'.$col;
+ $label = !empty($colprop['label']) ? $colprop['label'] : rcube_label($col);
+
+ $table->add('title', sprintf('<label for="%s">%s</label>', $colprop['id'], Q($label)));
+ $table->add(null, $colprop['value']);
+ }
+ $content = $table->show();
+ }
+ else {
+ $content = $tag['content'];
+ }
+
+ return $content;
+}
+
+function rcmail_localize_folderpath($path)
+{
+ global $RCMAIL;
+
+ $protect_folders = $RCMAIL->config->get('protect_default_folders');
+ $default_folders = (array) $RCMAIL->config->get('default_imap_folders');
+ $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
+ $path = explode($delimiter, $path);
+ $result = array();
+
+ foreach ($path as $idx => $dir) {
+ $directory = implode($delimiter, array_slice($path, 0, $idx+1));
+ if ($protect_folders && in_array($directory, $default_folders)) {
+ unset($result);
+ $result[] = rcmail_localize_foldername($directory);
+ }
+ else if ($protect_folders && in_array($dir, $default_folders)) {
+ $result[] = rcmail_localize_foldername($dir);
+ }
+ else {
+ $result[] = rcube_charset_convert($dir, 'UTF7-IMAP');
+ }
+ }
+
+ return implode($delimiter, $result);
+}
+
+
+//$OUTPUT->set_pagetitle(rcube_label('folders'));
+
+// register UI objects
+$OUTPUT->add_handlers(array(
+ 'folderdetails' => 'rcube_folder_form',
+));
+
+$OUTPUT->add_label('nonamewarning');
+
+$OUTPUT->send('folderedit');
diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
new file mode 100644
index 0000000..b90487a
--- /dev/null
+++ b/program/steps/settings/folders.inc
@@ -0,0 +1,370 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/settings/folders.inc |
+ | |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
+ | Licensed under the GNU GPL |
+ | |
+ | PURPOSE: |
+ | Provide functionality of folders management |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com> |
+ | Author: Aleksander Machniak <alec@alec.pl> |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+// WARNING: folder names in UI are encoded with RCMAIL_CHARSET
+
+// init IMAP connection
+$RCMAIL->imap_connect();
+
+// subscribe mailbox
+if ($RCMAIL->action == 'subscribe')
+{
+ $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true, 'UTF7-IMAP');
+ if (strlen($mbox)) {
+ $result = $IMAP->subscribe(array($mbox));
+
+ // Handle virtual (non-existing) folders
+ if (!$result && $IMAP->get_error_code() == -1 &&
+ strpos($IMAP->get_error_str(), '[TRYCREATE]')
+ ) {
+ $result = $IMAP->create_mailbox($mbox, true);
+ if ($result) {
+ // @TODO: remove 'virtual' class of folder's row
+ }
+ }
+
+ if ($result)
+ $OUTPUT->show_message('foldersubscribed', 'confirmation');
+ else
+ $OUTPUT->show_message('errorsaving', 'error');
+ }
+}
+
+// unsubscribe mailbox
+else if ($RCMAIL->action == 'unsubscribe')
+{
+ $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true, 'UTF7-IMAP');
+ if (strlen($mbox)) {
+ $result = $IMAP->unsubscribe(array($mbox));
+ if ($result)
+ $OUTPUT->show_message('folderunsubscribed', 'confirmation');
+ else
+ $OUTPUT->show_message('errorsaving', 'error');
+ }
+}
+
+// delete an existing mailbox
+else if ($RCMAIL->action == 'delete-folder')
+{
+ $a_mboxes = $IMAP->list_unsubscribed();
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+
+ $mbox_utf8 = get_input_value('_mbox', RCUBE_INPUT_POST, true);
+ $mbox = rcube_charset_convert($mbox_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
+
+ if (strlen($mbox))
+ $deleted = $IMAP->delete_mailbox(array($mbox));
+
+ if ($OUTPUT->ajax_call && $deleted) {
+ // Remove folder rows
+ $OUTPUT->command('remove_folder_row', $mbox_utf8);
+ foreach ($a_mboxes as $folder) {
+ if (preg_match('/^'. preg_quote($mbox.$delimiter, '/') .'/', $folder)) {
+ $OUTPUT->command('remove_folder_row', rcube_charset_convert($folder, 'UTF7-IMAP'));
+ }
+ }
+ $OUTPUT->show_message('folderdeleted', 'confirmation');
+ // Clear content frame
+ $OUTPUT->command('subscription_select');
+ $OUTPUT->command('set_quota', rcmail_quota_content());
+ }
+ else if (!$deleted) {
+ $OUTPUT->show_message('errorsaving', 'error');
+ }
+}
+
+// rename an existing mailbox
+else if ($RCMAIL->action == 'rename-folder')
+{
+ $name_utf8 = trim(get_input_value('_folder_newname', RCUBE_INPUT_POST, true));
+ $oldname_utf8 = trim(get_input_value('_folder_oldname', RCUBE_INPUT_POST, true));
+
+ if (strlen($name_utf8) && strlen($oldname_utf8)) {
+ $name = rcube_charset_convert($name_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
+ $oldname = rcube_charset_convert($oldname_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
+
+ $rename = rcmail_rename_folder($oldname, $name);
+ }
+
+ if ($rename && $OUTPUT->ajax_call) {
+ $folderlist = $IMAP->list_unsubscribed();
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+
+ $regexp = '/^' . preg_quote($name . $delimiter, '/') . '/';
+
+ // subfolders
+ for ($x=sizeof($folderlist)-1; $x>=0; $x--) {
+ if (preg_match($regexp, $folderlist[$x])) {
+ $oldfolder = $oldname . $delimiter . preg_replace($regexp, '', $folderlist[$x]);
+ $foldersplit = explode($delimiter, $folderlist[$x]);
+ $level = count($foldersplit) - 1;
+ $display_rename = str_repeat(' ', $level)
+ . rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP');
+
+ $before = isset($folderlist[$x+1]) ? rcube_charset_convert($folderlist[$x+1], 'UTF7-IMAP') : false;
+
+ $OUTPUT->command('replace_folder_row', rcube_charset_convert($oldfolder, 'UTF7-IMAP'),
+ rcube_charset_convert($folderlist[$x], 'UTF7-IMAP'), $display_rename, $before);
+ }
+ }
+
+ $foldersplit = explode($delimiter, $name);
+ $level = count($foldersplit) - 1;
+ $display_rename = str_repeat(' ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP');
+ $index = array_search($name, $folderlist);
+ $before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF7-IMAP') : false;
+
+ $OUTPUT->command('replace_folder_row', $oldname_utf8,
+ rcube_charset_convert($name, 'UTF7-IMAP'), $display_rename, $before);
+ }
+ else if (!$rename) {
+ $OUTPUT->show_message('errorsaving', 'error');
+ }
+}
+
+// clear mailbox
+else if ($RCMAIL->action == 'purge')
+{
+ $mbox_utf8 = get_input_value('_mbox', RCUBE_INPUT_POST, true);
+ $mbox = rcube_charset_convert($mbox_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+ $trash_regexp = '/^' . preg_quote($CONFIG['trash_mbox'] . $delimiter, '/') . '/';
+
+ // we should only be purging trash (or their subfolders)
+ if (!strlen($CONFIG['trash_mbox']) || $mbox == $CONFIG['trash_mbox']
+ || preg_match($trash_regexp, $mbox)
+ ) {
+ $success = $IMAP->clear_mailbox($mbox);
+ $delete = true;
+ }
+ // copy to Trash
+ else {
+ $success = $IMAP->move_message('1:*', $CONFIG['trash_mbox'], $mbox);
+ $delete = false;
+ }
+
+ if ($success) {
+ $OUTPUT->set_env('messagecount', 0);
+ if ($delete) {
+ $OUTPUT->show_message('folderpurged', 'confirmation');
+ $OUTPUT->command('set_quota', rcmail_quota_content());
+ }
+ else {
+ $OUTPUT->show_message('messagemoved', 'confirmation');
+ }
+ $_SESSION['unseen_count'][$mbox] = 0;
+ $OUTPUT->command('show_folder', $mbox_utf8, null, true);
+ }
+ else {
+ $OUTPUT->show_message('errorsaving', 'error');
+ }
+}
+
+// get mailbox size
+else if ($RCMAIL->action == 'folder-size')
+{
+ $name = trim(get_input_value('_mbox', RCUBE_INPUT_POST, true));
+
+ $size = $IMAP->get_mailbox_size($name);
+
+ // @TODO: check quota and show percentage usage of specified mailbox?
+
+ if ($size !== false) {
+ $OUTPUT->command('folder_size_update', show_bytes($size));
+ }
+}
+
+if ($OUTPUT->ajax_call)
+ $OUTPUT->send();
+
+
+// build table with all folders listed by server
+function rcube_subscription_form($attrib)
+{
+ global $RCMAIL, $IMAP, $CONFIG, $OUTPUT;
+
+ list($form_start, $form_end) = get_form_tags($attrib, 'folders');
+ unset($attrib['form']);
+
+ if (!$attrib['id'])
+ $attrib['id'] = 'rcmSubscriptionlist';
+
+ $table = new html_table();
+
+ if ($attrib['noheader'] !== true && $attrib['noheader'] != "true") {
+ // add table header
+ $table->add_header('name', rcube_label('foldername'));
+ $table->add_header('subscribed', '');
+ }
+
+ // get folders from server
+ $IMAP->clear_cache('mailboxes');
+
+ $a_unsubscribed = $IMAP->list_unsubscribed();
+ $a_subscribed = $IMAP->list_mailboxes();
+ $delimiter = $IMAP->get_hierarchy_delimiter();
+ $a_js_folders = array();
+ $seen = array();
+ $list_folders = array();
+
+ // pre-process folders list
+ foreach ($a_unsubscribed as $i => $folder) {
+ $foldersplit = explode($delimiter, $folder);
+ $name = rcube_charset_convert(array_pop($foldersplit), 'UTF7-IMAP');
+ $parent_folder = join($delimiter, $foldersplit);
+ $level = count($foldersplit);
+
+ // add any necessary "virtual" parent folders
+ if ($parent_folder && !$seen[$parent_folder]) {
+ for ($i=1; $i<=$level; $i++) {
+ $ancestor_folder = join($delimiter, array_slice($foldersplit, 0, $i));
+ if ($ancestor_folder && !$seen[$ancestor_folder]++) {
+ $ancestor_name = rcube_charset_convert($foldersplit[$i-1], 'UTF7-IMAP');
+ $list_folders[] = array(
+ 'id' => $ancestor_folder,
+ 'name' => $ancestor_name,
+ 'level' => $i-1,
+ 'virtual' => true,
+ );
+ }
+ }
+ }
+
+ $seen[$folder]++;
+
+ $list_folders[] = array(
+ 'id' => $folder,
+ 'name' => $name,
+ 'level' => $level,
+ );
+ }
+
+ unset($seen);
+
+ $checkbox_subscribe = new html_checkbox(array(
+ 'name' => '_subscribed[]',
+ 'title' => rcube_label('changesubscription'),
+ 'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)",
+ ));
+
+ // create list of available folders
+ foreach ($list_folders as $i => $folder) {
+ $idx = $i + 1;
+ $subscribed = in_array($folder['id'], $a_subscribed);
+ $protected = ($CONFIG['protect_default_folders'] == true && in_array($folder['id'], $CONFIG['default_imap_folders']));
+ $classes = array($i%2 ? 'even' : 'odd');
+
+ $folder_js = Q($folder['id']);
+ $folder_utf8 = rcube_charset_convert($folder['id'], 'UTF7-IMAP');
+ $display_folder = str_repeat(' ', $folder['level'])
+ . Q($protected ? rcmail_localize_foldername($folder['id']) : $folder['name']);
+
+ if ($folder['virtual']) {
+ $classes[] = 'virtual';
+ }
+
+ if (!$protected) {
+ $opts = $IMAP->mailbox_options($folder['id']);
+ $noselect = in_array('\\Noselect', $opts);
+ }
+
+ $table->add_row(array('id' => 'rcmrow'.$idx, 'class' => join(' ', $classes)));
+
+ $table->add('name', $display_folder);
+ $table->add('subscribed', $checkbox_subscribe->show(($subscribed ? $folder_utf8 : ''),
+ array('value' => $folder_utf8, 'disabled' => ($protected || $noselect) ? 'disabled' : '')));
+
+ $a_js_folders['rcmrow'.$idx] = array($folder_utf8, Q($display_folder), $protected || $folder['virtual']);
+ }
+
+ $RCMAIL->plugins->exec_hook('folders_list', array('table' => $table));
+
+ $OUTPUT->add_gui_object('subscriptionlist', $attrib['id']);
+ $OUTPUT->set_env('subscriptionrows', $a_js_folders);
+ $OUTPUT->set_env('defaultfolders', $CONFIG['default_imap_folders']);
+ $OUTPUT->set_env('delimiter', $delimiter);
+
+ return $form_start . $table->show($attrib) . $form_end;
+}
+
+function rcmail_folder_frame($attrib)
+{
+ global $OUTPUT;
+
+ if (!$attrib['id'])
+ $attrib['id'] = 'rcmfolderframe';
+
+ $attrib['name'] = $attrib['id'];
+
+ $OUTPUT->set_env('contentframe', $attrib['name']);
+ $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
+
+ return html::iframe($attrib);
+}
+
+function rcmail_rename_folder($oldname, $newname)
+{
+ global $RCMAIL;
+
+ $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
+ $rename = $RCMAIL->imap->rename_mailbox($oldname, $newname);
+
+ // update per-folder options for modified folder and its subfolders
+ if ($rename !== false) {
+ $a_threaded = (array) $RCMAIL->config->get('message_threading', array());
+ $oldprefix = '/^' . preg_quote($oldname . $delimiter, '/') . '/';
+
+ foreach ($a_threaded as $key => $val) {
+ if ($key == $oldname) {
+ unset($a_threaded[$key]);
+ $a_threaded[$newname] = true;
+ }
+ else if (preg_match($oldprefix, $key)) {
+ unset($a_threaded[$key]);
+ $a_threaded[preg_replace($oldprefix, $newname.$delimiter, $key)] = true;
+ }
+ }
+ $RCMAIL->user->save_prefs(array('message_threading' => $a_threaded));
+
+ return true;
+ }
+
+ return false;
+}
+
+$OUTPUT->set_pagetitle(rcube_label('folders'));
+$OUTPUT->include_script('list.js');
+$OUTPUT->set_env('quota', $IMAP->get_capability('QUOTA'));
+
+// add some labels to client
+$OUTPUT->add_label('deletefolderconfirm', 'purgefolderconfirm', 'folderdeleting',
+ 'foldermoving', 'foldersubscribing', 'folderunsubscribing', 'quota');
+
+// register UI objects
+$OUTPUT->add_handlers(array(
+ 'foldersubscription' => 'rcube_subscription_form',
+ 'folderframe' => 'rcmail_folder_frame',
+ 'quotadisplay' => 'rcmail_quota_display',
+));
+
+$OUTPUT->send('folders');
+
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
deleted file mode 100644
index 3a5d909..0000000
--- a/program/steps/settings/manage_folders.inc
+++ /dev/null
@@ -1,443 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | program/steps/settings/manage_folders.inc |
- | |
- | This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
- | Licensed under the GNU GPL |
- | |
- | PURPOSE: |
- | Provide functionality to create/delete/rename folders |
- | |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com> |
- +-----------------------------------------------------------------------+
-
- $Id$
-
-*/
-
-// WARNING: folder names in UI are encoded with RCMAIL_CHARSET
-
-// init IMAP connection
-$RCMAIL->imap_connect();
-
-// subscribe to one or more mailboxes
-if ($RCMAIL->action=='subscribe')
- {
- $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true, 'UTF7-IMAP');
- if (strlen($mbox))
- $IMAP->subscribe(array($mbox));
- }
-
-// unsubscribe one or more mailboxes
-else if ($RCMAIL->action=='unsubscribe')
- {
- $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true, 'UTF7-IMAP');
- if (strlen($mbox))
- $IMAP->unsubscribe(array($mbox));
- }
-
-// enable threading for one or more mailboxes
-else if ($RCMAIL->action=='enable-threading')
- {
- $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true, 'UTF7-IMAP');
- if (strlen($mbox))
- rcube_set_threading($mbox, true);
- }
-
-// enable threading for one or more mailboxes
-else if ($RCMAIL->action=='disable-threading')
- {
- $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true, 'UTF7-IMAP');
- if (strlen($mbox))
- rcube_set_threading($mbox, false);
- }
-
-// create a new mailbox
-else if ($RCMAIL->action=='create-folder')
- {
- if (strlen(trim($_POST['_name'])))
- {
- $name = trim(get_input_value('_name', RCUBE_INPUT_POST, true, 'UTF7-IMAP'));
- $create = $IMAP->create_mailbox($name, TRUE);
- }
-
- if ($create && $OUTPUT->ajax_call)
- {
- $delimiter = $IMAP->get_hierarchy_delimiter();
- $folderlist = $IMAP->list_unsubscribed();
- $index = array_search($create, $folderlist);
- $before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF7-IMAP') : false;
-
- $create = rcube_charset_convert($create, 'UTF7-IMAP');
- $foldersplit = explode($delimiter, $create);
- $display_create = str_repeat(' ', substr_count($create, $delimiter))
- . Q($foldersplit[count($foldersplit)-1]);
-
- $OUTPUT->command('add_folder_row', $create, $display_create, false, $before);
- }
- else if (!$create)
- {
- $OUTPUT->show_message('errorsaving', 'error');
- }
- }
-
-// rename a mailbox
-else if ($RCMAIL->action=='rename-folder')
- {
- if (strlen(trim($_POST['_folder_oldname'])) && strlen(trim($_POST['_folder_newname'])))
- {
- $name_utf8 = trim(get_input_value('_folder_newname', RCUBE_INPUT_POST, true));
- $oldname_utf8 = get_input_value('_folder_oldname', RCUBE_INPUT_POST, true);
- $name = rcube_charset_convert($name_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
- $oldname = rcube_charset_convert($oldname_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
-
- $rename = $IMAP->rename_mailbox($oldname, $name);
- }
-
- // update per-folder options for modified folder and its subfolders
- if ($rename) {
- $a_threaded = $RCMAIL->config->get('message_threading', array());
- $delimiter = $IMAP->get_hierarchy_delimiter();
- $oldprefix = '/^' . preg_quote($oldname . $delimiter, '/') . '/';
- foreach ($a_threaded as $key => $val)
- if ($key == $oldname) {
- unset($a_threaded[$key]);
- $a_threaded[$name] = true;
- }
- else if (preg_match($oldprefix, $key)) {
- unset($a_threaded[$key]);
- $a_threaded[preg_replace($oldprefix, $name.$delimiter, $key)] = true;
- }
-
- $RCMAIL->user->save_prefs(array('message_threading' => $a_threaded));
- }
-
- if ($rename && $OUTPUT->ajax_call)
- {
- $folderlist = $IMAP->list_unsubscribed();
- $delimiter = $IMAP->get_hierarchy_delimiter();
-
- $regexp = '/^' . preg_quote($rename . $delimiter, '/') . '/';
-
- // subfolders
- for ($x=sizeof($folderlist)-1; $x>=0; $x--)
- {
- if (preg_match($regexp, $folderlist[$x]))
- {
- $oldfolder = $oldname . $delimiter . preg_replace($regexp, '', $folderlist[$x]);
- $foldersplit = explode($delimiter, $folderlist[$x]);
- $level = count($foldersplit) - 1;
- $display_rename = str_repeat(' ', $level)
- . Q(rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP'));
-
- $before = isset($folderlist[$x+1]) ? rcube_charset_convert($folderlist[$x+1], 'UTF7-IMAP') : false;
-
- $OUTPUT->command('replace_folder_row', rcube_charset_convert($oldfolder, 'UTF7-IMAP'),
- rcube_charset_convert($folderlist[$x], 'UTF7-IMAP'), $display_rename, $before);
- }
- }
-
- $foldersplit = explode($delimiter, $rename);
- $level = count($foldersplit) - 1;
- $display_rename = str_repeat(' ', $level) . Q(rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP'));
- $index = array_search($rename, $folderlist);
- $before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF7-IMAP') : false;
-
- $OUTPUT->command('replace_folder_row', $oldname_utf8, rcube_charset_convert($rename, 'UTF7-IMAP'), $display_rename, $before);
- $OUTPUT->command('reset_folder_rename');
- }
- else if (!$rename && $OUTPUT->ajax_call)
- {
- $OUTPUT->command('reset_folder_rename');
- $OUTPUT->show_message('errorsaving', 'error');
- }
- else if (!$rename)
- $OUTPUT->show_message('errorsaving', 'error');
- }
-
-// delete an existing IMAP mailbox
-else if ($RCMAIL->action=='delete-folder')
- {
- $a_mboxes = $IMAP->list_unsubscribed();
- $delimiter = $IMAP->get_hierarchy_delimiter();
-
- $mboxes_utf8 = get_input_value('_mboxes', RCUBE_INPUT_POST, true);
- $mboxes = rcube_charset_convert($mboxes_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
-
- if (strlen($mboxes))
- $deleted = $IMAP->delete_mailbox(array($mboxes));
-
- if ($OUTPUT->ajax_call && $deleted)
- {
- $OUTPUT->command('remove_folder_row', $mboxes_utf8);
- foreach ($a_mboxes as $mbox)
- {
- if (preg_match('/^'. preg_quote($mboxes.$delimiter, '/') .'/', $mbox))
- {
- $OUTPUT->command('remove_folder_row', rcube_charset_convert($mbox, 'UTF7-IMAP'));
- }
- }
- $OUTPUT->show_message('folderdeleted', 'confirmation');
- }
- else if (!$deleted)
- {
- $OUTPUT->show_message('errorsaving', 'error');
- }
- }
-
-if ($OUTPUT->ajax_call)
- $OUTPUT->send();
-
-
-// build table with all folders listed by server
-function rcube_subscription_form($attrib)
- {
- global $RCMAIL, $IMAP, $CONFIG, $OUTPUT;
-
- $threading_supported = $IMAP->get_capability('thread=references')
- || $IMAP->get_capability('thread=orderedsubject')
- || $IMAP->get_capability('thread=refs');
-
- list($form_start, $form_end) = get_form_tags($attrib, 'folders');
- unset($attrib['form']);
-
- if (!$attrib['id'])
- $attrib['id'] = 'rcmSubscriptionlist';
-
- $table = new html_table();
-
- // add table header
- $table->add_header('name', rcube_label('foldername'));
- $table->add_header('msgcount', rcube_label('messagecount'));
- $table->add_header('subscribed', rcube_label('subscribed'));
- if ($threading_supported)
- $table->add_header('threaded', rcube_label('threaded'));
- $table->add_header('rename', ' ');
- $table->add_header('delete', ' ');
-
- // get folders from server
- $IMAP->clear_cache('mailboxes');
-
- $a_unsubscribed = $IMAP->list_unsubscribed();
- $a_subscribed = $IMAP->list_mailboxes();
- $a_threaded = $a_threaded_copy = $RCMAIL->config->get('message_threading', array());
- $delimiter = $IMAP->get_hierarchy_delimiter();
- $a_js_folders = $seen = $list_folders = array();
-
- // pre-process folders list
- foreach ($a_unsubscribed as $i => $folder) {
- $foldersplit = explode($delimiter, $folder);
- $name = rcube_charset_convert(array_pop($foldersplit), 'UTF7-IMAP');
- $parent_folder = join($delimiter, $foldersplit);
- $level = count($foldersplit);
-
- // add any necessary "virtual" parent folders
- if ($parent_folder && !$seen[$parent_folder]) {
- for ($i=1; $i<=$level; $i++) {
- $ancestor_folder = join($delimiter, array_slice($foldersplit, 0, $i));
- if ($ancestor_folder && !$seen[$ancestor_folder]++) {
- $ancestor_name = rcube_charset_convert($foldersplit[$i-1], 'UTF7-IMAP');
- $list_folders[] = array('id' => $ancestor_folder, 'name' => $ancestor_name, 'level' => $i-1, 'virtual' => true);
- }
- }
- }
-
- unset($a_threaded_copy[$folder]);
-
- $list_folders[] = array('id' => $folder, 'name' => $name, 'level' => $level);
- $seen[$folder]++;
- }
-
- unset($seen);
-
- // remove 'message_threading' option for not existing folders
- if ($a_threaded_copy) {
- foreach ($a_threaded_copy as $key => $val)
- unset($a_threaded[$key]);
- unset($a_threaded_copy);
- $RCMAIL->user->save_prefs(array('message_threading' => $a_threaded));
- }
-
- $checkbox_subscribe = new html_checkbox(array(
- 'name' => '_subscribed[]',
- 'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)",
- ));
- $checkbox_threaded = new html_checkbox(array(
- 'name' => '_threaded[]',
- 'onclick' => JS_OBJECT_NAME.".command(this.checked?'enable-threading':'disable-threading',this.value)",
- ));
-
- if (!empty($attrib['deleteicon']))
- $del_button = html::img(array('src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 'alt' => rcube_label('delete')));
- else
- $del_button = rcube_label('delete');
-
- if (!empty($attrib['renameicon']))
- $edit_button = html::img(array('src' => $CONFIG['skin_path'] . $attrib['renameicon'], 'alt' => rcube_label('rename')));
- else
- $edit_button = rcube_label('rename');
-
- // create list of available folders
- foreach ($list_folders as $i => $folder) {
- $idx = $i + 1;
- $subscribed = in_array($folder['id'], $a_subscribed);
- $threaded = $a_threaded[$folder['id']];
- $protected = ($CONFIG['protect_default_folders'] == true && in_array($folder['id'], $CONFIG['default_imap_folders']));
- $classes = array($i%2 ? 'even' : 'odd');
- $folder_js = Q($folder['id']);
- $display_folder = str_repeat(' ', $folder['level']) . Q($protected ? rcmail_localize_foldername($folder['id']) : $folder['name']);
- $folder_utf8 = rcube_charset_convert($folder['id'], 'UTF7-IMAP');
-
- if ($folder['virtual']) {
- $classes[] = 'virtual';
- }
-
- if (!$protected) {
- $opts = $IMAP->mailbox_options($folder['id']);
- $noselect = in_array('\\Noselect', $opts);
- }
-
- $table->add_row(array('id' => 'rcmrow'.$idx, 'class' => join(' ', $classes)));
-
- $table->add('name', $display_folder);
- $table->add('msgcount', (($folder['virtual'] || $noselect) ? '' : $IMAP->messagecount($folder['id'], 'ALL', false, false)));
- $table->add('subscribed', $checkbox_subscribe->show(($subscribed ? $folder_utf8 : ''),
- array('value' => $folder_utf8, 'disabled' => ($protected || $noselect) ? 'disabled' : '')));
- if ($threading_supported) {
- $table->add('threaded', $folder['virtual'] ? '' :
- $checkbox_threaded->show(($threaded ? $folder_utf8 : ''), array('value' => $folder_utf8)));
- }
-
- // add rename and delete buttons
- if (!$protected && !$folder['virtual']) {
- $table->add('rename', html::a(array('href' => "#rename", 'title' => rcube_label('renamefolder')), $edit_button));
- $table->add('delete', html::a(array('href' => "#delete", 'title' => rcube_label('deletefolder')), $del_button));
- }
- else {
- $table->add('rename', ' ');
- $table->add('delete', ' ');
- }
-
- $a_js_folders['rcmrow'.$idx] = array($folder_utf8, Q($display_folder), $protected || $folder['virtual']);
- }
-
- rcmail::get_instance()->plugins->exec_hook('folders_list', array('table' => $table));
-
- $OUTPUT->add_gui_object('subscriptionlist', $attrib['id']);
- $OUTPUT->set_env('subscriptionrows', $a_js_folders);
- $OUTPUT->set_env('defaultfolders', $CONFIG['default_imap_folders']);
- $OUTPUT->set_env('delimiter', $delimiter);
-
- return $form_start . $table->show($attrib) . $form_end;
- }
-
-
-function rcube_create_folder_form($attrib)
- {
- global $OUTPUT;
-
- list($form_start, $form_end) = get_form_tags($attrib, 'create-folder');
- unset($attrib['form']);
-
- if ($attrib['hintbox'])
- $OUTPUT->add_gui_object('createfolderhint', $attrib['hintbox']);
-
- // return the complete edit form as table
- $out = "$form_start\n";
-
- $input = new html_inputfield(array('name' => '_folder_name'));
- $out .= $input->show();
-
- if (get_boolean($attrib['button']))
- {
- $button = new html_inputfield(array('type' => 'button',
- 'value' => rcube_label('create'),
- 'onclick' => JS_OBJECT_NAME.".command('create-folder',this.form)"));
- $out .= $button->show();
- }
-
- $out .= "\n$form_end";
-
- return $out;
- }
-
-function rcube_rename_folder_form($attrib)
- {
- global $CONFIG, $IMAP;
-
- list($form_start, $form_end) = get_form_tags($attrib, 'rename-folder');
- unset($attrib['form']);
-
- // return the complete edit form as table
- $out = "$form_start\n";
-
- $a_unsubscribed = $IMAP->list_unsubscribed();
- $select_folder = new html_select(array('name' => '_folder_oldname', 'id' => 'rcmfd_oldfolder'));
-
- foreach ($a_unsubscribed as $i => $folder)
- {
- if ($CONFIG['protect_default_folders'] == TRUE && in_array($folder,$CONFIG['default_imap_folders']))
- continue;
-
- $select_folder->add($folder);
- }
-
- $out .= $select_folder->show();
-
- $out .= " to ";
- $inputtwo = new html_inputfield(array('name' => '_folder_newname'));
- $out .= $inputtwo->show();
-
- if (get_boolean($attrib['button']))
- {
- $button = new html_inputfield(array('type' => 'button',
- 'value' => rcube_label('rename'),
- 'onclick' => JS_OBJECT_NAME.".command('rename-folder',this.form)"));
- $out .= $button->show();
- }
-
- $out .= "\n$form_end";
-
- return $out;
- }
-
-
-// (un)set 'threading' for selected folder
-function rcube_set_threading($mbox, $state=true)
- {
- global $RCMAIL;
- $mbox = (array)$mbox;
- $a_prefs = (array)$RCMAIL->config->get('message_threading');
-
- if ($state) {
- foreach ($mbox as $box)
- $a_prefs[$box] = true;
- }
- else {
- foreach ($mbox as $box)
- unset($a_prefs[$box]);
- }
-
- $RCMAIL->user->save_prefs(array('message_threading' => $a_prefs));
- }
-
-
-$OUTPUT->set_pagetitle(rcube_label('folders'));
-$OUTPUT->include_script('list.js');
-
-// register UI objects
-$OUTPUT->add_handlers(array(
- 'foldersubscription' => 'rcube_subscription_form',
- 'createfolder' => 'rcube_create_folder_form',
- 'renamefolder' => 'rcube_rename_folder_form'
-));
-
-// add some labels to client
-$OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating','foldermoving');
-
-$OUTPUT->send('managefolders');
-
diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc
new file mode 100644
index 0000000..da646a5
--- /dev/null
+++ b/program/steps/settings/save_folder.inc
@@ -0,0 +1,176 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/settings/save_folder.inc |
+ | |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
+ | Licensed under the GNU GPL |
+ | |
+ | PURPOSE: |
+ | Provide functionality to create/edit a folder |
+ | |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl> |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+// WARNING: folder names in UI are encoded with RCMAIL_CHARSET
+
+// init IMAP connection
+$RCMAIL->imap_connect();
+
+
+$name = trim(get_input_value('_name', RCUBE_INPUT_POST, true));
+$old = trim(get_input_value('_mbox', RCUBE_INPUT_POST, true));
+$path = trim(get_input_value('_parent', RCUBE_INPUT_POST, true));
+
+$name_imap = rcube_charset_convert($name, RCMAIL_CHARSET, 'UTF7-IMAP');
+$old_imap = rcube_charset_convert($old, RCMAIL_CHARSET, 'UTF7-IMAP');
+// $path is in UTF7-IMAP already
+
+$delimiter = $IMAP->get_hierarchy_delimiter();
+$special = (strlen($old_imap) && in_array($old_imap, (array) $RCMAIL->config->get('default_imap_folders')));
+$protected = ($special && $RCMAIL->config->get('protect_default_folders'));
+
+
+// Folder name checks
+if ($protected) {
+}
+else if (!strlen($name)) {
+ $error = rcube_label('cannotbeempty');
+}
+else if (mb_strlen($name) > 128) {
+ $error = rcube_label('nametoolong');
+}
+else {
+ // these characters are problematic e.g. when used in LIST/LSUB
+ foreach (array($delimiter, '%', '*') as $char) {
+ if (strpos($name, $delimiter) !== false) {
+ $error = rcube_label('forbiddencharacter') . " ($char)";
+ break;
+ }
+ }
+}
+
+if ($error) {
+ $OUTPUT->command('display_message', $error, 'error');
+}
+else {
+ if ($protected) {
+ $name_imap = $old_imap;
+ }
+ else if (strlen($path)) {
+ $name_imap = $path . $delimiter . $name_imap;
+ }
+
+ $folder['name'] = $name_imap;
+ $folder['oldname'] = $old_imap;
+ $folder['settings'] = array(
+ // List view mode: 0-list, 1-threads
+ 'view_mode' => (int) get_input_value('_viewmode', RCUBE_INPUT_POST),
+ 'sort_column' => get_input_value('_sortcol', RCUBE_INPUT_POST),
+ 'sort_order' => get_input_value('_sortord', RCUBE_INPUT_POST),
+ );
+}
+
+// create a new mailbox
+if (!$error && !strlen($old)) {
+
+ $plugin = $RCMAIL->plugins->exec_hook('folder_create', array('record' => $folder));
+
+ $folder = $plugin['record'];
+
+ if (!$plugin['abort']) {
+ $created = $IMAP->create_mailbox($folder['name'], TRUE);
+ }
+ else {
+ $created = $plugin['result'];
+ }
+
+ if ($created) {
+ // Save folder settings
+ if (isset($_POST['_viewmode'])) {
+ $a_threaded = (array) $RCMAIL->config->get('message_threading', array());
+
+ if ($_POST['_viewmode'])
+ $a_threaded[$folder['name']] = true;
+ else
+ unset($a_threaded[$folder['name']]);
+
+ $RCMAIL->user->save_prefs(array('message_threading' => $a_threaded));
+ }
+
+ $OUTPUT->show_message('foldercreated', 'confirmation');
+ $OUTPUT->command('reload', 250);
+ $OUTPUT->send('iframe');
+ }
+ else {
+ // show error message
+ $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error', null, false);
+ }
+}
+
+// update a mailbox
+else if (!$error) {
+ $plugin = $RCMAIL->plugins->exec_hook('folder_update', array('record' => $folder));
+
+ $folder = $plugin['record'];
+ $rename = ($folder['oldname'] != $folder['name']);
+
+ if (!$plugin['abort']) {
+ if ($rename) {
+ $updated = $RCMAIL->imap->rename_mailbox($folder['oldname'], $folder['name']);
+ }
+ else {
+ $updated = true;
+ }
+ }
+ else {
+ $updated = $plugin['result'];
+ }
+
+ if ($updated) {
+ // Update folder settings,
+ if (isset($_POST['_viewmode'])) {
+ $a_threaded = (array) $RCMAIL->config->get('message_threading', array());
+
+ // In case of name change update names of childrens in settings
+ if ($rename) {
+ $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
+ $oldprefix = '/^' . preg_quote($folder['oldname'] . $delimiter, '/') . '/';
+ foreach ($a_threaded as $key => $val) {
+ if ($key == $folder['oldname']) {
+ unset($a_threaded[$key]);
+ }
+ else if (preg_match($oldprefix, $key)) {
+ unset($a_threaded[$key]);
+ $a_threaded[preg_replace($oldprefix, $folder['name'].$delimiter, $key)] = true;
+ }
+ }
+ }
+ if ($_POST['_viewmode'])
+ $a_threaded[$folder['name']] = true;
+ else
+ unset($a_threaded[$folder['name']]);
+
+ $RCMAIL->user->save_prefs(array('message_threading' => $a_threaded));
+ }
+
+ $OUTPUT->show_message('folderupdated', 'confirmation');
+ if ($rename) {
+ $OUTPUT->command('reload', 250);
+ $OUTPUT->send('iframe');
+ }
+ }
+ else {
+ // show error message
+ $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error', null, false);
+ }
+}
+
+rcmail_overwrite_action('edit-folder');
diff --git a/skins/default/common.css b/skins/default/common.css
index 938c68a..ae649ba 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -861,3 +861,17 @@
padding-top: 12px;
}
+.quota_text {
+ text-align: center;
+ font-size: 10px;
+ color: #666;
+ border: 1px solid #999;
+ cursor: default;
+}
+.quota_bg { background-color: white; }
+.quota_high { background-color: #F33131; }
+.quota_mid { background-color: #F5AD3C; }
+.quota_low { background-color: #91E164; }
+.quota_text_high { color: white; }
+.quota_text_mid { color: #666; }
+.quota_text_low { color: #666; }
diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css
index 2b2180f..29ab8cb 100644
--- a/skins/default/iehacks.css
+++ b/skins/default/iehacks.css
@@ -38,11 +38,6 @@
height: expression((parseInt(document.documentElement.clientHeight)-105)+'px');
}
-#folder-manager
-{
- height: expression((parseInt(this.parentNode.offsetHeight)-105)+'px');
-}
-
#messagetoolbar
{
width: expression((parseInt(document.documentElement.clientWidth)-215)+'px');
@@ -90,7 +85,8 @@
#messageframe,
#identity-details,
#contacts-box,
-#prefs-box
+#prefs-box,
+#folder-box
{
height: expression(parseInt(this.parentNode.offsetHeight)+'px');
}
diff --git a/skins/default/mail.css b/skins/default/mail.css
index ead0aa6..2cd51e5 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -1435,9 +1435,6 @@
margin-top: 4px;
}
-
-/** quota indicator */
-
#quota
{
position: absolute;
@@ -1453,19 +1450,3 @@
right: 6px;
z-index: 101;
}
-
-.quota_text {
- text-align: center;
- font-size: 10px;
- color: #666;
- border: 1px solid #999;
- cursor: default;
-}
-.quota_bg { background-color: white; }
-.quota_high { background-color: #F33131; }
-.quota_mid { background-color: #F5AD3C; }
-.quota_low { background-color: #91E164; }
-.quota_text_high { color: white; }
-.quota_text_mid { color: #666; }
-.quota_text_low { color: #666; }
-
diff --git a/skins/default/settings.css b/skins/default/settings.css
index c902740..c8d7d3f 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -5,39 +5,18 @@
width: 300px;
}
-#folder-manager
-{
- position: absolute;
- width: 600px;
- top: 0;
- left: 0;
- bottom: 105px;
- overflow: auto;
- border: 1px solid #999999;
-}
-
#folder-manager.droptarget
{
border: 1px solid #CC3333;
background-color: #FFFFA6;
}
-#listbuttons
-{
- position: absolute;
- left: 20px;
- bottom: 18px;
-}
-
-#identities-table
+#identities-table,
+#subscription-table,
+#sections-table
{
width: 100%;
table-layout: fixed;
-}
-
-#subscription-table
-{
- width: 100%;
}
#subscription-table input
@@ -50,14 +29,8 @@
#sections-table tbody td
{
cursor: default;
- overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
-}
-
-#subscription-table tbody td
-{
- height: 22px !important;
height: 18px;
}
@@ -66,49 +39,25 @@
color: #666;
}
-#subscription-table tr.selected td,
-#subscription-table tr.selected td a
+#subscription-table tr.selected td
{
color: #FFFFFF;
background-color: #CC3333;
}
-#subscription-table tr.droptarget td,
-#subscription-table tr.droptarget td a
+#subscription-table tr.droptarget td
{
background-color: #FFFFA6;
}
-#subscription-table thead td.name
+#subscription-table td.name
{
- width: 95%;
+ width: 99%;
}
-#subscription-table thead td.msgcount,
-#subscription-table thead td.subscribed,
-#subscription-table thead td.threaded
+#subscription-table td.subscribed
{
- white-space: nowrap;
- min-width: 50px;
-}
-
-#subscription-table tbody td.subscribed,
-#subscription-table tbody td.rename,
-#subscription-table tbody td.delete
-{
- padding: 1px 4px;
-}
-
-#subscription-table thead td.rename,
-#subscription-table thead td.delete
-{
- width: 30px;
-}
-
-#subscription-table td.name input
-{
- font: inherit;
- width: 90%;
+ width: 18px;
}
#identity-frame
@@ -118,7 +67,9 @@
border: 1px solid #999999;
}
-#identity-details
+#identity-details,
+#folder-box,
+#prefs-box
{
position: absolute;
top: 0;
@@ -129,7 +80,8 @@
background-color: #F2F2F2;
}
-#identity-details table td.title
+#identity-details table td.title,
+#folder-details table td.title
{
font-weight: bold;
text-align: right;
@@ -150,6 +102,7 @@
}
#identities-list,
+#folder-manager,
#sectionslist
{
position: absolute;
@@ -161,24 +114,9 @@
overflow: hidden;
}
-#sections-table
-{
- width: 100%;
- table-layout: fixed;
-}
-
-#prefs-box
-{
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- border: 1px solid #999999;
- overflow: hidden;
-}
-
body.iframe,
-#prefs-frame
+#prefs-frame,
+#folder-frame
{
background-color: #F2F2F2;
border: none;
@@ -203,3 +141,19 @@
text-align: right;
float: right;
}
+
+#quota
+{
+ position: absolute;
+ top: 3px;
+ right: 8px;
+ width: 100px;
+}
+
+#quotaimg
+{
+ position: absolute;
+ top: 3px;
+ right: 6px;
+ z-index: 101;
+}
diff --git a/skins/default/templates/folderedit.html b/skins/default/templates/folderedit.html
new file mode 100644
index 0000000..78ddd33
--- /dev/null
+++ b/skins/default/templates/folderedit.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe">
+
+<div id="folder-title" class="boxtitle"><roundcube:label name="folderproperties" /></div>
+
+<div id="folder-details" class="boxcontent">
+ <roundcube:object name="folderdetails" />
+ <p>
+ <roundcube:if condition="!strlen(request:_mbox)" />
+ <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />
+ <roundcube:endif />
+ <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+ </p>
+</div>
+<script type="text/javascript">rcube_init_tabs('folder-details')</script>
+
+</body>
+</html>
diff --git a/skins/default/templates/folders.html b/skins/default/templates/folders.html
new file mode 100644
index 0000000..07ce1c0
--- /dev/null
+++ b/skins/default/templates/folders.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+<script type="text/javascript" src="/splitter.js"></script>
+<style type="text/css">
+#folder-manager { width: <roundcube:exp expression="!empty(cookie:folderviewsplitter) ? cookie:folderviewsplitter-5 : 295" />px; }
+#folder-box { left: <roundcube:exp expression="!empty(cookie:folderviewsplitter) ? cookie:folderviewsplitter+5 : 305" />px;
+ <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:folderviewsplitter) ? cookie:folderviewsplitter+5 : 305).')+\\'px\\');') : ''" />
+}
+</style>
+</head>
+<body onload="rcube_init_mail_ui()">
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+<roundcube:include file="/includes/settingstabs.html" />
+
+<div id="mainscreen">
+
+<div id="folder-manager">
+<div id="folder-title" class="boxtitle"><roundcube:label name="folders" /></div>
+<div class="boxlistcontent">
+ <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" noheader="true"
+ cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table" />
+</div>
+<div class="boxfooter">
+ <roundcube:button command="create-folder" type="link" title="createfolder" class="buttonPas addgroup" classAct="button addgroup" content=" " />
+ <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " />
+
+ <roundcube:if condition="env:quota" />
+ <img id="quotaimg" src="/images/quota.gif" alt="" />
+ <div id="quota">
+ <roundcube:object name="quotaDisplay" display="image" width="100" height="14" id="quotadisplay" />
+ </div>
+ <roundcube:endif />
+</div>
+</div>
+
+<script type="text/javascript">
+ var folderviewsplit = new rcube_splitter({id:'folderviewsplitter', p1: 'folder-manager', p2: 'folder-box', orientation: 'v', relative: true, start: 300 });
+ rcmail.add_onload('folderviewsplit.init()');
+</script>
+
+<div id="folder-box">
+ <roundcube:object name="folderframe" id="folder-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
+</div>
+
+</div>
+
+<div id="mailboxoptionsmenu" class="popupmenu">
+ <ul>
+ <li><roundcube:button command="delete-folder" label="delete" classAct="active" /></li>
+ <li><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+ <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
+ </ul>
+</div>
+
+</body>
+</html>
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
deleted file mode 100644
index 164d56f..0000000
--- a/skins/default/templates/managefolders.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/settingstabs.html" />
-
-<form name="subscriptionform" action="./" onsubmit="rcmail.command('create-folder');return false;">
-
-<div id="mainscreen">
-
-<div id="folder-manager">
-<roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
- cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table"
- deleteIcon="/images/icons/delete.png"
- renameIcon="/images/icons/rename.png" />
-</div>
-
-<div id="bottomboxes" class="box">
-<div class="boxtitle"><roundcube:label name="createfolder" /></div>
-
-<div class="boxcontent">
-<roundcube:label name="foldername" />:
-<roundcube:object name="createfolder" form="subscriptionform" hintbox="rcmailaddfolderhint" />
-<roundcube:button command="create-folder" type="input" class="button" label="create" />
-<div id="rcmailaddfolderhint" class="hint" style="margin-top:1em; height:16px"></div>
-</div>
-</div>
-
-</div>
-
-</form>
-
-</body>
-</html>
--
Gitblit v1.9.1