- 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)

CHANGELOG

@@ -8,6 +8,10 @@ CHANGELOG Roundcube Webmail
 - 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
 ----------------

index.php

@@ -218,16 +218,15 @@ $action_map = array(
     'group-addmembers' => 'groups.inc',
     'group-delmembers' => 'groups.inc',
   ),
-  
+
   'settings' => array(
-    'folders'       => 'manage_folders.inc',
+    'folders'       => 'folders.inc',
-    'create-folder' => 'manage_folders.inc',
+    'rename-folder' => 'folders.inc',
-    'rename-folder' => 'manage_folders.inc',
+    'delete-folder' => 'folders.inc',
-    'delete-folder' => 'manage_folders.inc',
+    'subscribe'     => 'folders.inc',
-    'subscribe'     => 'manage_folders.inc',
+    'unsubscribe'   => 'folders.inc',
-    'unsubscribe'   => 'manage_folders.inc',
+    'purge'         => 'folders.inc',
-    'enable-threading'  => 'manage_folders.inc',
+    'folder-size'   => 'folders.inc',
-    'disable-threading' => 'manage_folders.inc',
     'add-identity'  => 'edit_identity.inc',
   )
 );

program/include/main.inc

@@ -1314,8 +1314,13 @@ function rcmail_mailbox_select($p = array())
   
   $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_localize_foldername($name)
 }
 
 
+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
  *

program/include/rcube_imap.php

@@ -2553,6 +2553,9 @@ class rcube_imap
         $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
@@ -3008,6 +3011,26 @@ class rcube_imap
     }
 
 
+    /**
+     * 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)
      *
@@ -3043,48 +3066,42 @@ class rcube_imap
     /**
      * 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;
+        $result   = false;
-
-        // reduce mailbox name to 100 chars
-        $name = substr($name, 0, 100);
         $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 $mbox_name Mailbox to rename
-     * @param string $new_name  New mailbox name (as utf-7 string)
+     * @param string $new_name  New mailbox name
-     * @return string Name of the renames mailbox, False on error
+     * @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);
+        $mailbox  = $this->mod_mailbox($mbox_name);
-        $abs_name = $this->mod_mailbox($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 @@ class rcube_imap
         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 @@ class rcube_imap
         }
         else {
             $a_folders = $this->conn->listMailboxes('', $mbox);
-       }
+        }
 
         if (is_array($a_folders) && in_array($mbox, $a_folders)) {
             $this->icache[$key][] = $mbox;

program/js/app.js

@@ -343,8 +343,15 @@ function rcube_webmail()
           this.enable_command('add', this.env.identities_level < 2);
           this.enable_command('save', 'delete', 'edit', 'toggle-editor', true);
         }
-        else if (this.env.action=='folders')
+        else if (this.env.action=='folders') {
-          this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', 'enable-threading', 'disable-threading', true);
+          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 @@ function rcube_webmail()
     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 @@ function rcube_webmail()
     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 @@ function rcube_webmail()
 
   this.expunge_mailbox = function(mbox)
   {
-    var lock = false;
+    var lock = false,
-    var add_url = '';
+      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, lock);
-    this.http_post('expunge', url+add_url, lock);
   };
 
   this.purge_mailbox = function(mbox)
   {
-    var lock = false;
+    var lock = false,
-    var add_url = '';
+      url = '_mbox='+urlencode(mbox);
 
     if (!confirm(this.get_label('purgefolderconfirm')))
       return false;
@@ -2760,13 +2766,11 @@ function rcube_webmail()
     // 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, lock);
-    this.http_post('purge', url+add_url, lock);
-    return true;
   };
 
   // test if purge command is allowed
@@ -3980,16 +3984,12 @@ function rcube_webmail()
   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 @@ function rcube_webmail()
       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] &&
+            !this.env.subscriptionrows[this.get_folder_row_id(this.env.mailbox)][2] &&
-            (folder != this.env.folder.replace(reg, '')) &&
+            (folder != this.env.mailbox.replace(reg, '')) &&
-            (!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter))))) {
+            (!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 @@ function rcube_webmail()
   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)
+    if (list && (id = list.get_single_selection()) &&
-      $(this.gui_objects.createfolderhint).html(this.env.folder ? this.get_label('addsubfolderhint') : '');
+        (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 @@ function rcube_webmail()
     var delim = RegExp.escape(this.env.delimiter),
       reg = RegExp('['+delim+']?[^'+delim+']+$');
 
-    if (this.env.folder && this.env.dstfolder && (this.env.dstfolder != this.env.folder) &&
+    if (this.env.mailbox && this.env.dstfolder && (this.env.dstfolder != this.env.mailbox) &&
-        (this.env.dstfolder != this.env.folder.replace(reg, ''))) {
+        (this.env.dstfolder != this.env.mailbox.replace(reg, ''))
-      var reg = new RegExp('[^'+delim+']*['+delim+']', 'g');
+    ) {
-      var basename = this.env.folder.replace(reg, '');
+      reg = new RegExp('[^'+delim+']*['+delim+']', 'g');
-      var newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
+      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.mailbox)+'&_folder_newname='+urlencode(newname), lock);
-      this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_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);
+    this.show_folder('', this.env.mailbox);
-
-    // 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();
   };
 
   // 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];
+    var id = this.get_folder_row_id(name ? name : this.env.mailbox),
-
+      folder = this.env.subscriptionrows[id][0];
-    if (this.edit_folder)
-      this.reset_folder_rename();
 
     if (folder && confirm(this.get_label('deletefolderconfirm'))) {
       var lock = this.set_busy(true, 'folderdeleting');
-      this.http_post('delete-folder', '_mboxes='+urlencode(folder), lock);
+      this.http_post('delete-folder', '_mbox='+urlencode(folder), lock);
-      this.set_env('folder', null);
-
-      $(this.gui_objects.createfolderhint).html('');
     }
   };
 
@@ -4292,18 +4202,8 @@ function rcube_webmail()
       // 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 @@ function rcube_webmail()
   // replace an existing table row with a new folder line
   this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
   {
-    var form, elm,
+    var id = this.get_folder_row_id(oldfolder),
-      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)
+    if (folder) {
-      this.http_post('subscribe', '_mbox='+urlencode(folder));
+      var lock = this.display_message('foldersubscribing', 'loading');
+      this.http_post('subscribe', '_mbox='+urlencode(folder), lock);
+    }
   };
 
   this.unsubscribe = function(folder)
   {
-    if (folder)
+    if (folder) {
-      this.http_post('unsubscribe', '_mbox='+urlencode(folder));
+      var lock = this.display_message('folderunsubscribing', 'loading');
-  };
+      this.http_post('unsubscribe', '_mbox='+urlencode(folder), lock);
-
+    }
-  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));
   };
 
   // helper method to find a specific mailbox row ID
@@ -4401,7 +4266,7 @@ function rcube_webmail()
     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 @@ function rcube_webmail()
     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           *********/

program/localization/ar_SA/labels.inc

@@ -308,13 +308,9 @@ $labels['afternseconds'] = 'بعد $n ثواني';
 $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'] = 'ترتيب بحسب';

program/localization/ar_SA/messages.inc

@@ -54,9 +54,7 @@ $messages['deletecontactconfirm'] = 'هل تريد حقاً حذف المراس
 $messages['deletemessagesconfirm'] = 'هل تريد حذف الرسائل المحددة؟';
 $messages['deletefolderconfirm'] = 'هل تريد حقاً حذف هذا المجلد؟';
 $messages['purgefolderconfirm'] = 'هل تريد حقاً حذف جميع الرسائل في هذا المجلد؟';
-$messages['foldercreating'] = 'جاري إنشاء المجلد...';
 $messages['folderdeleting'] = 'جاري حذف المجلد...';
-$messages['folderrenaming'] = 'جاري إعادة تسمية المجلد...';
 $messages['foldermoving'] = 'جاري نقل المجلد...';
 $messages['formincomplete'] = 'لم يتم تعبئة بيانات الاستمارة بالكامل';
 $messages['noemailwarning'] = 'الرجاء إدخال عنوان بريد إلكتروني صالح';
@@ -91,7 +89,6 @@ $messages['copyingmessage'] = 'جاري نسخ الرسالة...';
 $messages['receiptsent'] = 'أرسل إيصال الاستلام بنجاح';
 $messages['errorsendingreceipt'] = 'تعذر إرسال إيصال الاستلام';
 $messages['nodeletelastidentity'] = 'لا يمكن حذف هذا السجل حيث أنه الوحيد المتبقي.';
-$messages['addsubfolderhint'] = 'سيتم إنشاء هذا المجلد كمجلد فرعي للمحدد.';
 $messages['forbiddencharacter'] = 'اسم المجلّد يحتوي حروفاً ممنوعة';
 $messages['selectimportfile'] = 'رجاء اختر ملفاً لرفعه';
 $messages['addresswriterror'] = 'دفتر العناوين المحدد غير قابل للكتابة';

program/localization/ast/labels.inc

@@ -261,13 +261,9 @@ $labels['listoptions'] = 'Allistar opciones';
 $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';

program/localization/ast/messages.inc

@@ -54,9 +54,7 @@ $messages['deletecontactconfirm'] = '¿Tas seguru de desaniciar los contautos qu
 $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['movingmessage'] = 'Moviendo\'l mensaxe...';
 $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';

program/localization/az_AZ/labels.inc

@@ -306,13 +306,9 @@ $labels['afternseconds'] = '$n saniyədən sonra';
 $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ə';

program/localization/az_AZ/messages.inc

@@ -52,9 +52,7 @@ $messages['deletecontactconfirm'] = 'Seçilən ünvanı (ünvanları) silməyə
 $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['copyingmessage'] = 'Məktub kopyalanır...';
 $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';

program/localization/bg_BG/labels.inc

@@ -326,13 +326,9 @@ $labels['reqdsn'] = 'Винаги изисквай отговор при дос
 $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'] = 'Сортирай по';

program/localization/bg_BG/messages.inc

@@ -56,9 +56,7 @@ $messages['deletecontactconfirm'] = 'Искате ли да изтриете м
 $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['markingmessage'] = 'Маркиране на съобщение';
 $messages['receiptsent'] = 'Обратната разписка е изпратена.';
 $messages['errorsendingreceipt'] = 'Грешка при изпращането на обратна разписка.';
 $messages['nodeletelastidentity'] = 'Не можете да изтриете тази самоличност, трябва да имате поне една.';
-$messages['addsubfolderhint'] = 'Тази папка ще бъде създадена като подпапка на текущо избраната';
 $messages['forbiddencharacter'] = 'Името на папката съдържа непозволени символи';
 $messages['selectimportfile'] = 'Моля изберете файл за качване';
 $messages['addresswriterror'] = 'Избраната адресна книга не може да бъде записвана';

program/localization/bn_BD/labels.inc

@@ -243,13 +243,9 @@ $labels['checkallfolders'] = 'সবগুলো মেইলবক্সে ন
 $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'] = 'সাজান';

program/localization/bn_BD/messages.inc

@@ -46,9 +46,7 @@ $messages['deletecontactconfirm'] = 'আপনি কি আসলেই এই
 $messages['deletemessagesconfirm'] = 'আপনি কি আসলেই এই চিঠি(গুলো) ফেলো দিতে চান?';
 $messages['deletefolderconfirm'] = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স ফেলো দিতে চান?';
 $messages['purgefolderconfirm'] = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স এর সব চিঠি ফেলো দিতে চান?';
-$messages['foldercreating'] = 'ফোল্ডার/মেইলবক্স প্রস্তুত করা হচ্ছে';
 $messages['folderdeleting'] = 'ফোল্ডার/মেইলবক্স ফেলে দেওয়া হচ্ছে';
-$messages['folderrenaming'] = 'ফোল্ডার/মেইলবক্স এর নাম বদলানো হচ্ছে';
 $messages['foldermoving'] = 'ফোল্ডার/মেইলবক্স সরানো হচ্ছে';
 $messages['formincomplete'] = 'আপনি সবগুলো জিনিষ লেখেননি';
 $messages['noemailwarning'] = 'একটি সঠিক ই-মেইল লিখুন';
@@ -81,7 +79,6 @@ $messages['movingmessage'] = 'চিঠি সরানো হচ্ছে..';
 $messages['receiptsent'] = 'ঠিকঠাক মতো ফিরতি রশিদ পাঠানো হয়েছে';
 $messages['errorsendingreceipt'] = 'রশিদ পাঠানো গেলোনা';
 $messages['nodeletelastidentity'] = 'আপনি এই পরিচিতি ফেলতে পারবেন না কারন এইটায় বর্তমানে আপনার একমাত্র পরিচিতি। ';
-$messages['addsubfolderhint'] = 'এই ফোল্ডারটি বর্তমান ফোল্ডার এর সাব-ফোল্ডার হিসাবে তৈরি হবে';
 $messages['forbiddencharacter'] = 'ফোল্ডার এর নামের মধ্যে নিষিদ্ধ অক্ষর আছে';
 $messages['selectimportfile'] = 'একটা ফাইল বেছে নিন তোলার জন্য';
 $messages['addresswriterror'] = 'বেছে নেওয়া ঠিকানার বইটিতে লেখাযায় না';

program/localization/br/labels.inc

@@ -168,12 +168,8 @@ $labels['never'] = 'ebet';
 $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';

program/localization/bs_BA/labels.inc

@@ -218,12 +218,8 @@ $labels['never'] ='nikada';
 $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';

program/localization/ca_ES/labels.inc

@@ -313,13 +313,9 @@ $labels['reqmdn'] = 'Demana sempre la confirmació de recepció';
 $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';

program/localization/ca_ES/messages.inc

@@ -56,9 +56,7 @@ $messages['deletecontactconfirm'] = 'Esteu segurs de voler suprimir el(s) contac
 $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['copyingmessage'] = 'Copiant missatge...';
 $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';

program/localization/cs_CZ/labels.inc

@@ -315,13 +315,9 @@ $labels['reqmdn'] = 'Vždy požadovat doručenku';
 $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';

program/localization/cs_CZ/messages.inc

@@ -58,9 +58,7 @@ $messages['deletecontactconfirm'] = 'Opravdu chcete smazat označené kontakty?'
 $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['markingmessage'] = 'Označuji zprávu...';
 $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ý';

program/localization/cy_GB/labels.inc

@@ -323,13 +323,9 @@ $labels['replysamefolder'] = 'Rhoi atebion yn yr un ffolder i\'r neges sy\'n cae
 $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';

program/localization/cy_GB/messages.inc

@@ -52,9 +52,7 @@ $messages['deletecontactconfirm'] = 'Ydych chi wir am ddileu y cysylltiadau ddew
 $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['markingmessage'] = 'Yn marcio neges(euon)...';
 $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 ';

program/localization/da_DK/labels.inc

@@ -305,13 +305,9 @@ $labels['afternseconds'] = 'efter $n sekunder';
 $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';

program/localization/da_DK/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Vil du virkelig slette den/de valgte kontak
 $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['copyingmessage'] = 'Kopierer besked...';
 $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';

program/localization/de_CH/labels.inc

@@ -326,13 +326,9 @@ $labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern'
 $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';

program/localization/de_CH/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Wollen Sie die ausgewählten Kontakte wirkl
 $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['markingmessage'] = 'Markiere Nachricht(en)...';
 $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';

program/localization/de_DE/labels.inc

@@ -326,13 +326,9 @@ $labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern'
 $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';

program/localization/de_DE/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Wollen Sie die ausgewählten Kontakte wirkl
 $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['markingmessage'] = 'Markiere Nachricht(en)...';
 $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';

program/localization/el_GR/labels.inc

@@ -234,13 +234,9 @@ $labels['newmessage'] = 'Νέο Μήνυμα';
 $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'] = 'Ταξινόμηση κατά';

program/localization/el_GR/messages.inc

@@ -52,9 +52,7 @@ $messages['deletecontactconfirm'] = 'Θέλετε να διαγράψετε τη
 $messages['deletemessagesconfirm'] = 'Θέλετε να διαγράψετε το συγκεκριμένο μήνυμα/τα;';
 $messages['deletefolderconfirm'] = 'Θέλετε να διαγράψετε το συγκεκριμένο φάκελο;';
 $messages['purgefolderconfirm'] = 'Θέλετε να διαγράψετε όλα τα μηνύματα στο συγκεκριμένο φάκελο;';
-$messages['foldercreating'] = 'Δημιουργία φακέλου';
 $messages['folderdeleting'] = 'Διαγραφή φακέλου';
-$messages['folderrenaming'] = 'Μετονομασία φακέλου';
 $messages['foldermoving'] = 'Μεταφορά φακέλου';
 $messages['formincomplete'] = 'Η φόρμα δεν έχει συμπληρωθεί πλήρως';
 $messages['noemailwarning'] = 'Παρακαλώ εισάγετε έγκυρη διεύθυνση email';
@@ -88,7 +86,6 @@ $messages['movingmessage'] = 'Μετακίνηση μηνύματος...';
 $messages['receiptsent'] = 'Επιτυχής αποστολή αναφοράς ανάγνωσης';
 $messages['errorsendingreceipt'] = 'Αποστολή αναφοράς απέτυχε';
 $messages['nodeletelastidentity'] = 'Δε μπορείτε να διαγράψετε αυτήν την ταυτότητα, είναι η τελευταία.';
-$messages['addsubfolderhint'] = 'Αυτός ο φάκελος θα δημιουργηθεί ως υποφάκελος του επιλεγμένου';
 $messages['forbiddencharacter'] = 'Η ονομασία φακέλου περιέχει μη επιτρεπτό χαρακτήρα';
 $messages['selectimportfile'] = 'Επιλέξτε αρχείο για ανέβασμα';
 $messages['addresswriterror'] = 'Η επιλεγμένη ατζέντα διευθύνσεων δεν είνα εγγράψιμη';

program/localization/en_GB/labels.inc

@@ -326,13 +326,9 @@ $labels['replysamefolder'] = 'Place replies in the folder of the message being r
 $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';

program/localization/en_GB/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Do you really want to delete the selected c
 $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['markingmessage'] = 'Marking message(s)...';
 $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';

program/localization/en_US/labels.inc

@@ -383,15 +383,18 @@ $labels['replysamefolder'] = 'Place replies in the folder of the message being r
 $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';

program/localization/en_US/messages.inc

@@ -55,10 +55,10 @@ $messages['deletecontactconfirm']  = 'Do you really want to delete the selected
 $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['searching'] = 'Searching...';
 $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['markingmessage'] = 'Marking message(s)...';
 $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['messagemoved'] = 'Message(s) moved successfully';
 $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';
 
 ?>

program/localization/eo/labels.inc

@@ -216,13 +216,9 @@ $labels['messagescomposition'] = 'Mesaĝo-verkado';
 $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';

program/localization/eo/messages.inc

@@ -75,7 +75,6 @@ $messages['movingmessage'] = 'Translokanta mesaĝon...';
 $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';
 
 ?>

program/localization/es_AR/labels.inc

@@ -297,13 +297,9 @@ $labels['afternseconds'] = 'despues de $n segundos';
 $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';

program/localization/es_AR/messages.inc

@@ -57,9 +57,7 @@ $messages['deletecontactconfirm'] = '¿Realmente quiere eliminar los contactos s
 $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['copyingmessage'] = 'Copiando mensaje...';
 $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';

program/localization/es_ES/labels.inc

@@ -328,13 +328,9 @@ $labels['replysamefolder'] = 'Coloque las respuestas en la carpeta del mensaje q
 $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';

program/localization/es_ES/messages.inc

@@ -57,9 +57,7 @@ $messages['deletecontactconfirm'] = '¿Realmente quiere eliminar los contactos s
 $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['markingmessage'] = 'Marcando Mensaje(s)...';
 $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';

program/localization/et_EE/labels.inc

@@ -328,13 +328,9 @@ $labels['replysamefolder'] = 'Paiguta vastused samasse kausta, millele vastataks
 $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';

program/localization/et_EE/messages.inc

@@ -57,9 +57,7 @@ $messages['deletecontactconfirm'] = 'Soovid valitud kontaktid kustutada?';
 $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['markingmessage'] = 'Märgin kirja...';
 $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';

program/localization/eu_ES/labels.inc

@@ -220,13 +220,9 @@ $labels['messagescomposition'] = 'Mezuak sortu';
 $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';

program/localization/eu_ES/messages.inc

@@ -78,7 +78,6 @@ $messages['movingmessage'] = 'Mezua mugitzen...';
 $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';
 
 ?>

program/localization/fa/labels.inc

@@ -247,13 +247,9 @@ $labels['checkallfolders'] = 'همه پوشه ها رو برای مشاهده پ
 $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'] = 'مرتب‌سازی بر اساس';

program/localization/fa/messages.inc

@@ -50,9 +50,7 @@ $messages['deletecontactconfirm'] = 'آیا واقعاً می‌خواهید ت
 $messages['deletemessagesconfirm'] = 'آیا واقعاً می‌خواهید پیغام (های) انتخاب شده را حذف کنید؟';
 $messages['deletefolderconfirm'] = 'آیا واقعاً می‌خواهید این پوشه را حذف کنید؟';
 $messages['purgefolderconfirm'] = 'آیا واقعاً می‌خواهید همه‌ی پیغام‌های داخل این پوشه را حذف کنید؟';
-$messages['foldercreating'] = '...در حال ایجاد پوشه ';
 $messages['folderdeleting'] = '...در حال حذف پوشه ';
-$messages['folderrenaming'] = '...در حال تغییر نام پوشه ';
 $messages['foldermoving'] = '...در حال انتقال پوشه ';
 $messages['formincomplete'] = 'فرم کاملاً پر نشده بود';
 $messages['noemailwarning'] = 'لطفاً یک نشانی ایمیل معتبر وارد کنید';
@@ -85,7 +83,6 @@ $messages['movingmessage'] = '...در حال انتقال پیغام';
 $messages['receiptsent'] = 'رسید خواندن با موفقیت ارسال شد';
 $messages['errorsendingreceipt'] = 'ناتوان در ارسال رسید';
 $messages['nodeletelastidentity'] = '.نمی‌توانید این هویت را حذف کنید، زیرا آخرین هویت شماست';
-$messages['addsubfolderhint'] = 'پوشه به عنوان زیرپوشه ای ساخته خواهد شد که هم اکنون انتخاب شده است';
 $messages['forbiddencharacter'] = 'نام پوشه شامل یک حرف غیر مجاز است';
 $messages['selectimportfile'] = 'لطفاً فایل را جهت بارگذاری انتخاب کنید';
 $messages['addresswriterror'] = 'در دفترچه تلفن انتخابی ، اجازه نوشتن ندارید';

program/localization/fa_AF/labels.inc

@@ -283,13 +283,9 @@ $labels['checkallfolders'] = 'تمام پوشه ها را بخاطر پیام ه
 $labels['folder']  = 'پوشه ';
 $labels['folders']  = 'پوشه ها';
 $labels['foldername']  = 'نام پوشه ';
-$labels['subscribed']  = 'مشترک ';
 $labels['messagecount'] = 'پيغام ها ';
 $labels['create']  = 'ایجاد کردن';
 $labels['createfolder']  = 'ایجاد پوشه جدید';
-$labels['rename'] = 'تغيير نام ';
-$labels['renamefolder'] = 'تغييرنام پوشه ';
-$labels['deletefolder']  = 'حذف کردن پوشه ';
 $labels['managefolders']  = 'اداره کردن پوشه ها ';
 $labels['specialfolders'] = 'پوشه های مخصوص';
 

program/localization/fa_AF/messages.inc

@@ -31,9 +31,7 @@ $messages['deletecontactconfirm']  = 'آيا واقعاً شما ميخواهي
 $messages['deletemessagesconfirm'] = 'آيا واقعاً شما ميخواهيد که پيغام هاي انتخاب شده را حذف کنيد؟ ';
 $messages['deletefolderconfirm']  = 'آيا واقعاً شما ميخواهيد که اين پوشه را حذف کنيد؟ ';
 $messages['purgefolderconfirm']  = 'آيا واقعاً شما ميخواهيد  تمام پيغام های که  در اين پوشه وجود دارد حذف کنيد؟ ';
-$messages['foldercreating'] = 'در حال ایجاد پوشه';
 $messages['folderdeleting'] = 'در حال حذف پوشه';
-$messages['folderrenaming'] = 'در حال تغییر نام پوشه';
 $messages['foldermoving'] = 'در حال انتقال پوشه';
 $messages['formincomplete'] = 'فورمه بصورت مکمل خانه پري نه شده است ';
 $messages['noemailwarning'] = 'لطفاً يک ايميل ادرس موجود را داخل کنيد ';
@@ -66,7 +64,6 @@ $messages['movingmessage'] = 'ذر حال انتقال پیام...';
 $messages['receiptsent'] = 'یک رسید برای ارسال کننده این پیام فرستاده شد.';
 $messages['errorsendingreceipt'] = 'رسيد ارسال شده نتوانست  ';
 $messages['nodeletelastidentity'] = 'شما این شناخت نامه را حذف کرده نمیتوانید. این آخرین شناخت نامه شما است.';
-$messages['addsubfolderhint'] = 'این پوشه به حیث پوشه فرعی پوشه انتخاب شده فعلی ساخته خواهد شد.';
 $messages['forbiddencharacter'] = 'نام پوشه دارای یک کرکتر ممنوعه است.';
 $messages['selectimportfile'] = 'لطفاً یک فایل را برای آپلود کردن انتخاب نمایید.';
 $messages['addresswriterror'] = 'کتابچه آدرس انتخاب شده دارای اجازه نامه نوشتاری نیست.';

program/localization/fi_FI/labels.inc

@@ -304,13 +304,9 @@ $labels['afternseconds'] = '$n sekunnin jälkeen';
 $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ä';

program/localization/fi_FI/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Haluatko varmasti poistaa valitut kontaktit
 $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['copyingmessage'] = 'Kopioidaan viestiä...';
 $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';

program/localization/fr_FR/labels.inc

@@ -322,13 +322,9 @@ $labels['replysamefolder'] = 'Placer les réponses dans le dossier du message é
 $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';

program/localization/fr_FR/messages.inc

@@ -57,9 +57,7 @@ $messages['deletecontactconfirm'] = 'Voulez-vous vraiment effacer le(s) contact(
 $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['markingmessage'] = 'Marquage des messages...';
 $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é';

program/localization/ga_IE/labels.inc

@@ -164,12 +164,8 @@ $labels['never'] = 'riamh';
 $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';

program/localization/gl_ES/labels.inc

@@ -323,13 +323,9 @@ $labels['replysamefolder'] = 'Deixar as respostas no cartafol onde está a mensa
 $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';

program/localization/gl_ES/messages.inc

@@ -52,9 +52,7 @@ $messages['deletecontactconfirm'] = 'Quere eliminar o(s) contacto(s) seleccionad
 $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['markingmessage'] = 'Marcando a(s) mensaxe(s)...';
 $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';

program/localization/he_IL/labels.inc

@@ -324,13 +324,9 @@ $labels['replysamefolder'] = 'המענה ישמר בתיקיה של ההודעה
 $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'] = 'מיון לפי';

program/localization/he_IL/messages.inc

@@ -54,9 +54,7 @@ $messages['deletecontactconfirm'] = 'האם למחוק את איש הקשר?';
 $messages['deletemessagesconfirm'] = 'האם למחוק את ההודעות המסומנות?';
 $messages['deletefolderconfirm'] = 'האם למחוק תיק זה?';
 $messages['purgefolderconfirm'] = 'האם למחוק את כל ההודעות בתיק זה?';
-$messages['foldercreating'] = 'התיקיה נוצרת...';
 $messages['folderdeleting'] = 'התיקיה נמחקת...';
-$messages['folderrenaming'] = 'שינוי שם תיקיה...';
 $messages['foldermoving'] = 'העברת תיקיה...';
 $messages['formincomplete'] = 'לא הוזנו כל השדות בטופס זה';
 $messages['noemailwarning'] = 'נא להוסיף כתובת דוא\"ל חוקית';
@@ -93,7 +91,6 @@ $messages['markingmessage'] = 'סימון ההודעה בתהליך...';
 $messages['receiptsent'] = 'אישור הקבלה נשלח בהצלחה';
 $messages['errorsendingreceipt'] = 'לא ניתן לשלוח אישור קבלה';
 $messages['nodeletelastidentity'] = 'זו הזהות האחרונה ולכן לא ניתן לבטלה';
-$messages['addsubfolderhint'] = 'תיקיה זו תוקם תחת התיקיה שנבחרה';
 $messages['forbiddencharacter'] = 'שם התיקיה מכיל תוים אסורים';
 $messages['selectimportfile'] = 'נא לבחור קובץ לייבוא';
 $messages['addresswriterror'] = 'פנקס הכתובות שנבחר אינו ניתן לכתיבה';

program/localization/hi_IN/labels.inc

@@ -223,12 +223,8 @@ $labels['never']		= 'कभी नहाीं';
 $labels['folder']		= 'फ़ोल्डर';
 $labels['folders']		= 'फ़ोल्डर';
 $labels['foldername']		= 'फ़ोल्डर नाम';
-$labels['subscribed']		= 'सबस्क्राईब किया गया';
 $labels['create']		= 'बनाऐं';
 $labels['createfolder']		= 'फ़ोलडर बनाऐं';
-$labels['rename']		= 'नाम बदलें';
-$labels['renamefolder']		= 'फ़ोलडर का नाम बदलें';
-$labels['deletefolder']		= 'फ़ोलडर मिटाऐं';
 $labels['managefolders']	= 'फ़ोलडर को व्यवस्थित करें';
 
 $labels['sortby']		= 'ऐसे तय करें';

program/localization/hr_HR/labels.inc

@@ -326,13 +326,9 @@ $labels['replysamefolder'] = 'Spremi odgovore u mapu gdje se nalazi poruka';
 $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';

program/localization/hr_HR/messages.inc

@@ -53,9 +53,7 @@ $messages['deletecontactconfirm'] = 'Želite li obrisati izabrane kontakte?';
 $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['movingmessage'] = 'Premještanje poruke...';
 $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...';

program/localization/hu_HU/labels.inc

@@ -327,13 +327,9 @@ $labels['reqdsn'] = 'Kézbesítési visszaigazolás megkövetelése';
 $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';

program/localization/hu_HU/messages.inc

@@ -57,9 +57,7 @@ $messages['deletecontactconfirm'] = 'Biztos, hogy törölni szeretné a kijelöl
 $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['copyingmessage'] = 'Üzenet másolása...';
 $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ó';

program/localization/hy_AM/labels.inc

@@ -245,13 +245,9 @@ $labels['checkallfolders'] = 'Ստուգել բոլոր դարակները նո
 $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'] = 'Դասավորել';

program/localization/hy_AM/messages.inc

@@ -48,9 +48,7 @@ $messages['deletecontactconfirm'] = 'Ուզու՞մ էք ջնջել նշված
 $messages['deletemessagesconfirm'] = 'Ուզու՞մ էք ջնջել նշված նամակները';
 $messages['deletefolderconfirm'] = 'Ուզու՞մ էք ջնջել այս դարակը';
 $messages['purgefolderconfirm'] = 'Ուզու՞մ էք ջնջել այս դարակի բոլոր նամակները';
-$messages['foldercreating'] = 'Դարակը ստեղծվում է…';
 $messages['folderdeleting'] = 'Դարակը ջնջվում է…';
-$messages['folderrenaming'] = 'Դարակը վերանվանվում է…';
 $messages['foldermoving'] = 'Դարակը տեղափոխվում է…';
 $messages['formincomplete'] = 'Ձևը թերի է լրացված';
 $messages['noemailwarning'] = 'Մուտքագրեք ճիշտ էլ. հասցե';
@@ -83,7 +81,6 @@ $messages['movingmessage'] = 'Նամակը տեղափոխվում է…';
 $messages['receiptsent'] = 'Նամակի ընթերցման ծանուցագիրն ուղարկված է';
 $messages['errorsendingreceipt'] = 'Ծանուցագրի ուղարկումը ձախողվեց';
 $messages['nodeletelastidentity'] = 'Անհնար է ջնջել վերջին տարբերակը';
-$messages['addsubfolderhint'] = 'Այս դարակը կստեղծվի որպես նշվածի ենթադարակ';
 $messages['forbiddencharacter'] = 'Դարակի անունը պարունակում է անթույլատրելի նշան';
 $messages['selectimportfile'] = 'Ընտրեք ուղարկվող ֆայլը';
 $messages['addresswriterror'] = 'Ընտրված հասցեագիրքը ենթակա չէ փոփոխման';

program/localization/id_ID/labels.inc

@@ -326,13 +326,9 @@ $labels['replysamefolder'] = 'Taruh balasan di folder yang sama dengan pesan yan
 $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';

program/localization/id_ID/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Apakah anda yakin untuk menghapus kontak te
 $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['markingmessage'] = 'Menandai Pesan...';
 $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';

program/localization/is_IS/labels.inc

@@ -246,13 +246,9 @@ $labels['checkallfolders'] = 'Athuga ný skeyti í öllum möppum';
 $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';

program/localization/it_IT/labels.inc

@@ -324,13 +324,9 @@ $labels['reqdsn'] = 'Richiedi sempre la ricevuta di consegna';
 $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';

program/localization/it_IT/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Sei sicuro di voler eliminare i contatti se
 $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['copyingmessage'] = 'Copia del messaggio';
 $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';

program/localization/ja_JP/labels.inc

@@ -329,13 +329,9 @@ $labels['replysamefolder'] = '返信されてきたメールを返信元メー
 $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'] = '並び替えの基準';

program/localization/ja_JP/messages.inc

@@ -58,9 +58,7 @@ $messages['deletecontactconfirm'] = '選択した連絡先を本当に削除し
 $messages['deletemessagesconfirm'] = '選択したメールを本当に削除しますか?';
 $messages['deletefolderconfirm'] = 'このフォルダを本当に削除しますか?';
 $messages['purgefolderconfirm'] = 'このフォルダの全メールを本当に削除しますか?';
-$messages['foldercreating'] = 'フォルダを作成しています...';
 $messages['folderdeleting'] = 'フォルダを削除しています...';
-$messages['folderrenaming'] = 'フォルダ名を変更しています...';
 $messages['foldermoving'] = 'フォルダを移動しています...';
 $messages['formincomplete'] = 'すべてのフォームの項目を入力していません。';
 $messages['noemailwarning'] = '有効なメールアドレスを入力してください。';
@@ -97,7 +95,6 @@ $messages['markingmessage'] = 'メールをマークしています...';
 $messages['receiptsent'] = '開封確認を送信しました。';
 $messages['errorsendingreceipt'] = '開封確認を送信できません。';
 $messages['nodeletelastidentity'] = '削除できません。少なくとも 1 つの個人情報が必要です。';
-$messages['addsubfolderhint'] = '現在選択しているフォルダのサブフォルダとして作成されます。';
 $messages['forbiddencharacter'] = 'フォルダ名に利用できない文字が含まれています。';
 $messages['selectimportfile'] = 'アップロードするファイルを選択してください。';
 $messages['addresswriterror'] = '選択したアドレス帳に書き込めません。';

program/localization/ka_GE/labels.inc

@@ -270,13 +270,9 @@ $labels['insertsignature'] = 'ხელმოცერის ჩასმა';
 $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'] = 'დალაგება';

program/localization/ka_GE/messages.inc

@@ -52,9 +52,7 @@ $messages['deletecontactconfirm'] = 'ნამდვილად გსურთ
 $messages['deletemessagesconfirm'] = 'ნამდვილად გსურთ მონიშნული შეტყობინებების წაშლა?';
 $messages['deletefolderconfirm'] = 'ნამდვილად გსურთ ამ საქაღალდის წაშლა?';
 $messages['purgefolderconfirm'] = 'ნამდვილად გსურთ ყველა შეტყობინების წაშლა აღნიშნულ საქაღალდეში?';
-$messages['foldercreating'] = 'საქაღალდის შექმნა...';
 $messages['folderdeleting'] = 'საქაღალდის წაშლა...';
-$messages['folderrenaming'] = 'საქაღალდის სახელის შეცვლა...';
 $messages['foldermoving'] = 'საქაღალდის გადატანა...';
 $messages['formincomplete'] = 'ყველა ველი არ არის შევსებული';
 $messages['noemailwarning'] = 'მიუთითეთ სწორი ელ–ფოსტის მისამართი';
@@ -88,7 +86,6 @@ $messages['movingmessage'] = 'შეტყობინების გადა
 $messages['receiptsent'] = 'წარმატებით გაიგზავნა';
 $messages['errorsendingreceipt'] = 'არ გაიგზავნა';
 $messages['nodeletelastidentity'] = 'წაშლა შეუძლებელია, ის თქვენთვის ერთადერთია';
-$messages['addsubfolderhint'] = 'საქაღალდე შეიქმნება როგორც ქვესაქაღალდე მონიშნულ საქაღალდეში';
 $messages['forbiddencharacter'] = 'საქაღალდის სახელი შეიცავს აკრძალულ სიმბოლოებს';
 $messages['selectimportfile'] = 'გთხოვთ მონიშნოთ ფაილი ასატვირთად';
 $messages['addresswriterror'] = 'მონიშნულ მისამართებში ჩაწერა შეუძლებელია';

program/localization/kh_KH/labels.inc

@@ -308,13 +308,9 @@ $labels['afternseconds'] = 'ក្រោយពី $n វិនាទី';
 $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'] = 'តំរៀបតាម';

program/localization/kh_KH/messages.inc

@@ -54,9 +54,7 @@ $messages['deletecontactconfirm'] = 'តើអ្នកពិតជាចង់
 $messages['deletemessagesconfirm'] = 'តើអ្នកពិតជាចង់លុបសារនេះមែនទេ?';
 $messages['deletefolderconfirm'] = 'តើអ្នកពិតជាចង់លុបថតនេះមែនទេ?';
 $messages['purgefolderconfirm'] = 'តើអ្នកពិតជាចង់លុបសារទាំងអស់មែនទេ?';
-$messages['foldercreating'] = 'កំពុងបង្កើតថតសំរាប់ទុកឯកសារ...';
 $messages['folderdeleting'] = 'កំពុងលុបថតសំរាប់ទុកឯកសារ...';
-$messages['folderrenaming'] = 'កំពុងប្តូរឈ្មោះថតសំរាប់ទុកឯកសារ...';
 $messages['foldermoving'] = 'កំពុងផ្តេរថតសំរាប់ទុកឯកសារ...';
 $messages['formincomplete'] = 'ទំរង់នេះមិនទាន់ពេញលេញនៅឡើយទេ';
 $messages['noemailwarning'] = 'សូមវាយបញ្ចូលអ៊ីមែលរបស់អ្នក';
@@ -91,7 +89,6 @@ $messages['copyingmessage'] = 'កំពុងចំលងសារ...';
 $messages['receiptsent'] = 'ការបញ្ជូន read receipt បានសំរេច';
 $messages['errorsendingreceipt'] = 'មិនអាចបញ្ជុន receipt ទេ';
 $messages['nodeletelastidentity'] = 'អ្នកមិនអាចលុបអត្តសញ្ញាណនេះទេ ព្រោះវានៅសល់ចុងក្រោយគេ';
-$messages['addsubfolderhint'] = 'Folder នេះនឹងបង្កើតជា Subfolder នៃ Folder ដែលកំពុងស្ថិតនៅនេះ';
 $messages['forbiddencharacter'] = 'ឈ្មោះ Folder នេះមានអក្សរដែលត្រូវហាមឃាត់';
 $messages['selectimportfile'] = 'សូមជ្រើសរើសឯកសារដើម្បីផ្ញើ';
 $messages['addresswriterror'] = 'សៀវភៅអាសយដ្ឋាននោះមិនអាចសរសេរចូលបានទេ';

program/localization/ko_KR/labels.inc

@@ -246,13 +246,9 @@ $labels['checkallfolders'] = '새 메시지를 위해 모든 폴더 체크';
 $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'] = '정렬';

program/localization/ko_KR/messages.inc

@@ -49,9 +49,7 @@ $messages['deletecontactconfirm'] = '정말 선택한 연락처들을 삭제하
 $messages['deletemessagesconfirm'] = '정말 선택한 메일들을 삭제하시겠습니까?';
 $messages['deletefolderconfirm'] = '정말 이 폴더를 삭제하시겠습니까?';
 $messages['purgefolderconfirm'] = '정말 이 폴더의 모든 메일을 삭제하시겠습니까?';
-$messages['foldercreating'] = '폴더 만드는 중...';
 $messages['folderdeleting'] = '폴더 지우는 중...';
-$messages['folderrenaming'] = '폴더 이름 바꾸는 중...';
 $messages['foldermoving'] = '폴더 옮기는 중...';
 $messages['formincomplete'] = '양식을 완전히 채우지 않았습니다';
 $messages['noemailwarning'] = '유효한 이메일 주소를 넣어주십시오';
@@ -84,7 +82,6 @@ $messages['movingmessage'] = '메시지 이동 중...';
 $messages['receiptsent'] = '메일 읽음 확인을 보냈습니다';
 $messages['errorsendingreceipt'] = '읽음 확인을 보낼 수 없습니다';
 $messages['nodeletelastidentity'] = '이 정보는 마지막 남은 것이므로 지울 수 없습니다';
-$messages['addsubfolderhint'] = '이 폴더는 현재 선택된 폴더의 서브 폴더로 만들어질 것입니다';
 $messages['forbiddencharacter'] = '폴더 이름에 쓸 수 없는 문자가 포함되어 있습니다';
 $messages['selectimportfile'] = '업로드할 파일을 선택하세요';
 $messages['addresswriterror'] = '선택한 주소록은 쓸 수 없습니다';

program/localization/ku/labels.inc

@@ -173,13 +173,9 @@ $labels['never'] = 'qet';
 $labels['folder'] = 'Peldank';
 $labels['folders'] = 'Peldank';
 $labels['foldername'] = 'Navê peldankê';
-$labels['subscribed'] = 'Ni şanenav';
 $labels['messagecount'] = 'Peyam';
 $labels['create'] = 'Biafirîne';
 $labels['createfolder'] = 'Peldankeke nû biafirîne';
-$labels['rename'] = 'Nav biguherîne';
-$labels['renamefolder'] = 'Navê peldankê biguherîne';
-$labels['deletefolder'] = 'Peldankê jê bibe';
 $labels['managefolders'] = 'Rêveberiya peldankan';
 $labels['sortby'] = 'Şêweyê rêzkirinê';
 $labels['sortasc'] = 'Wekî zêde dibe';

program/localization/ku/messages.inc

@@ -74,6 +74,5 @@ $messages['movingmessage'] = 'Ciyê peyamê tê guhertin...';
 $messages['receiptsent'] = 'Rapora şandina serkeftî';
 $messages['errorsendingreceipt'] = 'Rapor nehat şandin';
 $messages['nodeletelastidentity'] = 'Nikarî vê nasnameyê jê bibî. Ew ya dawî ye.';
-$messages['addsubfolderhint'] = 'Ev peldank wê wekî binepeldanka ya heyî bê afirandin';
 
 ?>

program/localization/lt_LT/labels.inc

@@ -312,13 +312,9 @@ $labels['reqmdn'] = 'Visuomet prašyti gavimo pažymos';
 $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';

program/localization/lt_LT/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Ar tikrai pašalinti pažymėtą(-us) adres
 $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['copyingmessage'] = 'Laiškas kopijuojamas…';
 $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';

program/localization/lv_LV/labels.inc

@@ -273,13 +273,9 @@ $labels['insertsignature'] = 'Ievietot parakstu';
 $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';

program/localization/lv_LV/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Vai tiešām vēlaties dzēst iezīmēto(ā
 $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['movingmessage'] = 'Pārvietoju vēstules...';
 $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';

program/localization/mk_MK/labels.inc

@@ -270,13 +270,9 @@ $labels['insertsignature'] = 'Вметни потпис';
 $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'] = 'Сортирај по';

program/localization/mk_MK/messages.inc

@@ -52,9 +52,7 @@ $messages['deletecontactconfirm'] = 'Дали сте сигурни дека с
 $messages['deletemessagesconfirm'] = 'Дали сте сигурни дека сакате да го(и) избришете обележаниот(те) писмо(а)?';
 $messages['deletefolderconfirm'] = 'Дали сте сигурни дека сакате да ја избришете оваа папка?';
 $messages['purgefolderconfirm'] = 'Дали сте сигурни дека сакате да ги избршете сите писма во оваа папка?';
-$messages['foldercreating'] = 'Ја создавам папката...';
 $messages['folderdeleting'] = 'Ја бришам папката...';
-$messages['folderrenaming'] = 'Ја преименувам папката...';
 $messages['foldermoving'] = 'Ја преместувам папката...';
 $messages['formincomplete'] = 'Имате изоставено непополнети информации';
 $messages['noemailwarning'] = 'Внесете валидна е-поштенска адреса';
@@ -88,7 +86,6 @@ $messages['movingmessage'] = 'Пораката се преместува...';
 $messages['receiptsent'] = 'Известувањето е успешно пратено';
 $messages['errorsendingreceipt'] = 'Известувањето не е пратено';
 $messages['nodeletelastidentity'] = 'Овој идентитет неможе да се избрише, тој е последниот.';
-$messages['addsubfolderhint'] = 'Оваа папка ќе биде креирана како потпапка на моментално избраната.';
 $messages['forbiddencharacter'] = 'Името на папката содржи несоодветен формат';
 $messages['selectimportfile'] = 'Изберете ја податотеката која сакате да ја прикачите';
 $messages['addresswriterror'] = 'Одбраниот именик не може да се менува';

program/localization/mr_IN/labels.inc

@@ -374,13 +374,9 @@ $labels['afternseconds'] = '$n क्षणानंतर';
 $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'] = 'ने वर्गवारी करा';

program/localization/mr_IN/messages.inc

@@ -51,9 +51,7 @@ $messages['deletecontactconfirm'] = 'खूण केलेले सर्व
 $messages['deletemessagesconfirm'] = 'खूण केलेले सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
 $messages['deletefolderconfirm'] = 'हा फोल्डर खरोखरच तुम्हाला काढून टाकायचा आहेत का?';
 $messages['purgefolderconfirm'] = 'या फोल्डरमधिल सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
-$messages['foldercreating'] = 'फोल्डर तयार करत आहे';
 $messages['folderdeleting'] = 'फोल्डर काढून टाकत आहे';
-$messages['folderrenaming'] = 'फोल्डरला नवीन नाव देत आहे.';
 $messages['foldermoving'] = 'फोल्डर हलवत आहे.';
 $messages['formincomplete'] = 'फॉर्म पूर्णपणे भरलेला  नाही. ';
 $messages['noemailwarning'] = 'योग्य, बरोबर, आणि वैध इमेल पत्ता द्या. ';
@@ -88,7 +86,6 @@ $messages['copyingmessage'] = 'संदेशाची नक्‍कल क
 $messages['receiptsent'] = 'पोचपावती यशस्वीरित्या पाठवण्यात आली आहे. ';
 $messages['errorsendingreceipt'] = 'पोचपावती पाठवता आली नाही.';
 $messages['nodeletelastidentity'] = 'तुम्ही हे खाते काढून टाकू शकत नाही कारण हे तुमचे शेवटचे खाते आहे.';
-$messages['addsubfolderhint'] = 'हा फोल्डर निवडलेल्या फोल्डरचा उप-फोल्डर असेल';
 $messages['forbiddencharacter'] = 'फोल्डरच्या नावात न चालणारी अक्षरे किंवा खूणा आहेत.';
 $messages['selectimportfile'] = 'चढवण्यासाठी फाईल निवडा';
 $messages['addresswriterror'] = 'निवडलेल्या पत्ता नोंदवहीत नोंद करता येत नाही.';

program/localization/ms_MY/labels.inc

@@ -211,13 +211,9 @@ $labels['never'] = 'tidak pernah';
 $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';

program/localization/ms_MY/messages.inc

@@ -77,6 +77,5 @@ $messages['movingmessage'] = 'Memindah mesej...';
 $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';
 
 ?>

program/localization/nb_NO/labels.inc

@@ -308,13 +308,9 @@ $labels['afternseconds'] = 'etter $n sekunder';
 $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';

program/localization/nb_NO/messages.inc

@@ -57,9 +57,7 @@ $messages['deletecontactconfirm'] = 'Vil du virkelig slette valgte kontakt(er)?'
 $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['copyingmessage'] = 'Kopierer e-post...';
 $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';

program/localization/ne_NP/labels.inc

@@ -163,12 +163,8 @@ $labels['never'] = 'काहिलै नहुने';
 $labels['folder'] = 'फोल्डर';
 $labels['folders'] = 'फोल्डरहरु';
 $labels['foldername'] = 'फोल्डरको नाम';
-$labels['subscribed'] = 'सबस्क्राईब गरियो';
 $labels['create'] = 'बनाउनुहोस';
 $labels['createfolder'] = 'नया फोलडर बनाउनुहोस';
-$labels['rename'] = 'नाम बदल्नुहोस';
-$labels['renamefolder'] = 'फोलडरको नाम बदल्नुहोस';
-$labels['deletefolder'] = 'फोलडर मेट्नुहोस';
 $labels['managefolders'] = 'फोलडर व्यवस्थित गर्नुहोस';
 $labels['sortby'] = 'यसरी तय गर्नुहोस';
 $labels['sortasc'] = 'पहिलो देखि अन्तिम सम्म तय गर्नुहोस';

program/localization/nl_BE/labels.inc

@@ -317,13 +317,9 @@ $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
 $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';

program/localization/nl_BE/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Bent u zeker dat u de geselecteerde contact
 $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['copyingmessage'] = 'Bericht wordt gekopieerd...';
 $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';

program/localization/nl_NL/labels.inc

@@ -330,13 +330,9 @@ $labels['replysamefolder'] = 'Plaats antwoorden in de folder van het beantwoorde
 $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';

program/localization/nl_NL/messages.inc

@@ -58,9 +58,7 @@ $messages['deletecontactconfirm'] = 'Weet u zeker dat u de geselecteerde contact
 $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['copyingmessage'] = 'Kopiëren bericht...';
 $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';

program/localization/nn_NO/labels.inc

@@ -306,13 +306,9 @@ $labels['afternseconds'] = 'etter $n sekund';
 $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';

program/localization/nn_NO/messages.inc

@@ -55,9 +55,7 @@ $messages['deletecontactconfirm'] = 'Sletta kontakt(ar)?';
 $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['copyingmessage'] = 'Kopierer epost...';
 $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';

program/localization/pl_PL/labels.inc

@@ -315,13 +315,9 @@ $labels['afternseconds'] = 'po $n sekundach';
 $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['dsn'] = 'Status dostarczenia (DSN)';
 $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ę';
 
 ?>